Merge branch 'main' into Issue-491

Author: angrezichatterbox

app/src/main/java/be/scri/ui/screens/PrivacyPolicyScreen.kt

@@ -32,7 +32,7 @@ fun PrivacyPolicyScreen(
     modifier: Modifier = Modifier,
 ) {
     ScribeBaseScreen(
-        pageTitle = stringResource(R.string.privacy_policy),
+        pageTitle = stringResource(R.string.app_about_legal_privacy_policy),
         onBackNavigation = { onBackNavigation() },
         lastPage = stringResource(R.string.app_about_title),
         modifier = modifier,

app/src/main/java/be/scri/ui/screens/WikimediaScreen.kt

@@ -39,21 +39,21 @@ fun WikimediaScreen(
     modifier: Modifier = Modifier,
 ) {
     ScribeBaseScreen(
-        pageTitle = stringResource(R.string.wikimedia_and_scribe),
+        pageTitle = stringResource(R.string.app_about_community_wikimedia),
         onBackNavigation = { onBackNavigation() },
         lastPage = stringResource(R.string.app_about_title),
         modifier = modifier,
     ) {
         WikimediaScreenContent(
-            title = stringResource(R.string.wikimedia_and_scribe_title),
+            title = stringResource(R.string.app_about_community_wikimedia_caption),
             modifier =
                 Modifier.padding(
                     horizontal = 16.dp,
                 ),
         ) {
             Column(modifier = Modifier.padding(16.dp)) {
                 Text(
-                    text = stringResource(id = R.string.scribe_wikimedia),
+                    text = stringResource(id = R.string.scribe_key),
                     fontSize = ScribeTypography.bodyMedium.fontSize,
                     style =
                         TextStyle.Default.copy(
@@ -72,7 +72,7 @@ fun WikimediaScreen(
                     colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
                 )
                 Text(
-                    text = stringResource(id = R.string.wikidata_and_scribe),
+                    text = stringResource(id = R.string.app_about_community_wikimedia_text_2),
                     fontSize = ScribeTypography.bodyMedium.fontSize,
                     style =
                         TextStyle.Default.copy(
@@ -91,7 +91,7 @@ fun WikimediaScreen(
                     colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
                 )
                 Text(
-                    text = stringResource(id = R.string.wikipedia_and_scribe),
+                    text = stringResource(id = R.string.app_about_community_wikimedia_text_3),
                     fontSize = ScribeTypography.bodyMedium.fontSize,
                     style =
                         TextStyle.Default.copy(

app/src/main/java/be/scri/ui/screens/about/AboutScreen.kt

@@ -77,7 +77,7 @@ fun AboutScreen(
             verticalArrangement = Arrangement.spacedBy(8.dp),
         ) {
             ItemCardContainerWithTitle(
-                title = stringResource(R.string.community_title),
+                title = stringResource(R.string.app_about_community_title),
                 cardItemsList = communityList,
                 isDivider = true,
             )