Job done! All Accessibility ID strings mapped and/or dealt with appropriately!

app/src/main/AndroidManifest.xml

@@ -75,7 +75,7 @@
         android:name="org.thoughtcrime.securesms.ApplicationContext"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/sessionMessenger"
+        android:label="@string/app_name"
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_configuration"
         android:supportsRtl="true"

app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java

@@ -98,7 +98,7 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
     super.onResume();
     initializeScreenshotSecurity(true);
     DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
-    String name = getResources().getString(R.string.sessionMessenger);
+    String name = getResources().getString(R.string.app_name);
     Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground);
     int color = getResources().getColor(R.color.app_icon_background);
     setTaskDescription(new ActivityManager.TaskDescription(name, icon, color));

app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java

@@ -18,7 +18,7 @@ public abstract class BaseActivity extends FragmentActivity {
   protected void onResume() {
     super.onResume();
     DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
-    String name = getResources().getString(R.string.sessionMessenger);
+    String name = getResources().getString(R.string.app_name);
     Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground);
     int color = getResources().getColor(R.color.app_icon_background);
     setTaskDescription(new ActivityManager.TaskDescription(name, icon, color));

app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java

@@ -334,11 +334,11 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
                 .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
                 .maxSdkVersion(Build.VERSION_CODES.P)
                 .withPermanentDenialDialog(Phrase.from(context, R.string.permissionsStorageSaveDenied)
-                        .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+                        .put(APP_NAME_KEY, getString(R.string.app_name))
                         .format().toString())
                 .onAnyDenied(() -> Toast.makeText(getContext(),
                                        Phrase.from(context, R.string.permissionsStorageSaveDenied)
-                                           .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+                                           .put(APP_NAME_KEY, getString(R.string.app_name))
                                            .format().toString(),
                                        Toast.LENGTH_LONG).show())
                 .onAllGranted(() -> {

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -415,11 +415,11 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
               .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
               .maxSdkVersion(Build.VERSION_CODES.P)
               .withPermanentDenialDialog(Phrase.from(getApplicationContext(), R.string.permissionsStorageSaveDenied)
-                      .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+                      .put(APP_NAME_KEY, getString(R.string.app_name))
                       .format().toString())
               .onAnyDenied(() -> {
                 String txt = Phrase.from(getApplicationContext(), R.string.permissionsStorageSaveDenied)
-                        .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+                        .put(APP_NAME_KEY, getString(R.string.app_name))
                         .format().toString();
                 Toast.makeText(this, txt, Toast.LENGTH_LONG).show();
               })

app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java

@@ -158,7 +158,7 @@ public class PassphrasePromptActivity extends BaseActionBarActivity {
     if (statusTitle != null) {
       Context c = getApplicationContext();
       String lockedTxt = Phrase.from(c, R.string.lockAppLocked)
-              .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
+              .put(APP_NAME_KEY, c.getString(R.string.app_name))
               .format().toString();
       statusTitle.setText(lockedTxt);
     }

app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt

@@ -125,7 +125,7 @@ class SessionDialogBuilder(val context: Context) {
     ) { listener() }
 
     fun okButton(listener: (() -> Unit) = {}) = button(android.R.string.ok) { listener() }
-    fun cancelButton(listener: (() -> Unit) = {}) = button(android.R.string.cancel, R.string.AccessibilityId_cancel_button) { listener() }
+    fun cancelButton(listener: (() -> Unit) = {}) = button(android.R.string.cancel, R.string.AccessibilityId_cancel) { listener() }
 
     fun button(
         @StringRes text: Int,

app/src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java

@@ -45,7 +45,7 @@ public class SwitchPreferenceCompat extends CheckBoxPreference {
             if (key.equalsIgnoreCase(LOCK_SCREEN_KEY)) {
                 Context c = getContext();
                 CharSequence substitutedSummaryCS = Phrase.from(c, R.string.lockAppDescriptionAndroid)
-                                                        .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
+                                                        .put(APP_NAME_KEY, c.getString(R.string.app_name))
                                                         .format();
                 this.setSummary(substitutedSummaryCS);
             }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt

@@ -23,7 +23,6 @@ import org.session.libsession.LocalisedTimeUtil
 import org.session.libsession.messaging.messages.ExpirationConfiguration
 import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.utilities.ExpirationUtil
-import org.session.libsession.utilities.StringSubstitutionConstants.COUNT_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.DISAPPEARING_MESSAGES_TYPE_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.TIME_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.TIME_LARGE_KEY
@@ -118,7 +117,7 @@ class ConversationActionBarView @JvmOverloads constructor(
                 subtitleTxt,
                 ConversationSettingType.EXPIRATION,
                 R.drawable.ic_timer,
-                resources.getString(R.string.AccessibilityId_disappearing_messages_type_and_time)
+                resources.getString(R.string.AccessibilityId_disappearingMessagesDisappear)
             )
         }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt

@@ -58,7 +58,7 @@ class DisappearingMessages @Inject constructor(
 
         dangerButton(
                 text = if (message.expiresIn == 0L) R.string.confirm else R.string.set,
-                contentDescription = if (message.expiresIn == 0L) R.string.AccessibilityId_confirm else R.string.AccessibilityId_set_button
+                contentDescription = if (message.expiresIn == 0L) R.string.AccessibilityId_confirm else R.string.AccessibilityId_setButton
         ) {
             set(message.threadId, message.recipient.address, message.expiryMode, message.recipient.isClosedGroupRecipient)
         }

app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/State.kt

@@ -52,24 +52,24 @@ enum class ExpiryType(
     NONE(
         { ExpiryMode.NONE },
         R.string.off,
-        contentDescription = R.string.AccessibilityId_disable_disappearing_messages,
+        contentDescription = R.string.AccessibilityId_disappearingMessagesOff,
     ),
     LEGACY(
         ExpiryMode::Legacy,
         R.string.expiration_type_disappear_legacy,
-        contentDescription = R.string.expiration_type_disappear_legacy_description
+        contentDescription = R.string.AccessibilityId_disappearingMessagesLegacy
     ),
     AFTER_READ(
         ExpiryMode::AfterRead,
         R.string.disappearingMessagesDisappearAfterRead,
         R.string.disappearingMessagesDisappearAfterReadDescription,
-        R.string.AccessibilityId_disappear_after_read_option
+        R.string.AccessibilityId_disappearingMessagesDisappearAfterRead
     ),
     AFTER_SEND(
         ExpiryMode::AfterSend,
         R.string.disappearingMessagesDisappearAfterSend,
         R.string.disappearingMessagesDisappearAfterSendDescription,
-        R.string.AccessibilityId_disappear_after_send_option
+        R.string.AccessibilityId_disappearingMessagesDisappearAfterSent
     );
 
     fun mode(seconds: Long) = if (seconds != 0L) createMode(seconds) else ExpiryMode.NONE

app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/ui/DisappearingMessages.kt

@@ -74,7 +74,7 @@ fun DisappearingMessages(
         if (state.showSetButton) SlimOutlineButton(
             stringResource(R.string.set),
             modifier = Modifier
-                .contentDescription(R.string.AccessibilityId_set_button)
+                .contentDescription(R.string.AccessibilityId_setButton)
                 .align(Alignment.CenterHorizontally)
                 .padding(bottom = LocalDimensions.current.spacing),
             onClick = callbacks::onSetClick

app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt

@@ -72,7 +72,7 @@ internal fun StartConversationScreen(
                 ItemButton(
                     textId = R.string.sessionInviteAFriend,
                     icon = R.drawable.ic_invite_friend,
-                    Modifier.contentDescription(R.string.AccessibilityId_sessionInviteAFriend),
+                    Modifier.contentDescription(R.string.AccessibilityId_sessionInviteAFriendButton),
                     onClick = delegate::onInviteFriend
                 )
                 Column(

app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt

@@ -66,7 +66,7 @@ internal fun InviteFriend(
             Text(
                 stringResource(R.string.shareAccountIdDescription).let { txt ->
                     val c = LocalContext.current
-                    Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.sessionMessenger)).format().toString()
+                    Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.app_name)).format().toString()
                 },
                 textAlign = TextAlign.Center,
                 style = LocalType.current.small,

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -1734,7 +1734,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         if (!hasSeenGIFMetaDataWarning) {
             showSessionDialog {
                 title(R.string.giphyWarning)
-                text(Phrase.from(context, R.string.giphyWarningDescription).put(APP_NAME_KEY, getString(R.string.sessionMessenger)).format())
+                text(Phrase.from(context, R.string.giphyWarningDescription).put(APP_NAME_KEY, getString(R.string.app_name)).format())
                 button(R.string.theContinue) {
                     textSecurePreferences.setHasSeenGIFMetaDataWarning()
                     selectGif()
@@ -1867,7 +1867,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 .request(Manifest.permission.RECORD_AUDIO)
                 .withRationaleDialog(getString(R.string.permissionsMicrophoneAccessRequired), R.drawable.ic_baseline_mic_48)
                 .withPermanentDenialDialog(Phrase.from(applicationContext, R.string.permissionsMicrophoneAccessRequiredAndroid)
-                    .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+                    .put(APP_NAME_KEY, getString(R.string.app_name))
                     .format().toString())
                 .execute()
         }
@@ -2164,12 +2164,12 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
                 .maxSdkVersion(Build.VERSION_CODES.P)
                 .withPermanentDenialDialog(Phrase.from(applicationContext, R.string.permissionsStorageSaveDenied)
-                    .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+                    .put(APP_NAME_KEY, getString(R.string.app_name))
                     .format().toString())
                 .onAnyDenied {
                     endActionMode()
                     val txt = Phrase.from(applicationContext, R.string.permissionsStorageSaveDenied)
-                                .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+                                .put(APP_NAME_KEY, getString(R.string.app_name))
                                 .format().toString()
                     Toast.makeText(this@ConversationActivityV2, txt, Toast.LENGTH_LONG).show()
                 }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt

@@ -302,7 +302,7 @@ fun ExpandButton(modifier: Modifier = Modifier, onClick: () -> Unit) {
     ) {
         Icon(
             painter = painterResource(id = R.drawable.ic_expand),
-            contentDescription = stringResource(id = R.string.expand),
+            contentDescription = stringResource(id = R.string.AccessibilityId_expand),
             modifier = Modifier.clickable { onClick() },
         )
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/Util.kt

@@ -293,7 +293,7 @@ object Util {
     }
 
     fun writeTextToClipboard(context: Context, text: String) {
-        writeTextToClipboard(context, context.getString(R.string.sessionMessenger), text)
+        writeTextToClipboard(context, context.getString(R.string.app_name), text)
     }
 
     fun writeTextToClipboard(context: Context, label: String, text: String) {

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt

@@ -16,7 +16,7 @@ class LinkPreviewDialog(private val onEnabled: () -> Unit) : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
         title(R.string.linkPreviewsEnable)
         val txt = Phrase.from(context, R.string.linkPreviewsFirstDescription)
-            .put(APP_NAME_KEY, context.getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, context.getString(R.string.app_name))
             .format()
         text(txt)
         button(R.string.enable) { enable() }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java

@@ -254,10 +254,10 @@ public class AttachmentManager {
 
     Context c = activity.getApplicationContext();
     String needStoragePermissionTxt = Phrase.from(c, R.string.permissionsStorageSend)
-            .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, c.getString(R.string.app_name))
             .format().toString();
     String storagePermissionDeniedTxt = Phrase.from(c, R.string.permissionsStorageSaveDenied)
-            .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, c.getString(R.string.app_name))
             .format().toString();
 
     builder.withPermanentDenialDialog(needStoragePermissionTxt)
@@ -270,10 +270,10 @@ public class AttachmentManager {
 
     Context c = activity.getApplicationContext();
     String needStoragePermissionTxt = Phrase.from(c, R.string.permissionsStorageSend)
-            .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, c.getString(R.string.app_name))
             .format().toString();
     String cameraPermissionDeniedTxt = Phrase.from(c, R.string.cameraGrantAccessDenied)
-            .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, c.getString(R.string.app_name))
             .format().toString();
 
     Permissions.PermissionsBuilder builder = Permissions.with(activity);
@@ -310,11 +310,11 @@ public class AttachmentManager {
   public void capturePhoto(Activity activity, int requestCode, Recipient recipient) {
 
     String cameraPermissionDeniedTxt = Phrase.from(context, R.string.cameraGrantAccessDenied)
-            .put(APP_NAME_KEY, context.getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, context.getString(R.string.app_name))
             .format().toString();
 
     String requireCameraPermissionTxt = Phrase.from(context, R.string.cameraGrantAccessDescription)
-            .put(APP_NAME_KEY, context.getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, context.getString(R.string.app_name))
             .format().toString();
 
     Permissions.with(activity)

app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java

@@ -263,7 +263,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
       }
 
       CharSequence errorTxt = Phrase.from(context, R.string.databaseErrorGeneric)
-              .put(APP_NAME_KEY, R.string.sessionMessenger)
+              .put(APP_NAME_KEY, R.string.app_name)
               .format();
 
       NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channelId)

app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java

@@ -120,7 +120,7 @@ public class ThreadRecord extends DisplayRecord {
             return emphasisAdded(context.getString(R.string.communityInvitation));
         } else if (MmsSmsColumns.Types.isLegacyType(type)) {
             String txt = Phrase.from(context, R.string.messageErrorOld)
-                    .put(APP_NAME_KEY, context.getString(R.string.sessionMessenger))
+                    .put(APP_NAME_KEY, context.getString(R.string.app_name))
                     .format().toString();
             return emphasisAdded(txt);
         } else if (MmsSmsColumns.Types.isDraftMessageType(type)) {

app/src/main/java/org/thoughtcrime/securesms/home/EmptyView.kt

@@ -49,7 +49,7 @@ internal fun EmptyView(newAccount: Boolean) {
             Text(
                 stringResource(R.string.onboardingBubbleWelcomeToSession).let { txt ->
                     val c = LocalContext.current
-                    Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.sessionMessenger)).format().toString()
+                    Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.app_name)).format().toString()
                 },
                 style = LocalType.current.base,
                 color = LocalColors.current.primary,

app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt

@@ -54,7 +54,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
         supportActionBar!!.title = resources.getString(R.string.onionRoutingPath)
 
         // Substitute the localised version of "Session" into the layout
-        val appName = applicationContext.getString(R.string.sessionMessenger)
+        val appName = applicationContext.getString(R.string.app_name)
         val txt = Phrase.from(applicationContext, R.string.onionRoutingPathDescription).put(APP_NAME_KEY, appName).format().toString()
         binding.pathDescription.text = txt
 

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java

@@ -363,10 +363,10 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
 
     Context c = getApplicationContext();
     String permanentDenialTxt = Phrase.from(c, R.string.cameraGrantAccessDenied)
-            .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, c.getString(R.string.app_name))
             .format().toString();
     String requireCameraPermissionsTxt = Phrase.from(c, R.string.cameraGrantAccessDescription)
-            .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, c.getString(R.string.app_name))
             .format().toString();
 
     Permissions.with(this)

app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java

@@ -34,7 +34,7 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
 
     setColor(context.getResources().getColor(R.color.textsecure_primary));
     setSmallIcon(R.drawable.ic_notification);
-    setContentTitle(context.getString(R.string.sessionMessenger));
+    setContentTitle(context.getString(R.string.app_name));
     setContentIntent(PendingIntent.getActivity(context, 0, new Intent(context, HomeActivity.class), PendingIntent.FLAG_IMMUTABLE));
     setCategory(NotificationCompat.CATEGORY_MESSAGE);
     setGroupSummary(true);

app/src/main/java/org/thoughtcrime/securesms/notifications/PushReceiver.kt

@@ -54,7 +54,7 @@ class PushReceiver @Inject constructor(@ApplicationContext val context: Context)
         val builder = NotificationCompat.Builder(context, NotificationChannels.OTHER)
             .setSmallIcon(R.drawable.ic_notification)
             .setColor(context.getColor(R.color.textsecure_primary))
-            .setContentTitle(getString(context, R.string.sessionMessenger))
+            .setContentTitle(getString(context, R.string.app_name))
 
             // Note: We set the count to 1 in the below plurals string so it says "You've got a new message" (singular)
             .setContentText(context.resources.getQuantityString(R.plurals.messageNewYouveGot, 1, 1))

app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java

@@ -107,7 +107,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
       }
 
     } else {
-      setContentTitle(context.getString(R.string.sessionMessenger));
+      setContentTitle(context.getString(R.string.app_name));
       setLargeIcon(new GeneratedContactPhoto("Unknown", R.drawable.ic_profile_default).asDrawable(context, ContactColors.UNKNOWN_COLOR.toConversationColor(context)));
     }
   }

app/src/main/java/org/thoughtcrime/securesms/onboarding/OnboardingBackPressAlertDialog.kt

@@ -23,7 +23,7 @@ fun OnboardingBackPressAlertDialog(
         title = stringResource(R.string.warning),
         text = stringResource(textId).let { txt ->
             val c = LocalContext.current
-            Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.sessionMessenger)).format().toString()
+            Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.app_name)).format().toString()
         },
         buttons = listOf(
             DialogButtonModel(

app/src/main/java/org/thoughtcrime/securesms/onboarding/landing/Landing.kt

@@ -136,7 +136,7 @@ internal fun LandingScreen(
                         item.stringId == R.string.onboardingBubbleSessionIsEngineered) {
                         AnimateMessageText(
                             Phrase.from(stringResource(item.stringId))
-                                .put(APP_NAME_KEY, stringResource(R.string.sessionMessenger))
+                                .put(APP_NAME_KEY, stringResource(R.string.app_name))
                                 .format().toString(),
                             item.isOutgoing
                         )

app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt

@@ -62,7 +62,7 @@ internal fun MessageNotificationsScreen(
             Spacer(Modifier.height(LocalDimensions.current.smallSpacing))
             Text(
                 Phrase.from(stringResource(R.string.onboardingMessageNotificationExplanation))
-                    .put(APP_NAME_KEY, stringResource(R.string.sessionMessenger))
+                    .put(APP_NAME_KEY, stringResource(R.string.app_name))
                     .format().toString(),
                 style = LocalType.current.base
             )
@@ -81,7 +81,7 @@ internal fun MessageNotificationsScreen(
         // spacing between buttons is provided by ripple/downstate of NotificationRadioButton
 
         val txt = Phrase.from(stringResource(R.string.onboardingMessageNotificationExplanation))
-            .put(APP_NAME_KEY, stringResource(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, stringResource(R.string.app_name))
             .format().toString()
         NotificationRadioButton(
             R.string.notificationsSlowMode,
@@ -131,7 +131,7 @@ private fun NotificationRadioButton(
                 // If this radio button is the one for slow mode notifications then substitute the app name..
                 if (explanation == R.string.notificationsSlowModeDescription) {
                     val txt = Phrase.from(stringResource(explanation))
-                        .put(APP_NAME_KEY, stringResource(R.string.sessionMessenger))
+                        .put(APP_NAME_KEY, stringResource(R.string.app_name))
                         .format().toString()
                     Text(
                         txt,

app/src/main/java/org/thoughtcrime/securesms/onboarding/ui/ContinueButton.kt

@@ -15,7 +15,7 @@ fun ContinuePrimaryOutlineButton(modifier: Modifier, onContinue: () -> Unit) {
     PrimaryOutlineButton(
         stringResource(R.string.theContinue),
         modifier = modifier
-            .contentDescription(R.string.AccessibilityId_continue)
+            .contentDescription(R.string.AccessibilityId_theContinue)
             .fillMaxWidth()
             .padding(horizontal = LocalDimensions.current.xlargeSpacing)
             .padding(bottom = LocalDimensions.current.smallSpacing),

app/src/main/java/org/thoughtcrime/securesms/permissions/SettingsDialog.kt

@@ -11,7 +11,7 @@ class SettingsDialog {
             context.showSessionDialog {
                 title(R.string.permissionsRequired)
                 text(message)
-                button(R.string.theContinue, R.string.AccessibilityId_continue) {
+                button(R.string.theContinue, R.string.AccessibilityId_theContinue) {
                     context.startActivity(Permissions.getApplicationSettingsIntent(context))
                 }
                 cancelButton()

app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt

@@ -48,13 +48,13 @@ class HelpSettingsFragment: CorrectedPreferenceFragment() {
         // String sub the summary text of the `export_logs` element in preferences_help.xml
         var exportPref = preferenceScreen.findPreference<Preference>(EXPORT_LOGS)
         exportPref?.summary = Phrase.from(context, R.string.helpReportABugExportLogsDescription)
-            .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, getString(R.string.app_name))
             .format()
 
         // String sub the summary text of the `translate_session` element in preferences_help.xml
         var translatePref = preferenceScreen.findPreference<Preference>(TRANSLATE)
         translatePref?.title = Phrase.from(context, R.string.helpHelpUsTranslateSession)
-            .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, getString(R.string.app_name))
             .format()
     }
 
@@ -102,11 +102,11 @@ class HelpSettingsFragment: CorrectedPreferenceFragment() {
             .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
             .maxSdkVersion(Build.VERSION_CODES.P)
             .withPermanentDenialDialog(Phrase.from(context, R.string.permissionsStorageSaveDenied)
-                .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+                .put(APP_NAME_KEY, getString(R.string.app_name))
                 .format().toString())
             .onAnyDenied {
                 val txt = Phrase.from(context, R.string.permissionsStorageSaveDenied)
-                    .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+                    .put(APP_NAME_KEY, getString(R.string.app_name))
                     .format().toString()
                 Toast.makeText(requireActivity(), txt, Toast.LENGTH_LONG).show()
             }

app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt

@@ -498,25 +498,25 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                     LargeItemButton(
                         R.string.sessionConversations,
                         R.drawable.ic_conversations,
-                        Modifier.contentDescription(R.string.AccessibilityId_conversations)
+                        Modifier.contentDescription(R.string.AccessibilityId_sessionConversations)
                     ) { show<ChatSettingsActivity>() }
                     Divider()
                     LargeItemButton(
                         R.string.sessionMessageRequests,
                         R.drawable.ic_message_requests,
-                        Modifier.contentDescription(R.string.AccessibilityId_message_requests)
+                        Modifier.contentDescription(R.string.AccessibilityId_sessionMessageRequests)
                     ) { show<MessageRequestsActivity>() }
                     Divider()
                     LargeItemButton(
                         R.string.sessionAppearance,
                         R.drawable.ic_appearance,
-                        Modifier.contentDescription(R.string.AccessibilityId_appearance)
+                        Modifier.contentDescription(R.string.AccessibilityId_sessionAppearance)
                     ) { show<AppearanceSettingsActivity>() }
                     Divider()
                     LargeItemButton(
                         R.string.sessionInviteAFriend,
                         R.drawable.ic_invite_friend,
-                        Modifier.contentDescription(R.string.AccessibilityId_invite_friend)
+                        Modifier.contentDescription(R.string.AccessibilityId_sessionInviteAFriend)
                     ) { sendInvitationToUseSession() }
                     Divider()
                     if (!prefs.getHidePassword()) {
@@ -536,7 +536,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                     LargeItemButton(
                         R.string.sessionClearData,
                         R.drawable.ic_message_details__trash,
-                        Modifier.contentDescription(R.string.AccessibilityId_clear_data),
+                        Modifier.contentDescription(R.string.AccessibilityId_sessionClearData),
                         dangerButtonColors()
                     ) { ClearAllDataDialog().show(supportFragmentManager, "Clear All Data Dialog") }
                 }

app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt

@@ -42,7 +42,7 @@ class ShareLogsDialog(private val updateCallback: (Boolean)->Unit): DialogFragme
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
         title(R.string.helpReportABugExportLogs)
-        val appName = context.getString(R.string.sessionMessenger)
+        val appName = context.getString(R.string.app_name)
         val txt = Phrase.from(context, R.string.helpReportABugDescription)
             .put(APP_NAME_KEY, appName)
             .format().toString()

app/src/main/java/org/thoughtcrime/securesms/preferences/Util.kt

@@ -17,7 +17,7 @@ fun Context.sendInvitationToUseSession() {
     val DOWNLOAD_URL = "https://getsession.org/download"
 
     val txt = Phrase.from(getString(R.string.accountIdShare))
-        .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+        .put(APP_NAME_KEY, getString(R.string.app_name))
         .put(ACCOUNT_ID_KEY, TextSecurePreferences.getLocalNumber(this@sendInvitationToUseSession))
         .put(DOWNLOAD_URL_KEY, DOWNLOAD_URL)
         .format().toString()

app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt

@@ -34,7 +34,7 @@ class RecoveryPasswordActivity : BaseActionBarActivity() {
         showSessionDialog {
             title(R.string.recoveryPasswordHidePermanently)
             htmlText(R.string.recoveryPasswordHidePermanentlyDescription1)
-            dangerButton(R.string.theContinue, R.string.AccessibilityId_continue) { onHideConfirm() }
+            dangerButton(R.string.theContinue, R.string.AccessibilityId_theContinue) { onHideConfirm() }
             cancelButton()
         }
     }

app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java

@@ -245,7 +245,7 @@ public class KeyCachingService extends Service {
     // Replace app name in title string
     Context c = getApplicationContext();
     String unlockedTxt = Phrase.from(c, R.string.lockAppUnlocked)
-            .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
+            .put(APP_NAME_KEY, c.getString(R.string.app_name))
             .format().toString();
     builder.setContentTitle(unlockedTxt);
 

app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java

@@ -53,7 +53,7 @@ public class QuickResponseService extends IntentService {
       Log.w(TAG, "Got quick response request when locked...");
       Context c = getApplicationContext();
       String txt = Phrase.from(c, R.string.lockAppQuickResponse)
-                      .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
+                      .put(APP_NAME_KEY, c.getString(R.string.app_name))
                       .format().toString();
       Toast.makeText(this, txt, Toast.LENGTH_LONG).show();
       return;

app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java

@@ -68,10 +68,10 @@ public class UpdateApkReadyListener extends BroadcastReceiver {
     PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE);
 
     CharSequence title = Phrase.from(context, R.string.updateSession)
-            .put(APP_NAME_KEY, context.getString(R.string.sessionMessenger)).format();
+            .put(APP_NAME_KEY, context.getString(R.string.app_name)).format();
 
     CharSequence txt = Phrase.from(context, R.string.updateNewVersion)
-            .put(APP_NAME_KEY, context.getString(R.string.sessionMessenger)).format();
+            .put(APP_NAME_KEY, context.getString(R.string.app_name)).format();
 
 
     Notification notification = new NotificationCompat.Builder(context, NotificationChannels.APP_UPDATES)

app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt

@@ -94,7 +94,7 @@ fun MaybeScanQrCode(
                 Text(
                     stringResource(R.string.cameraGrantAccessDenied).let { txt ->
                         val c = LocalContext.current
-                        Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.sessionMessenger)).format().toString()
+                        Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.app_name)).format().toString()
                     },
                     style = LocalType.current.base,
                     textAlign = TextAlign.Center
@@ -117,7 +117,7 @@ fun MaybeScanQrCode(
                 Text(
                     stringResource(R.string.cameraGrantAccessQr).let { txt ->
                         val c = LocalContext.current
-                        Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.sessionMessenger)).format().toString()
+                        Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.app_name)).format().toString()
                     },
                     style = LocalType.current.xl,
                     textAlign = TextAlign.Center

app/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java

@@ -49,7 +49,7 @@ public class LongClickCopySpan extends URLSpan {
   private void copyUriSdk11(Context context, String url) {
     android.content.ClipboardManager clipboard =
             (android.content.ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-    ClipData clip = ClipData.newPlainText(context.getString(R.string.sessionMessenger), url);
+    ClipData clip = ClipData.newPlainText(context.getString(R.string.app_name), url);
     clipboard.setPrimaryClip(clip);
   }
 

app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodePlaceholderFragment.kt

@@ -24,7 +24,7 @@ class ScanQRCodePlaceholderFragment: Fragment() {
         binding.grantCameraAccessButton.setOnClickListener { delegate?.requestCameraAccess() }
 
         binding.needCameraPermissionsTV.text = Phrase.from(context, R.string.cameraGrantAccessQr)
-                                                  .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
+                                                  .put(APP_NAME_KEY, getString(R.string.app_name))
                                                   .format()
     }
 }

app/src/main/res/layout-sw400dp/activity_display_name.xml

@@ -55,7 +55,7 @@
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/registerButton"
-        android:contentDescription="@string/AccessibilityId_continue"
+        android:contentDescription="@string/AccessibilityId_theContinue"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginLeft="@dimen/massive_spacing"

app/src/main/res/layout/activity_display_name.xml

@@ -54,7 +54,7 @@
 
     <Button
         style="@style/Widget.Session.Button.Common.ProminentFilled"
-        android:contentDescription="@string/AccessibilityId_continue"
+        android:contentDescription="@string/AccessibilityId_theContinue"
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="@dimen/medium_button_height"

app/src/main/res/layout/activity_home.xml

@@ -34,7 +34,7 @@
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="9dp"
-                    android:contentDescription="@string/AccessibilityId_user_settings" />
+                    android:contentDescription="@string/AccessibilityId_profilePicture" />
 
                 <org.thoughtcrime.securesms.home.PathStatusView
                     android:id="@+id/pathStatusView"

app/src/main/res/layout/activity_settings.xml

@@ -56,7 +56,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    android:contentDescription="@string/AccessibilityId_username"
+                    android:contentDescription="@string/AccessibilityId_displayName"
                     android:gravity="center"
                     android:textColor="?android:textColorPrimary"
                     android:textSize="@dimen/very_large_font_size"

app/src/main/res/layout/dialog_list_preference.xml

@@ -28,7 +28,7 @@
         app:layout_constraintBottom_toBottomOf="@id/titleTextView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/titleTextView"
-        android:contentDescription="@string/AccessibilityId_closeDialog" />
+        android:contentDescription="@string/AccessibilityId_close" />
 
     <TextView
         android:id="@+id/messageTextView"

app/src/main/res/layout/fragment_create_group.xml

@@ -44,7 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/small_spacing"
         android:clickable="true"
-        android:contentDescription="@string/AccessibilityId_closeDialog"
+        android:contentDescription="@string/AccessibilityId_close"
         android:focusable="true"
         android:src="@drawable/ic_baseline_close_24"
         app:layout_constraintBottom_toBottomOf="@id/titleText"

app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml

@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/deleteForMeTextView"
-        android:contentDescription="@string/AccessibilityId_deleteMessageMe"
+        android:contentDescription="@string/AccessibilityId_deleteMessageDeviceOnly"
         style="@style/BottomSheetActionItem"
         android:text="@string/clearMessagesForMe"
         android:textColor="?danger" />

app/src/main/res/layout/fragment_join_community.xml

@@ -47,7 +47,7 @@
         app:layout_constraintBottom_toBottomOf="@id/titleText"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/titleText"
-        android:contentDescription="@string/AccessibilityId_closeDialog" />
+        android:contentDescription="@string/AccessibilityId_close" />
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabLayout"

app/src/main/res/layout/fragment_new_message.xml

@@ -48,7 +48,7 @@
         app:layout_constraintBottom_toBottomOf="@id/titleText"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/titleText"
-        android:contentDescription="@string/AccessibilityId_closeDialog" />
+        android:contentDescription="@string/AccessibilityId_close" />
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabLayout"

app/src/main/res/layout/fragment_user_details_bottom_sheet.xml

@@ -58,7 +58,7 @@
                 android:id="@+id/nameEditIcon"
                 android:layout_width="20dp"
                 android:layout_height="22dp"
-                android:contentDescription="@string/AccessibilityId_edit_user_nickname"
+                android:contentDescription="@string/AccessibilityId_displayNameNew"
                 android:paddingTop="2dp"
                 android:layout_marginEnd="20dp"
                 android:src="@drawable/ic_baseline_edit_24" />
@@ -87,7 +87,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:contentDescription="@string/AccessibilityId_username"
+                android:contentDescription="@string/AccessibilityId_displayName"
                 android:textAlignment="center"
                 android:paddingVertical="12dp"
                 android:inputType="text"
@@ -125,7 +125,7 @@
         android:layout_width="wrap_content"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginTop="@dimen/medium_spacing"
-        android:contentDescription="@string/AccessibilityId_message_user"
+        android:contentDescription="@string/AccessibilityId_messageUser"
         android:paddingHorizontal="@dimen/large_spacing"
         android:text="@string/message" />
 

app/src/main/res/layout/thumbnail_view.xml

@@ -15,7 +15,7 @@
         android:clickable="false"
         android:longClickable="false"
         android:scaleType="fitCenter"
-        android:contentDescription="@string/contentDescriptionMediaMessage" />
+        android:contentDescription="@string/AccessibilityId_mediaMessage" />
 
     <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailProgressBar
         android:id="@+id/thumbnail_load_indicator"

app/src/main/res/layout/view_conversation_action_bar.xml

@@ -26,7 +26,7 @@
             android:id="@+id/conversationTitleView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/AccessibilityId_conversation_header_name"
+            android:contentDescription="@string/AccessibilityId_conversationTitle"
             tools:text="@tools:sample/full_names"
             android:textColor="?android:textColorPrimary"
             android:textStyle="bold"

app/src/main/res/layout/view_message_request_banner.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/conversation_unread_background"
-    android:contentDescription="@string/AccessibilityId_sessionMessageRequests"
+    android:contentDescription="@string/AccessibilityId_sessionMessageRequestsBanner"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:paddingStart="@dimen/accent_line_thickness"

content-descriptions/src/main/res/values/strings.xml

@@ -26,10 +26,10 @@
     <string name="AccessibilityId_recoveryPasswordEnter">Recovery phrase input</string>
     <string name="AccessibilityId_recoveryPasswordBanner">Reveal recovery phrase button</string>
     <string name="AccessibilityId_messageNewDescriptionMobile">Help desk link</string>
-    <string name="AccessibilityId_sessionInviteAFriend">Invite friend button</string>
+    <string name="AccessibilityId_sessionInviteAFriendButton">Invite friend button</string>
     <!-- Landing Page -->
     <!-- Session ID Page-->
-    <string name="AccessibilityId_continue">Continue</string>
+    <string name="AccessibilityId_theContinue">Continue</string>
     <!-- Recovery phrase input -->
     <!--Restore by seed page-->
     <!--Create Display Name    -->
@@ -51,7 +51,7 @@
     <string name="AccessibilityId_clearAll">Clear all</string>
     <string name="AccessibilityId_messageRequestsNonePending">No pending message requests</string>
     <string name="AccessibilityId_messageRequestsNew">Message request</string>
-    <string name="AccessibilityId_sessionMessageRequests">Message requests banner</string>
+    <string name="AccessibilityId_sessionMessageRequestsBanner">Message requests banner</string>
     <!--New conversation pop up-->
     <string name="AccessibilityId_groupCreate">Create group</string>
     <string name="AccessibilityId_communityJoin">Join community button</string>
@@ -126,48 +126,37 @@
     <string name="AccessibilityId_deliveryIndicator">Delivered</string>
     <!-- Delete message modal-->
     <string name="AccessibilityId_deleteMessageCancel">Cancel deletion</string>
-    <string name="AccessibilityId_deleteMessageEveryone">Delete for everyone</string>
+    <string name="AccessibilityId_deleteMessageEveryone">Delete for everyone</string>   <!-- ACL: Perhaps should be "AccessibilityId_clearMessagesForEveryone"? -->
-    <string name="AccessibilityId_deleteMessageMe">Delete just for me</string>
+    <string name="AccessibilityId_deleteMessageDeviceOnly">Delete just for me</string>  <!-- ACL: Perhaps should be "AccessibilityId_clearMessagesForMe"?       -->
     <!--Settings Page-->
-    <string name="AccessibilityId_appearance">Appearance</string>
+    <string name="AccessibilityId_sessionAppearance">Appearance</string>
     <string name="AccessibilityId_apply">Apply</string>
     <string name="AccessibilityId_cancel">Cancel</string>
-    <string name="AccessibilityId_cancel_button">Cancel</string>
+    <string name="AccessibilityId_sessionClearData">Clear data</string>
-    <string name="AccessibilityId_cancel_link_preview_button">Cancel</string>
+    <string name="AccessibilityId_conversationTitle">Conversation header name</string>
-    <string name="AccessibilityId_clear_data">Clear data</string>
+    <string name="AccessibilityId_sessionConversations">Conversations</string>
-    <string name="AccessibilityId_configuration_message">Configuration message</string>
+    <string name="AccessibilityId_disappearingMessagesOff">Disable disappearing messages</string>
-    <string name="AccessibilityId_conversation_header_name">Conversation header name</string>
+    <string name="AccessibilityId_disappearingMessagesDisappearAfterRead">Disappear after read option</string>
-    <string name="AccessibilityId_conversations">Conversations</string>
+    <string name="AccessibilityId_disappearingMessagesDisappearAfterSent">Disappear after send option</string>
-    <string name="AccessibilityId_disable_disappearing_messages">Disable disappearing messages</string>
+    <string name="AccessibilityId_disappearingMessagesDisappear">Disappearing messages type and time</string>
-    <string name="AccessibilityId_disappear_after_read_option">Disappear after read option</string>
+    <string name="AccessibilityId_displayNameNew">Edit user nickname</string>
-    <string name="AccessibilityId_disappear_after_send_option">Disappear after send option</string>
-    <string name="AccessibilityId_disappearing_messages_timer">Disappearing messages timer</string>
-    <string name="AccessibilityId_disappearing_messages_type_and_time">Disappearing messages type and time</string>
-    <string name="AccessibilityId_edit_user_nickname">Edit user nickname</string>
-    <string name="AccessibilityId_enable_link_preview_button">Enable</string>
     <string name="AccessibilityId_help">Help</string>
-    <string name="AccessibilityId_invite_friend">Invite a friend</string>
+    <string name="AccessibilityId_sessionInviteAFriend">Invite a friend</string>
-    <string name="AccessibilityId_message_requests">Message requests</string>
+    <string name="AccessibilityId_sessionMessageRequests">Message requests</string>
-    <string name="AccessibilityId_message_user">Message user</string>
+    <string name="AccessibilityId_messageUser">Message user</string>
     <string name="AccessibilityId_notifications">Notifications</string>
-    <string name="AccessibilityId_privacy">Privacy</string>
+    <string name="AccessibilityId_sessionPrivacy">Privacy</string>
-    <string name="AccessibilityId_set_button">Set button</string>
+    <string name="AccessibilityId_setButton">Set button</string>
-    <string name="AccessibilityId_show_recovery_phrase">Show recovery phrase</string>
+    <string name="AccessibilityId_displayName">Display name</string>
-    <string name="AccessibilityId_time_option">Time option</string>
-    <string name="AccessibilityId_user_settings">User settings</string>
-    <string name="AccessibilityId_username">Username</string>
-    <string name="AccessibilityId_username_input">Username input</string>
-    <string name="AccessibilityId_username_text">Username text</string>
 
     <!-- Misc. -->
     <string name="AccessibilityId_navigateBack">Navigate Back</string>
-    <string name="AccessibilityId_closeDialog">Close Dialog</string>
+    <string name="AccessibilityId_close">Close Dialog</string>
-    <string name="attachment_type_selector__gallery_description">Image or video</string>
+    <string name="AccessibilityId_expand">Expand</string>
-    <string name="attachment_type_selector__drawer_description">Toggle attachment drawer</string>
+    <string name="AccessibilityId_mediaMessage">Media message</string>
-    <string name="expand">Expand</string>
-    <string name="contentDescriptionMediaMessage">Media message</string>
 
-    <!-- REMOVE AFTER ONBOARDING GOES OUT -->
+    <!-- LEGACY DISAPPEARING MESSAGES WILL BE NO MORE & THIS CAN BE REMOVED AFTER ONBOARDING GOES OUT! -ACL -->
-    <string name="expiration_type_disappear_legacy_description">Original version of disappearing messages.</string>
+    <!-- Also, this is associated with the string: expiration_type_disappear_legacy                         -->
+    <string name="AccessibilityId_disappearingMessagesLegacy">Original version of disappearing messages.</string>
 
 </resources>

libsession/src/main/res/values-af-rZA/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Sessie</string>
+    <string name="app_name">Sessie</string>
     <string name="yes">Ja</string>
     <string name="no">Nee</string>
     <string name="delete">Skrap</string>

libsession/src/main/res/values-af/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Sessie</string>
+    <string name="app_name">Sessie</string>
     <string name="yes">Ja</string>
     <string name="no">Nee</string>
     <string name="delete">Skrap</string>

libsession/src/main/res/values-ar-rSA/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">نعم</string>
     <string name="no">لا</string>
     <string name="delete">حذف</string>

libsession/src/main/res/values-ar/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">نعم</string>
     <string name="no">لا</string>
     <string name="delete">حذف</string>

libsession/src/main/res/values-az-rAZ/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Bəli</string>
     <string name="no">Xeyr</string>
     <string name="delete">Sil</string>

libsession/src/main/res/values-az/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Bəli</string>
     <string name="no">Xeyr</string>
     <string name="delete">Sil</string>

libsession/src/main/res/values-be-rBY/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Сэсія</string>
+    <string name="app_name">Сэсія</string>
     <string name="yes">Так</string>
     <string name="no">Не</string>
     <string name="delete">Выдаліць</string>

libsession/src/main/res/values-be/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Сэсія</string>
+    <string name="app_name">Сэсія</string>
     <string name="yes">Так</string>
     <string name="no">Не</string>
     <string name="delete">Выдаліць</string>

libsession/src/main/res/values-bg-rBG/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Сесия</string>
+    <string name="app_name">Сесия</string>
     <string name="yes">Да</string>
     <string name="no">Не</string>
     <string name="delete">Изтрий</string>

libsession/src/main/res/values-bg/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Сесия</string>
+    <string name="app_name">Сесия</string>
     <string name="yes">Да</string>
     <string name="no">Не</string>
     <string name="delete">Изтрий</string>

libsession/src/main/res/values-ca-rES/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Sí</string>
     <string name="no">No</string>
     <string name="delete">Suprimeix</string>

libsession/src/main/res/values-ca/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Sí</string>
     <string name="no">No</string>
     <string name="delete">Suprimeix</string>

libsession/src/main/res/values-cs-rCZ/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Ano</string>
     <string name="no">Ne</string>
     <string name="delete">Smazat</string>

libsession/src/main/res/values-cs/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Ano</string>
     <string name="no">Ne</string>
     <string name="delete">Smazat</string>

libsession/src/main/res/values-da-rDK/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Ja</string>
     <string name="no">Nej</string>
     <string name="delete">Slet</string>

libsession/src/main/res/values-da/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Ja</string>
     <string name="no">Nej</string>
     <string name="delete">Slet</string>

libsession/src/main/res/values-de-rDE/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
     <string name="delete">Löschen</string>

libsession/src/main/res/values-de/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
     <string name="delete">Löschen</string>

libsession/src/main/res/values-el-rGR/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Ναι</string>
     <string name="no">Όχι</string>
     <string name="delete">Διαγραφή</string>

libsession/src/main/res/values-el/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Ναι</string>
     <string name="no">Όχι</string>
     <string name="delete">Διαγραφή</string>

libsession/src/main/res/values-eo-rUY/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Sesio</string>
+    <string name="app_name">Sesio</string>
     <string name="yes">Jes</string>
     <string name="no">Ne</string>
     <string name="delete">Forviŝi</string>

libsession/src/main/res/values-eo/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Sesio</string>
+    <string name="app_name">Sesio</string>
     <string name="yes">Jes</string>
     <string name="no">Ne</string>
     <string name="delete">Forviŝi</string>

libsession/src/main/res/values-es-rES/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Sesión</string>
+    <string name="app_name">Sesión</string>
     <string name="yes">Sí</string>
     <string name="no">No</string>
     <string name="delete">Borrar</string>

libsession/src/main/res/values-es/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Sesión</string>
+    <string name="app_name">Sesión</string>
     <string name="yes">Sí</string>
     <string name="no">No</string>
     <string name="delete">Borrar</string>

libsession/src/main/res/values-fa/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">بله</string>
     <string name="no">خیر</string>
     <string name="delete">حذف</string>

libsession/src/main/res/values-fi-rFI/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Kyllä</string>
     <string name="no">Ei</string>
     <string name="delete">Poista</string>

libsession/src/main/res/values-fi/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Kyllä</string>
     <string name="no">Ei</string>
     <string name="delete">Poista</string>

libsession/src/main/res/values-fr-rFR/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- ACL REMOVE THE LINE BELOW - JUST A TEST! -->
-    <string name="sessionMessenger" translatable="false">Le Session</string>
+    <string name="app_name" translatable="false">Le Session</string>
 
     <!-- MessageRecord -->
     <string name="you">Vous</string>

libsession/src/main/res/values-fr/strings.xml

@@ -2,7 +2,7 @@
 <resources>
 
     <!-- ACL REMOVE THE LINE BELOW - JUST A TEST! -->
-    <string name="sessionMessenger" translatable="false">Le Session</string>
+    <string name="app_name" translatable="false">Le Session</string>
 
 
     <!-- MessageRecord -->

libsession/src/main/res/values-gl-rES/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Si</string>
     <string name="no">Non</string>
     <string name="delete">Borrar</string>

libsession/src/main/res/values-gl/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Si</string>
     <string name="no">Non</string>
     <string name="delete">Borrar</string>

libsession/src/main/res/values-hi-rIN/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">सैशन</string>
+    <string name="app_name">सैशन</string>
     <string name="yes">हाँ </string>
     <string name="no">नहीं</string>
     <string name="delete">मिटाएं</string>

libsession/src/main/res/values-hi/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">सैशन</string>
+    <string name="app_name">सैशन</string>
     <string name="yes">हाँ </string>
     <string name="no">नहीं</string>
     <string name="delete">मिटाएं</string>

libsession/src/main/res/values-hu-rHU/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Igen</string>
     <string name="no">Nem</string>
     <string name="delete">Törlés</string>

libsession/src/main/res/values-hu/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Igen</string>
     <string name="no">Nem</string>
     <string name="delete">Törlés</string>

libsession/src/main/res/values-hy-rAM/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Այո</string>
     <string name="no">Ոչ</string>
     <string name="delete">Ջնջել</string>

libsession/src/main/res/values-hy/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Այո</string>
     <string name="no">Ոչ</string>
     <string name="delete">Ջնջել</string>

libsession/src/main/res/values-in-rID/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Ya</string>
     <string name="no">Tidak</string>
     <string name="delete">Hapus</string>

libsession/src/main/res/values-in/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Ya</string>
     <string name="no">Tidak</string>
     <string name="delete">Hapus</string>

libsession/src/main/res/values-it-rIT/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Sì</string>
     <string name="no">No</string>
     <string name="delete">Cancella</string>

libsession/src/main/res/values-it/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">Session</string>
+    <string name="app_name">Session</string>
     <string name="yes">Sì</string>
     <string name="no">No</string>
     <string name="delete">Cancella</string>

libsession/src/main/res/values-iw-rIL/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">ישיבה</string>
+    <string name="app_name">ישיבה</string>
     <string name="yes">כן</string>
     <string name="no">לא</string>
     <string name="delete">מחק</string>

libsession/src/main/res/values-iw/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sessionMessenger">ישיבה</string>
+    <string name="app_name">ישיבה</string>
     <string name="yes">כן</string>
     <string name="no">לא</string>
     <string name="delete">מחק</string>