diff --git a/library/ui-styles/src/main/res/values/stylable_pool_result_line.xml b/library/ui-styles/src/main/res/values/stylable_pool_result_line.xml
deleted file mode 100644
index 93e9851106..0000000000
--- a/library/ui-styles/src/main/res/values/stylable_pool_result_line.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <declare-styleable name="PollResultLineView">
-        <attr name="optionName" format="string" localization="suggested" />
-        <attr name="optionCount" format="string" />
-        <attr name="optionSelected" format="boolean" />
-        <attr name="optionIsWinner" format="boolean" />
-    </declare-styleable>
-
-</resources>
diff --git a/vector/lint.xml b/vector/lint.xml
index 9d9b208df7..818349da24 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -72,6 +72,7 @@
 
     <!-- Wording -->
     <issue id="Typos" severity="error" />
+    <issue id="TypographyDashes" severity="error" />
 
     <!-- Ignore lint issue in generated resource file from templates.
      https://github.com/LikeTheSalad/android-string-reference generates string from the default language
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
index 99af7851ef..74e4478635 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
@@ -134,10 +134,10 @@ class ElementRobot {
             activity.runOnUiThread { popup.performClick() }
 
             waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer))
-            waitUntilViewVisible(ViewMatchers.withText(R.string.skip))
-            clickOn(R.string.skip)
+            waitUntilViewVisible(ViewMatchers.withText(R.string.action_skip))
+            clickOn(R.string.action_skip)
             assertDisplayed(R.string.are_you_sure)
-            clickOn(R.string.skip)
+            clickOn(R.string.action_skip)
             waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer))
         }.onFailure { Timber.w("Verification popup missing", it) }
     }
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt b/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt
index d2d0967939..6f45091cf9 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt
@@ -56,7 +56,7 @@ object ConfirmationDialogBuilder {
                             ?.takeIf { it.isNotBlank() }
                     confirmation(reason)
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt b/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt
index 23c2e13f6f..8f70808087 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt
@@ -113,7 +113,7 @@ class GalleryOrCameraDialogHelper(
                 )) { _, which ->
                     onAvatarTypeSelected(if (which == 0) Type.Camera else Type.Gallery)
                 }
-                .setPositiveButton(R.string.cancel, null)
+                .setPositiveButton(R.string.action_cancel, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt
index 979558afd8..9e318bf693 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt
@@ -34,7 +34,7 @@ object ManuallyVerifyDialog {
                 .setPositiveButton(R.string.encryption_information_verify) { _, _ ->
                     onVerified()
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
 
         views.encryptedDeviceInfoDeviceName.text = cryptoDeviceInfo.displayName()
         views.encryptedDeviceInfoDeviceId.text = cryptoDeviceInfo.deviceId
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt
index dad1fba600..0b76446ce2 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt
@@ -57,7 +57,7 @@ class PhotoOrVideoDialog(
                         .setPositiveButton(R.string._continue) { _, _ ->
                             submit(views, vectorPreferences, listener)
                         }
-                        .setNegativeButton(R.string.cancel, null)
+                        .setNegativeButton(R.string.action_cancel, null)
                         .show()
             }
         }
@@ -98,11 +98,11 @@ class PhotoOrVideoDialog(
         MaterialAlertDialogBuilder(activity)
                 .setTitle(R.string.option_take_photo_video)
                 .setView(dialogLayout)
-                .setPositiveButton(R.string.save) { _, _ ->
+                .setPositiveButton(R.string.action_save) { _, _ ->
                     submitSettings(views)
                     listener.onUpdated()
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
index 39458a054a..f46737d6c6 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
@@ -151,7 +151,7 @@ class UnrecognizedCertificateDialog @Inject constructor(
             }
             builder.setNeutralButton(R.string.ssl_logout_account) { _, _ -> callback.onReject() }
         } else {
-            builder.setNegativeButton(R.string.cancel) { _, _ -> callback.onReject() }
+            builder.setNegativeButton(R.string.action_cancel) { _, _ -> callback.onReject() }
         }
 
         builder.setOnDismissListener {
diff --git a/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
index 11b9a693da..10ab0fc027 100644
--- a/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
@@ -68,7 +68,7 @@ fun Context.showIdentityServerConsentDialog(identityServerWithTerms: ServerAndPo
     MaterialAlertDialogBuilder(this)
             .setTitle(getString(R.string.identity_server_consent_dialog_title_2, identityServerWithTerms?.serverUrl.orEmpty()))
             .setMessage(content)
-            .setPositiveButton(R.string.reactions_agree) { _, _ ->
+            .setPositiveButton(R.string.action_agree) { _, _ ->
                 consentCallBack.invoke()
             }
             .setNegativeButton(R.string.action_not_now, null)
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index 06da70f391..9e7587056f 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -308,7 +308,7 @@ fun shareMedia(context: Context, file: File, mediaMimeType: String?) {
     val chooserIntent = ShareCompat.IntentBuilder(context)
             .setType(mediaMimeType)
             .setStream(mediaUri)
-            .setChooserTitle(R.string.share)
+            .setChooserTitle(R.string.action_share)
             .createChooserIntent()
 
     createChooser(context, chooserIntent)
@@ -318,7 +318,7 @@ fun shareText(context: Context, text: String) {
     val chooserIntent = ShareCompat.IntentBuilder(context)
             .setType("text/plain")
             .setText(text)
-            .setChooserTitle(R.string.share)
+            .setChooserTitle(R.string.action_share)
             .createChooserIntent()
 
     createChooser(context, chooserIntent)
diff --git a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
index ba396ed252..19dc341f12 100644
--- a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
@@ -168,6 +168,6 @@ fun FragmentActivity.onPermissionDeniedDialog(@StringRes rationaleMessage: Int)
             .setPositiveButton(R.string.open_settings) { _, _ ->
                 openAppSettingsPage(this)
             }
-            .setNegativeButton(R.string.cancel, null)
+            .setNegativeButton(R.string.action_cancel, null)
             .show()
 }
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index 5f9c5433fe..b4706780b7 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -209,7 +209,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
                     .setTitle(R.string.dialog_title_error)
                     .setMessage(errorFormatter.toHumanReadable(failure))
                     .setPositiveButton(R.string.global_retry) { _, _ -> doCleanUp() }
-                    .setNegativeButton(R.string.cancel) { _, _ -> startNextActivityAndFinish(ignoreClearCredentials = true) }
+                    .setNegativeButton(R.string.action_cancel) { _, _ -> startNextActivityAndFinish(ignoreClearCredentials = true) }
                     .setCancelable(false)
                     .show()
         }
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index 0fdfea8bff..a668f66f30 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -135,7 +135,7 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
                 .setPositiveButton(R.string.action_switch) { _, _ ->
                     jitsiViewModel.handle(JitsiCallViewActions.SwitchTo(action.args, false))
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
index cf6bd99f23..50d5e56483 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
@@ -78,7 +78,7 @@ class KeysBackupSettingsFragment @Inject constructor(private val keysBackupSetti
                     .setPositiveButton(R.string.keys_backup_settings_delete_confirm_title) { _, _ ->
                         viewModel.handle(KeyBackupSettingsAction.DeleteKeyBackup)
                     }
-                    .setNegativeButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.action_cancel, null)
                     .setCancelable(true)
                     .show()
         }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
index 3d2ef648ff..0db06209fe 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
@@ -177,8 +177,8 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() {
             MaterialAlertDialogBuilder(this)
                     .setTitle(R.string.keys_backup_setup_skip_title)
                     .setMessage(R.string.keys_backup_setup_skip_msg)
-                    .setNegativeButton(R.string.cancel, null)
-                    .setPositiveButton(R.string.leave) { _, _ ->
+                    .setNegativeButton(R.string.action_cancel, null)
+                    .setPositiveButton(R.string.action_leave) { _, _ ->
                         finish()
                     }
                     .show()
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
index 727180385d..8448422a56 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
@@ -119,7 +119,7 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
                 .setTitle(R.string.are_you_sure)
                 .setMessage(R.string.bootstrap_cancel_text)
                 .setPositiveButton(R.string._continue, null)
-                .setNegativeButton(R.string.skip) { _, _ ->
+                .setNegativeButton(R.string.action_skip) { _, _ ->
                     bottomSheetResult = ResultListener.RESULT_CANCEL
                     dismiss()
                 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
index 6c009d3786..14ffda58a9 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -92,7 +92,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
                                 tx.cancel()
                             }
                             addButton(
-                                    context.getString(R.string.ignore),
+                                    context.getString(R.string.action_ignore),
                                     { tx.cancel() }
                             )
                             addButton(
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt
index 05a5bb7238..f0909dbc26 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt
@@ -80,7 +80,7 @@ class VerificationCancelController @Inject constructor(
 
         bottomSheetVerificationActionItem {
             id("cancel")
-            title(host.stringProvider.getString(R.string.skip))
+            title(host.stringProvider.getString(R.string.action_skip))
             titleColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))
             iconRes(R.drawable.ic_arrow_right)
             iconColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt
index 5b9c82958e..34f97d3cb2 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt
@@ -56,7 +56,7 @@ class VerificationNotMeController @Inject constructor(
 
         bottomSheetVerificationActionItem {
             id("skip")
-            title(host.stringProvider.getString(R.string.skip))
+            title(host.stringProvider.getString(R.string.action_skip))
             titleColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
             iconRes(R.drawable.ic_arrow_right)
             iconColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
index d8082865c8..d40ee1f5c9 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
@@ -93,7 +93,7 @@ class VerificationRequestController @Inject constructor(
 
             bottomSheetVerificationActionItem {
                 id("skip")
-                title(host.stringProvider.getString(R.string.skip))
+                title(host.stringProvider.getString(R.string.action_skip))
                 titleColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))
                 iconRes(R.drawable.ic_arrow_right)
                 iconColor(host.colorProvider.getColorFromAttribute(R.attr.colorError))
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
index 2c37a19e7d..523e8cb9bb 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
@@ -153,7 +153,7 @@ class DiscoverySettingsFragment @Inject constructor(
                     .setTitle(R.string.change_identity_server)
                     .setMessage(getString(R.string.settings_discovery_disconnect_with_bound_pid, state.identityServer(), state.identityServer()))
                     .setPositiveButton(R.string._continue) { _, _ -> navigateToChangeIdentityServerFragment() }
-                    .setNegativeButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.action_cancel, null)
                     .show()
             Unit
         } else {
@@ -177,8 +177,8 @@ class DiscoverySettingsFragment @Inject constructor(
             MaterialAlertDialogBuilder(requireActivity())
                     .setTitle(R.string.disconnect_identity_server)
                     .setMessage(message)
-                    .setPositiveButton(R.string.disconnect) { _, _ -> viewModel.handle(DiscoverySettingsAction.DisconnectIdentityServer) }
-                    .setNegativeButton(R.string.cancel, null)
+                    .setPositiveButton(R.string.action_disconnect) { _, _ -> viewModel.handle(DiscoverySettingsAction.DisconnectIdentityServer) }
+                    .setNegativeButton(R.string.action_cancel, null)
                     .show()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
index fcea2e92b1..f71f224034 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
@@ -119,7 +119,7 @@ class SetIdentityServerFragment @Inject constructor(
                             .setPositiveButton(R.string._continue) { _, _ ->
                                 processIdentityServerChange()
                             }
-                            .setNegativeButton(R.string.cancel, null)
+                            .setNegativeButton(R.string.action_cancel, null)
                             .show()
                     Unit
                 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index e2696115f4..293f3426d5 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -400,7 +400,7 @@ class HomeActivity :
                     dismissedAction = Runnable {
                         homeActivityViewModel.handle(HomeActivityViewActions.PushPromptHasBeenReviewed)
                     }
-                    addButton(getString(R.string.dismiss), {
+                    addButton(getString(R.string.action_dismiss), {
                         homeActivityViewModel.handle(HomeActivityViewActions.PushPromptHasBeenReviewed)
                     }, true)
                     addButton(getString(R.string.settings), {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 0d454201cd..620730cb4d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -397,7 +397,7 @@ class RoomDetailFragment @Inject constructor(
             when (mode) {
                 is SendMode.Regular -> renderRegularMode(mode.text)
                 is SendMode.Edit    -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_edit, R.string.edit, mode.text)
-                is SendMode.Quote   -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_quote, R.string.quote, mode.text)
+                is SendMode.Quote   -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_quote, R.string.action_quote, mode.text)
                 is SendMode.Reply   -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_reply, R.string.reply, mode.text)
                 is SendMode.Voice   -> renderVoiceMessageMode(mode.text)
             }
@@ -1054,7 +1054,7 @@ class RoomDetailFragment @Inject constructor(
                 .setPositiveButton(R.string.settings) { _, _ ->
                     navigator.openSettings(requireActivity(), VectorSettingsActivity.EXTRA_DIRECT_ACCESS_GENERAL)
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
@@ -1062,7 +1062,7 @@ class RoomDetailFragment @Inject constructor(
         autoCompleter.exitSpecialMode()
         views.composerLayout.collapse()
         views.composerLayout.setTextIfDifferent(content)
-        views.composerLayout.views.sendButton.contentDescription = getString(R.string.send)
+        views.composerLayout.views.sendButton.contentDescription = getString(R.string.action_send)
     }
 
     private fun renderSpecialMode(event: TimelineEvent,
@@ -1574,7 +1574,7 @@ class RoomDetailFragment @Inject constructor(
                     val reason = views.dialogReportContentInput.text.toString()
                     roomDetailViewModel.handle(RoomDetailAction.ReportContent(action.eventId, action.senderId, reason))
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
@@ -1584,7 +1584,7 @@ class RoomDetailFragment @Inject constructor(
                         activity = requireActivity(),
                         askForReason = action.askForReason,
                         confirmationRes = action.dialogDescriptionRes,
-                        positiveRes = R.string.remove,
+                        positiveRes = R.string.action_remove,
                         reasonHintRes = R.string.delete_event_dialog_reason_hint,
                         titleRes = action.dialogTitleRes
                 ) { reason ->
@@ -1704,7 +1704,7 @@ class RoomDetailFragment @Inject constructor(
                             .setPositiveButton(R.string._continue) { _, _ ->
                                 openUrlInExternalBrowser(requireContext(), url)
                             }
-                            .setNegativeButton(R.string.cancel, null)
+                            .setNegativeButton(R.string.action_cancel, null)
                             .show()
                 } else {
                     // Open in external browser, in a new Tab
@@ -2076,7 +2076,7 @@ class RoomDetailFragment @Inject constructor(
         MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog)
                 .setTitle(R.string.end_poll_confirmation_title)
                 .setMessage(R.string.end_poll_confirmation_description)
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .setPositiveButton(R.string.end_poll_confirmation_approve_button) { _, _ ->
                     roomDetailViewModel.handle(RoomDetailAction.EndPoll(eventId))
                 }
@@ -2087,7 +2087,7 @@ class RoomDetailFragment @Inject constructor(
         MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
                 .setTitle(R.string.room_participants_action_ignore_title)
                 .setMessage(R.string.room_participants_action_ignore_prompt_msg)
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .setPositiveButton(R.string.room_participants_action_ignore) { _, _ ->
                     roomDetailViewModel.handle(RoomDetailAction.IgnoreUser(senderId))
                 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
index 92a75b449a..6b5ed3ba66 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
@@ -97,7 +97,7 @@ class StartCallActionsHandler(
                                     // create the widget, then navigate to it..
                                     roomDetailViewModel.handle(RoomDetailAction.AddJitsiWidget(isVideoCall))
                                 }
-                                .setNegativeButton(fragment.getString(R.string.cancel), null)
+                                .setNegativeButton(fragment.getString(R.string.action_cancel), null)
                                 .show()
                     }
                 }
@@ -112,7 +112,7 @@ class StartCallActionsHandler(
                     .setPositiveButton(if (isVideoCall) R.string.start_video_call else R.string.start_voice_call) { _, _ ->
                         safeStartCall2(isVideoCall)
                     }
-                    .setNegativeButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.action_cancel, null)
                     .show()
         } else {
             safeStartCall2(isVideoCall)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
index 30d69d6533..39e04e8ae4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
@@ -43,28 +43,28 @@ sealed class EventSharedAction(@StringRes val titleRes: Int,
             EventSharedAction(R.string.edit, R.drawable.ic_edit)
 
     data class Quote(val eventId: String) :
-            EventSharedAction(R.string.quote, R.drawable.ic_quote)
+            EventSharedAction(R.string.action_quote, R.drawable.ic_quote)
 
     data class Reply(val eventId: String) :
             EventSharedAction(R.string.reply, R.drawable.ic_reply)
 
     data class Share(val eventId: String, val messageContent: MessageContent) :
-            EventSharedAction(R.string.share, R.drawable.ic_share)
+            EventSharedAction(R.string.action_share, R.drawable.ic_share)
 
     data class Save(val eventId: String, val messageContent: MessageWithAttachmentContent) :
-            EventSharedAction(R.string.save, R.drawable.ic_material_save)
+            EventSharedAction(R.string.action_save, R.drawable.ic_material_save)
 
     data class Resend(val eventId: String) :
             EventSharedAction(R.string.global_retry, R.drawable.ic_refresh_cw)
 
     data class Remove(val eventId: String) :
-            EventSharedAction(R.string.remove, R.drawable.ic_trash, true)
+            EventSharedAction(R.string.action_remove, R.drawable.ic_trash, true)
 
     data class Redact(val eventId: String, val askForReason: Boolean, val dialogTitleRes: Int, val dialogDescriptionRes: Int) :
             EventSharedAction(R.string.message_action_item_redact, R.drawable.ic_delete, true)
 
     data class Cancel(val eventId: String, val force: Boolean) :
-            EventSharedAction(R.string.cancel, R.drawable.ic_close_round)
+            EventSharedAction(R.string.action_cancel, R.drawable.ic_close_round)
 
     data class ViewSource(val content: String) :
             EventSharedAction(R.string.view_source, R.drawable.ic_view_source)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
index b8d7d96ecf..89c9c51f0c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
@@ -56,7 +56,7 @@ class EncryptedItemFactory @Inject constructor(private val messageInformationDat
                 val spannableStr = if (vectorPreferences.developerMode()) {
                     val errorDescription =
                             if (cryptoError == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID) {
-                                stringProvider.getString(R.string.notice_crypto_error_unkwown_inbound_session_id)
+                                stringProvider.getString(R.string.notice_crypto_error_unknown_inbound_session_id)
                             } else {
                                 // TODO i18n
                                 cryptoError?.name
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
index 5f8ac822da..5abc9d714c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
@@ -142,7 +142,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
         when {
             attributes.callKind == CallKind.CONFERENCE -> {
                 holder.rejectView.isVisible = true
-                holder.rejectView.setText(R.string.leave)
+                holder.rejectView.setText(R.string.action_leave)
                 holder.rejectView.setLeftDrawable(R.drawable.ic_call_hangup, R.attr.colorOnPrimary)
                 holder.rejectView.onClick {
                     attributes.callback?.onTimelineItemAction(RoomDetailAction.LeaveJitsiCall)
@@ -176,7 +176,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
                 }
                 holder.acceptView.isVisible = true
                 holder.rejectView.isVisible = false
-                holder.acceptView.setText(R.string.join)
+                holder.acceptView.setText(R.string.action_join)
                 holder.acceptView.setLeftDrawable(R.drawable.ic_call_video_small, R.attr.colorOnPrimary)
             }
             !attributes.informationData.sentByMe && attributes.isStillActive -> {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt
deleted file mode 100644
index aa864851cd..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package im.vector.app.features.home.room.detail.timeline.item
-
-import android.content.Context
-import android.graphics.Typeface
-import android.util.AttributeSet
-import android.view.View
-import android.widget.LinearLayout
-import androidx.core.content.withStyledAttributes
-import im.vector.app.R
-import im.vector.app.core.extensions.setTextOrHide
-import im.vector.app.databinding.ViewPollResultLineBinding
-
-class PollResultLineView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
-
-    private val views: ViewPollResultLineBinding
-
-    var label: String? = null
-        set(value) {
-            field = value
-            views.pollResultItemLabel.setTextOrHide(value)
-        }
-
-    var percent: String? = null
-        set(value) {
-            field = value
-            views.pollResultItemPercent.setTextOrHide(value)
-        }
-
-    var optionSelected: Boolean = false
-        set(value) {
-            field = value
-            views.pollResultItemSelectedIcon.visibility = if (value) View.VISIBLE else View.INVISIBLE
-        }
-
-    var isWinner: Boolean = false
-        set(value) {
-            field = value
-            // Text in main color
-            views.pollResultItemLabel.setTypeface(views.pollResultItemLabel.typeface, if (value) Typeface.BOLD else Typeface.NORMAL)
-            views.pollResultItemPercent.setTypeface(views.pollResultItemPercent.typeface, if (value) Typeface.BOLD else Typeface.NORMAL)
-        }
-
-    init {
-        inflate(context, R.layout.view_poll_result_line, this)
-        views = ViewPollResultLineBinding.bind(this)
-        orientation = HORIZONTAL
-
-        context.withStyledAttributes(attrs, R.styleable.PollResultLineView) {
-            label = getString(R.styleable.PollResultLineView_optionName) ?: ""
-            percent = getString(R.styleable.PollResultLineView_optionCount) ?: ""
-            optionSelected = getBoolean(R.styleable.PollResultLineView_optionSelected, false)
-            isWinner = getBoolean(R.styleable.PollResultLineView_optionIsWinner, false)
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index f67abfbc88..5171319a41 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -404,10 +404,10 @@ class RoomListFragment @Inject constructor(
         MaterialAlertDialogBuilder(requireContext(), if (isPublicRoom) 0 else R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
                 .setTitle(R.string.room_participants_leave_prompt_title)
                 .setMessage(message)
-                .setPositiveButton(R.string.leave) { _, _ ->
+                .setPositiveButton(R.string.action_leave) { _, _ ->
                     roomListViewModel.handle(RoomListAction.LeaveRoom(roomId))
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index bf289c2e7d..ff57544a36 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -72,7 +72,7 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
                 )
                 .buttonLabel(
                         if (error != null) stringProvider.getString(R.string.global_retry)
-                        else stringProvider.getString(R.string.join)
+                        else stringProvider.getString(R.string.action_join)
                 )
                 .loading(suggestedRoomJoiningStates[spaceChildInfo.childRoomId] is Loading)
                 .memberCount(spaceChildInfo.activeMemberCount ?: 0)
diff --git a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
index c22f8eb779..2cb41784b7 100644
--- a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
@@ -121,7 +121,7 @@ class LinkHandlerActivity : VectorBaseActivity<ActivityProgressBinding>() {
                 .setMessage(R.string.error_user_already_logged_in)
                 .setCancelable(false)
                 .setPositiveButton(R.string.logout) { _, _ -> safeSignout(uri) }
-                .setNegativeButton(R.string.cancel) { _, _ -> finish() }
+                .setNegativeButton(R.string.action_cancel) { _, _ -> finish() }
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
index f8b302d5e7..52bd80a16f 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt
@@ -88,7 +88,7 @@ class LoginResetPasswordFragment @Inject constructor() : AbstractLoginFragment<F
                     .setPositiveButton(R.string.login_reset_password_warning_submit) { _, _ ->
                         doSubmit()
                     }
-                    .setNegativeButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.action_cancel, null)
                     .show()
         } else {
             doSubmit()
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
index 527f9f99b3..dd0bfc0ed6 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
@@ -79,7 +79,7 @@ class LoginSplashFragment @Inject constructor(
                     .setPositiveButton(R.string.login_error_homeserver_from_url_not_found_enter_manual) { _, _ ->
                         loginViewModel.handle(LoginAction.OnGetStarted(resetLoginConfig = true))
                     }
-                    .setNegativeButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.action_cancel, null)
                     .show()
         } else {
             super.onError(throwable)
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt
index c00ed7275c..038a12bea7 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt
@@ -124,7 +124,7 @@ class LoginResetPasswordFragment2 @Inject constructor() : AbstractLoginFragment2
                         showWarning = false
                         doSubmit()
                     }
-                    .setNegativeButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.action_cancel, null)
                     .show()
         } else {
             doSubmit()
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
index c1f45c6713..92fd26e5e8 100644
--- a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
@@ -107,7 +107,7 @@ class AccountCreatedFragment @Inject constructor(
                     val newName = views.editText.text.toString()
                     viewModel.handle(AccountCreatedAction.SetDisplayName(newName))
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
index 26df42dbe1..3b0fc175b0 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -108,7 +108,7 @@ class MatrixToRoomSpaceFragment @Inject constructor(
                                 views.matrixToCardMainButton.isVisible = true
                                 views.matrixToCardSecondaryButton.isVisible = true
                                 views.matrixToCardMainButton.button.text = getString(joinTextRes)
-                                views.matrixToCardSecondaryButton.button.text = getString(R.string.decline)
+                                views.matrixToCardSecondaryButton.button.text = getString(R.string.action_decline)
                             }
                             Membership.JOIN   -> {
                                 views.matrixToCardMainButton.isVisible = true
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index 1479e577e7..96e8c2af4b 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -691,7 +691,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
 
                     addAction(
                             R.drawable.vector_notification_reject_invitation,
-                            stringProvider.getString(R.string.reject),
+                            stringProvider.getString(R.string.action_reject),
                             rejectIntentPendingIntent
                     )
 
@@ -708,7 +708,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                     )
                     addAction(
                             R.drawable.vector_notification_accept_invitation,
-                            stringProvider.getString(R.string.join),
+                            stringProvider.getString(R.string.action_join),
                             joinIntentPendingIntent
                     )
 
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
index 2309d42f60..a42e88f06d 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
@@ -162,7 +162,7 @@ class PinFragment @Inject constructor(
                 .setPositiveButton(getString(R.string.auth_pin_new_pin_action)) { _, _ ->
                     launchResetPinFlow()
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
index 08eab292a8..ab1c605582 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
@@ -302,7 +302,7 @@ class RoomMemberProfileController @Inject constructor(
         return if (isIgnored) {
             stringProvider.getString(R.string.unignore)
         } else {
-            stringProvider.getString(R.string.ignore)
+            stringProvider.getString(R.string.action_ignore)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
index 48823714f5..40b6a0fe9b 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -168,7 +168,7 @@ class RoomMemberProfileFragment @Inject constructor(
                                 .withArgs(roomId = null, otherUserId = startVerification.userId)
                                 .show(parentFragmentManager, "VERIF")
                     }
-                    .setNegativeButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.action_cancel, null)
                     .show()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
index e6b898c2b9..926c9fb60e 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
@@ -61,7 +61,7 @@ object EditPowerLevelDialogs {
                     }
                     listener(newValue)
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .setOnKeyListener(DialogInterface.OnKeyListener
                 { dialog, keyCode, event ->
                     if (event.action == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
@@ -96,7 +96,7 @@ object EditPowerLevelDialogs {
                 .setPositiveButton(R.string.room_participants_power_level_demote) { _, _ ->
                     onValidate()
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index 5a8519ecb4..ee4d0601c6 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -235,7 +235,7 @@ class RoomProfileFragment @Inject constructor(
         MaterialAlertDialogBuilder(requireActivity())
                 .setTitle(R.string.room_settings_enable_encryption_dialog_title)
                 .setMessage(R.string.room_settings_enable_encryption_dialog_content)
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .setPositiveButton(R.string.room_settings_enable_encryption_dialog_submit) { _, _ ->
                     roomProfileViewModel.handle(RoomProfileAction.EnableEncryption)
                 }
@@ -284,10 +284,10 @@ class RoomProfileFragment @Inject constructor(
         MaterialAlertDialogBuilder(requireContext(), if (isPublicRoom) 0 else R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
                 .setTitle(R.string.room_participants_leave_prompt_title)
                 .setMessage(message)
-                .setPositiveButton(R.string.leave) { _, _ ->
+                .setPositiveButton(R.string.action_leave) { _, _ ->
                     roomProfileViewModel.handle(RoomProfileAction.LeaveRoom)
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt
index 15686a6848..3128a590ce 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt
@@ -135,7 +135,7 @@ class RoomAliasFragment @Inject constructor(
         MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
                 .setTitle(R.string.dialog_title_confirmation)
                 .setMessage(getString(R.string.room_alias_unpublish_confirmation, alias))
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .setPositiveButton(R.string.action_unpublish) { _, _ ->
                     viewModel.handle(RoomAliasAction.UnpublishAlias(alias))
                 }
@@ -190,8 +190,8 @@ class RoomAliasFragment @Inject constructor(
         MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
                 .setTitle(R.string.dialog_title_confirmation)
                 .setMessage(getString(R.string.room_alias_delete_confirmation, alias))
-                .setNegativeButton(R.string.cancel, null)
-                .setPositiveButton(R.string.delete) { _, _ ->
+                .setNegativeButton(R.string.action_cancel, null)
+                .setPositiveButton(R.string.action_delete) { _, _ ->
                     viewModel.handle(RoomAliasAction.RemoveLocalAlias(alias))
                 }
                 .show()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt
index d7cb923603..7625972b05 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt
@@ -28,7 +28,7 @@ sealed class RoomAliasBottomSheetSharedAction(
     VectorSharedAction {
 
     data class ShareAlias(val matrixTo: String) : RoomAliasBottomSheetSharedAction(
-            R.string.share,
+            R.string.action_share,
             R.drawable.ic_material_share
     )
 
@@ -41,7 +41,7 @@ sealed class RoomAliasBottomSheetSharedAction(
     )
 
     data class DeleteAlias(val alias: String) : RoomAliasBottomSheetSharedAction(
-            R.string.delete,
+            R.string.action_delete,
             R.drawable.ic_trash_24,
             true
     )
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index 8840f61600..ba7e020ebe 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -126,8 +126,8 @@ class RoomMemberListFragment @Inject constructor(
             MaterialAlertDialogBuilder(requireActivity())
                     .setTitle(R.string.three_pid_revoke_invite_dialog_title)
                     .setMessage(getString(R.string.three_pid_revoke_invite_dialog_content, content.displayName))
-                    .setNegativeButton(R.string.cancel, null)
-                    .setPositiveButton(R.string.revoke) { _, _ ->
+                    .setNegativeButton(R.string.action_cancel, null)
+                    .setPositiveButton(R.string.action_revoke) { _, _ ->
                         viewModel.handle(RoomMemberListAction.RevokeThreePidInvite(stateKey))
                     }
                     .show()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
index 0a5f8f4d9a..3fa0bbaa5b 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
@@ -231,7 +231,7 @@ class RoomSettingsFragment @Inject constructor(
                         .setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ ->
                             viewModel.handle(RoomSettingsAction.Cancel)
                         }
-                        .setNegativeButton(R.string.cancel, null)
+                        .setNegativeButton(R.string.action_cancel, null)
                         .show()
                 true
             } else {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt
index eaf19fe075..4e42cce3ee 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleFragment.kt
@@ -60,7 +60,7 @@ class RoomJoinRuleFragment @Inject constructor(
                     .setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ ->
                         requireActivity().finish()
                     }
-                    .setNegativeButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.action_cancel, null)
                     .show()
             return true
         }
@@ -75,7 +75,7 @@ class RoomJoinRuleFragment @Inject constructor(
             views.cancelButton.isVisible = true
             views.positiveButton.text = getString(R.string.warning_unsaved_change_discard)
             views.positiveButton.isVisible = true
-            views.positiveButton.text = getString(R.string.save)
+            views.positiveButton.text = getString(R.string.action_save)
             views.positiveButton.debouncedClicks {
                 viewModel.handle(RoomJoinRuleChooseRestrictedActions.DoUpdateJoinRules)
             }
diff --git a/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt b/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt
index 95a0422742..c64ade96c0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/BackgroundSyncModeChooserDialog.kt
@@ -35,7 +35,7 @@ class BackgroundSyncModeChooserDialog : DialogFragment() {
         val dialog = MaterialAlertDialogBuilder(requireActivity())
                 .setTitle(R.string.settings_background_fdroid_sync_mode)
                 .setView(view)
-                .setPositiveButton(R.string.cancel, null)
+                .setPositiveButton(R.string.action_cancel, null)
                 .create()
 
         views.backgroundSyncModeBattery.setOnClickListener {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index 27548dc756..c572b72ca8 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -371,7 +371,7 @@ class VectorSettingsGeneralFragment @Inject constructor(
                     .setView(view)
                     .setCancelable(false)
                     .setPositiveButton(R.string.settings_change_password, null)
-                    .setNegativeButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.action_cancel, null)
                     .setOnDismissListener {
                         view.hideKeyboard()
                     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
index dbea253649..2e2fab06a3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@@ -187,7 +187,7 @@ class VectorSettingsPreferencesFragment @Inject constructor(
                 .setTitle(R.string.font_size)
                 .setView(layout)
                 .setPositiveButton(R.string.ok, null)
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
 
         val index = FontScale.getFontScaleValue(activity).index
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
index 22e1e67aa4..b35d32f473 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
@@ -272,7 +272,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
         }
         bottomSheetVerificationActionItem {
             id("rename")
-            title(host.stringProvider.getString(R.string.rename))
+            title(host.stringProvider.getString(R.string.action_rename))
             titleColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
             iconRes(R.drawable.ic_arrow_right)
             iconColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
index 531e9a944b..5bbb03c8a4 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
@@ -136,7 +136,7 @@ class VectorSettingsDevicesFragment @Inject constructor(
 
                     viewModel.handle(DevicesAction.Rename(deviceInfo.deviceId!!, newName))
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt
index a586e14d99..bce15bbf4b 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt
@@ -82,10 +82,10 @@ class AccountDataFragment @Inject constructor(
 
     override fun didLongTap(data: UserAccountDataEvent) {
         MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
-                .setTitle(R.string.delete)
+                .setTitle(R.string.action_delete)
                 .setMessage(getString(R.string.delete_account_data_warning, data.type))
-                .setNegativeButton(R.string.cancel, null)
-                .setPositiveButton(R.string.delete) { _, _ ->
+                .setNegativeButton(R.string.action_cancel, null)
+                .setPositiveButton(R.string.action_delete) { _, _ ->
                     viewModel.handle(AccountDataAction.DeleteAccountData(data.type))
                 }
                 .show()
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index a893f0f508..bdb1fb895f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -184,10 +184,10 @@ class ThreePidsSettingsFragment @Inject constructor(
     override fun deleteThreePid(threePid: ThreePid) {
         MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
                 .setMessage(getString(R.string.settings_remove_three_pid_confirmation_content, threePid.getFormattedValue()))
-                .setPositiveButton(R.string.remove) { _, _ ->
+                .setPositiveButton(R.string.action_remove) { _, _ ->
                     viewModel.handle(ThreePidsSettingsAction.DeleteThreePid(threePid))
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
index e1efef4d5a..62fb064536 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
@@ -200,10 +200,10 @@ class IncomingShareFragment @Inject constructor(
         MaterialAlertDialogBuilder(requireActivity())
                 .setTitle(R.string.send_attachment)
                 .setMessage(getString(R.string.share_confirm_room, roomSummary.displayName))
-                .setPositiveButton(R.string.send) { _, _ ->
+                .setPositiveButton(R.string.action_send) { _, _ ->
                     navigator.openRoomForSharingAndFinish(requireActivity(), roomSummary.roomId, sharedData)
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
index 016d340f80..f40f35a6e2 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
@@ -127,7 +127,7 @@ class SoftLogoutFragment @Inject constructor(
             MaterialAlertDialogBuilder(requireActivity(), R.style.ThemeOverlay_Vector_MaterialAlertDialog_Destructive)
                     .setTitle(R.string.soft_logout_clear_data_dialog_title)
                     .setMessage(messageResId)
-                    .setNegativeButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.action_cancel, null)
                     .setPositiveButton(R.string.soft_logout_clear_data_submit) { _, _ ->
                         softLogoutViewModel.handle(SoftLogoutAction.ClearData)
                     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index 977294f495..6dadce30e0 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -156,7 +156,7 @@ class SpaceDirectoryController @Inject constructor(
                                 when {
                                     error != null -> host.stringProvider.getString(R.string.global_retry)
                                     isJoined      -> host.stringProvider.getString(R.string.action_open)
-                                    else          -> host.stringProvider.getString(R.string.join)
+                                    else          -> host.stringProvider.getString(R.string.action_join)
                                 }
                         )
                         apply {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index cd7d6a379a..f630323790 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -215,7 +215,7 @@ class SpaceDirectoryFragment @Inject constructor(
                             .setPositiveButton(R.string._continue) { _, _ ->
                                 openUrlInExternalBrowser(requireContext(), url)
                             }
-                            .setNegativeButton(R.string.cancel, null)
+                            .setNegativeButton(R.string.action_cancel, null)
                             .show()
                 } else {
                     // Open in external browser, in a new Tab
diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
index bd6dec7c4b..815175c977 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
@@ -120,8 +120,8 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
 
         spaceCardRenderer.render(summary, state.peopleYouKnow.invoke().orEmpty(), null, views.spaceCard)
 
-        views.spaceCard.matrixToCardMainButton.button.text = getString(R.string.accept)
-        views.spaceCard.matrixToCardSecondaryButton.button.text = getString(R.string.decline)
+        views.spaceCard.matrixToCardMainButton.button.text = getString(R.string.action_accept)
+        views.spaceCard.matrixToCardSecondaryButton.button.text = getString(R.string.action_decline)
 
         when (state.joinActionState) {
             Uninitialized -> {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
index 9bf304fa1c..44de356521 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
@@ -138,7 +138,7 @@ class SpaceAddRoomFragment @Inject constructor(
                             .setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ ->
                                 sharedViewModel.handle(SpaceManagedSharedAction.HandleBack)
                             }
-                            .setNegativeButton(R.string.cancel, null)
+                            .setNegativeButton(R.string.action_cancel, null)
                             .show()
                 }
                 is SpaceAddRoomsViewEvents.SaveFailed      -> {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
index a0ab055311..a3d0252c19 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
@@ -165,7 +165,7 @@ class SpaceSettingsFragment @Inject constructor(
                         .setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ ->
                             viewModel.handle(RoomSettingsAction.Cancel)
                         }
-                        .setNegativeButton(R.string.cancel, null)
+                        .setNegativeButton(R.string.action_cancel, null)
                         .show()
                 true
             } else {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
index 90eb9491a6..8fa9e07848 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
@@ -309,10 +309,10 @@ class WidgetFragment @Inject constructor() :
     private fun deleteWidget() {
         MaterialAlertDialogBuilder(requireContext())
                 .setMessage(R.string.widget_delete_message_confirmation)
-                .setPositiveButton(R.string.remove) { _, _ ->
+                .setPositiveButton(R.string.action_remove) { _, _ ->
                     viewModel.handle(WidgetAction.DeleteWidget)
                 }
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt
index 59ea37036c..29c094bff4 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt
@@ -43,7 +43,7 @@ class SignOutUiWorker(private val activity: FragmentActivity) {
                     .setPositiveButton(R.string.action_sign_out) { _, _ ->
                         doSignOut()
                     }
-                    .setNegativeButton(R.string.cancel, null)
+                    .setNegativeButton(R.string.action_cancel, null)
                     .show()
         }
     }
diff --git a/vector/src/main/res/layout/bottom_sheet_leave_space.xml b/vector/src/main/res/layout/bottom_sheet_leave_space.xml
index e47639f752..9e5a7c7ebf 100644
--- a/vector/src/main/res/layout/bottom_sheet_leave_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_leave_space.xml
@@ -100,6 +100,6 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="8dp"
-        android:text="@string/cancel" />
+        android:text="@string/action_cancel" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index 40bb28f3a2..4e5e8392c4 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -102,7 +102,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
-            android:text="@string/decline"
+            android:text="@string/action_decline"
             android:textAllCaps="true" />
 
         <Button
diff --git a/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml b/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
index 92465a9b43..7cc243ee75 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
@@ -74,7 +74,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:text="@string/skip"
+            android:text="@string/action_skip"
             android:textAllCaps="true" />
 
         <Button
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
index 1fa132a086..abd35e25ea 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -50,7 +50,7 @@
         android:layout_marginBottom="16dp"
         app:icon="@drawable/ic_add_people"
         app:iconTint="?vctr_content_secondary"
-        app:title="@string/invite_by_mxid_or_mail" />
+        app:title="@string/invite_by_username_or_mail" />
 
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteByLinkButton"
diff --git a/vector/src/main/res/layout/bottom_sheet_tombstone_join.xml b/vector/src/main/res/layout/bottom_sheet_tombstone_join.xml
index 34f3c457a5..d5ae04e977 100644
--- a/vector/src/main/res/layout/bottom_sheet_tombstone_join.xml
+++ b/vector/src/main/res/layout/bottom_sheet_tombstone_join.xml
@@ -41,7 +41,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="@dimen/layout_vertical_margin_big"
-        app:bsv_button_text="@string/join"
+        app:bsv_button_text="@string/action_join"
         app:bsv_loaded_image_src="@drawable/ic_tick"
         app:bsv_use_flat_button="true" />
 
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index ffb5b839c7..259a493e6c 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -72,7 +72,7 @@
         android:layout_width="22dp"
         android:layout_height="22dp"
         android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/cancel"
+        android:contentDescription="@string/action_cancel"
         android:src="@drawable/ic_close_round"
         app:tint="?colorError"
         tools:ignore="MissingConstraints,MissingPrefix" />
@@ -127,7 +127,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:background="@drawable/bg_send"
-        android:contentDescription="@string/send"
+        android:contentDescription="@string/action_send"
         android:src="@drawable/ic_send"
         tools:ignore="MissingConstraints" />
 
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index 7e926b860c..bcf5df2216 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -87,7 +87,7 @@
         android:layout_width="22dp"
         android:layout_height="22dp"
         android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/cancel"
+        android:contentDescription="@string/action_cancel"
         android:src="@drawable/ic_close_round"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="parent"
@@ -169,7 +169,7 @@
         android:layout_height="@dimen/composer_min_height"
         android:layout_marginEnd="2dp"
         android:background="@drawable/bg_send"
-        android:contentDescription="@string/send"
+        android:contentDescription="@string/action_send"
         android:scaleType="center"
         android:src="@drawable/ic_send"
         android:visibility="invisible"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index 69f12bc782..72bdf37911 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -101,7 +101,7 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/cancel"
+        android:contentDescription="@string/action_cancel"
         android:src="@drawable/ic_close_round"
         app:layout_constraintBottom_toBottomOf="@id/composer_preview_barrier"
         app:layout_constraintEnd_toEndOf="parent"
@@ -181,7 +181,7 @@
         android:layout_height="@dimen/composer_min_height"
         android:layout_marginEnd="2dp"
         android:background="@drawable/bg_send"
-        android:contentDescription="@string/send"
+        android:contentDescription="@string/action_send"
         android:scaleType="center"
         android:src="@drawable/ic_send"
         android:visibility="invisible"
diff --git a/vector/src/main/res/layout/fragment_attachments_preview.xml b/vector/src/main/res/layout/fragment_attachments_preview.xml
index c7290bc474..f7d603e9e3 100644
--- a/vector/src/main/res/layout/fragment_attachments_preview.xml
+++ b/vector/src/main/res/layout/fragment_attachments_preview.xml
@@ -74,7 +74,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
-        android:contentDescription="@string/send"
+        android:contentDescription="@string/action_send"
         android:src="@drawable/ic_send"
         app:layout_constraintBottom_toTopOf="@id/attachmentPreviewerBottomContainer"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
index 49854997b6..1597728592 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
@@ -43,7 +43,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
-        android:text="@string/cancel"
+        android:text="@string/action_cancel"
         tools:ignore="MissingConstraints" />
 
     <Button
diff --git a/vector/src/main/res/layout/fragment_join_rules_recycler.xml b/vector/src/main/res/layout/fragment_join_rules_recycler.xml
index c31b111e15..a6ff49c5b3 100644
--- a/vector/src/main/res/layout/fragment_join_rules_recycler.xml
+++ b/vector/src/main/res/layout/fragment_join_rules_recycler.xml
@@ -35,14 +35,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:text="@string/cancel" />
+            android:text="@string/action_cancel" />
 
         <Button
             android:id="@+id/positiveButton"
             style="@style/Widget.Vector.Button.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/save" />
+            android:text="@string/action_save" />
     </LinearLayout>
 
     <FrameLayout
diff --git a/vector/src/main/res/layout/fragment_login_terms.xml b/vector/src/main/res/layout/fragment_login_terms.xml
index 3aae6de504..a0af01eda8 100644
--- a/vector/src/main/res/layout/fragment_login_terms.xml
+++ b/vector/src/main/res/layout/fragment_login_terms.xml
@@ -58,7 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="36dp"
-            android:text="@string/accept"
+            android:text="@string/action_accept"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
index 25a461ff35..a64ec08184 100644
--- a/vector/src/main/res/layout/fragment_login_terms_2.xml
+++ b/vector/src/main/res/layout/fragment_login_terms_2.xml
@@ -62,7 +62,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="36dp"
-            android:text="@string/accept"
+            android:text="@string/action_accept"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index 5af96c7d2b..d85bd707ce 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -219,7 +219,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="@dimen/layout_vertical_margin_big"
-            app:bsv_button_text="@string/accept"
+            app:bsv_button_text="@string/action_accept"
             app:bsv_loaded_image_src="@drawable/ic_tick"
             app:bsv_use_flat_button="false"
             app:layout_constraintEnd_toEndOf="parent"
@@ -260,7 +260,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="@dimen/layout_vertical_margin_big"
-            app:bsv_button_text="@string/dismiss"
+            app:bsv_button_text="@string/action_dismiss"
             app:bsv_loaded_image_src="@drawable/ic_tick"
             app:bsv_use_flat_button="true"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_review_terms.xml b/vector/src/main/res/layout/fragment_review_terms.xml
index 30c6abf69f..bf5a451669 100644
--- a/vector/src/main/res/layout/fragment_review_terms.xml
+++ b/vector/src/main/res/layout/fragment_review_terms.xml
@@ -34,13 +34,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:text="@string/decline" />
+            android:text="@string/action_decline" />
 
         <Button
             android:id="@+id/reviewTermsAccept"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/accept" />
+            android:text="@string/action_accept" />
 
     </LinearLayout>
 
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 264dd83c16..a3210907b8 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -139,7 +139,7 @@
                     android:layout_marginTop="@dimen/layout_vertical_margin"
                     android:layout_marginBottom="@dimen/layout_vertical_margin"
                     android:minWidth="120dp"
-                    app:bsv_button_text="@string/join"
+                    app:bsv_button_text="@string/action_join"
                     app:bsv_loaded_image_src="@drawable/ic_tick"
                     app:bsv_use_flat_button="false" />
 
diff --git a/vector/src/main/res/layout/fragment_space_leave_advanced.xml b/vector/src/main/res/layout/fragment_space_leave_advanced.xml
index 137ba8262d..2c50ebe001 100644
--- a/vector/src/main/res/layout/fragment_space_leave_advanced.xml
+++ b/vector/src/main/res/layout/fragment_space_leave_advanced.xml
@@ -81,7 +81,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
             android:layout_weight="1"
-            android:text="@string/cancel" />
+            android:text="@string/action_cancel" />
 
         <Button
             android:id="@+id/spaceLeaveButton"
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 117464fc1d..f361bb7363 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -106,7 +106,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
                 android:layout_weight="1"
-                android:text="@string/decline" />
+                android:text="@string/action_decline" />
 
             <Button
                 android:id="@+id/spacePreviewAcceptInviteButton"
@@ -114,7 +114,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/accept" />
+                android:text="@string/action_accept" />
 
         </LinearLayout>
 
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index f9baea52c0..3fba9b11bb 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -91,7 +91,7 @@
             style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/cancel"
+            android:text="@string/action_cancel"
             tools:ignore="MissingConstraints" />
 
         <Button
@@ -99,7 +99,7 @@
             style="@style/Widget.Vector.Button.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/reset"
+            android:text="@string/action_reset"
             tools:ignore="MissingConstraints" />
 
         <androidx.constraintlayout.helper.widget.Flow
diff --git a/vector/src/main/res/layout/item_form_text_input_with_delete.xml b/vector/src/main/res/layout/item_form_text_input_with_delete.xml
index fa26e45afe..352ce730a0 100644
--- a/vector/src/main/res/layout/item_form_text_input_with_delete.xml
+++ b/vector/src/main/res/layout/item_form_text_input_with_delete.xml
@@ -34,7 +34,7 @@
         android:layout_height="24dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:background="@drawable/circle"
-        android:contentDescription="@string/delete"
+        android:contentDescription="@string/action_delete"
         android:scaleType="center"
         android:src="@drawable/ic_delete_10dp"
         app:layout_constraintBottom_toBottomOf="@id/formTextInputTextInputLayout"
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index 473c94fdd7..7e44a615ca 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -127,7 +127,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/item_generic_barrier"
         app:layout_constraintTop_toBottomOf="@id/item_generic_action_button"
-        tools:text="@string/delete"
+        tools:text="@string/action_delete"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index ac9e26b132..84ba2efe78 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -101,7 +101,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="8dp"
-        app:bsv_button_text="@string/join"
+        app:bsv_button_text="@string/action_join"
         app:bsv_loaded_image_src="@drawable/ic_tick"
         app:bsv_use_flat_button="true"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index efdf44f041..c43f9eea7c 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -130,6 +130,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:text="@string/remove" />
+        android:text="@string/action_remove" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/item_room_directory_server.xml b/vector/src/main/res/layout/item_room_directory_server.xml
index fc13a4a4df..8bb3a1a4cd 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -54,7 +54,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/remove"
+        android:contentDescription="@string/action_remove"
         android:padding="8dp"
         android:src="@drawable/ic_delete"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 7ef0096d19..07f4e4c349 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -82,7 +82,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:minWidth="122dp"
-        app:bsv_button_text="@string/accept"
+        app:bsv_button_text="@string/action_accept"
         app:bsv_loaded_image_src="@drawable/ic_tick"
         app:bsv_use_flat_button="false"
         app:layout_constraintEnd_toEndOf="@id/roomInvitationNameView"
@@ -94,7 +94,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/layout_vertical_margin"
         android:minWidth="122dp"
-        app:bsv_button_text="@string/reject"
+        app:bsv_button_text="@string/action_reject"
         app:bsv_loaded_image_src="@drawable/ic_tick"
         app:bsv_use_flat_button="true"
         app:layout_constraintEnd_toStartOf="@id/roomInvitationAccept"
diff --git a/vector/src/main/res/layout/item_settings_continue_cancel.xml b/vector/src/main/res/layout/item_settings_continue_cancel.xml
index 130296e552..b765b9c887 100644
--- a/vector/src/main/res/layout/item_settings_continue_cancel.xml
+++ b/vector/src/main/res/layout/item_settings_continue_cancel.xml
@@ -14,7 +14,7 @@
         style="@style/Widget.Vector.Button.Text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/cancel"
+        android:text="@string/action_cancel"
         android:textColor="?colorError"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
index 84c8d171ba..b2904d5e59 100644
--- a/vector/src/main/res/layout/item_settings_three_pid.xml
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -42,7 +42,7 @@
         android:id="@+id/item_settings_three_pid_delete"
         android:layout_width="@dimen/layout_touch_size"
         android:layout_height="@dimen/layout_touch_size"
-        android:contentDescription="@string/delete"
+        android:contentDescription="@string/action_delete"
         android:scaleType="center"
         android:src="@drawable/ic_trash_24"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index feace834c5..23607c5c18 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -79,7 +79,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:maxWidth="@dimen/button_max_width"
-        android:text="@string/join"
+        android:text="@string/action_join"
         app:layout_constraintBottom_toTopOf="@id/inlineErrorText"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index 8d8120dec0..a7d7a02fca 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -61,7 +61,7 @@
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toEndOf="@id/itemCallRejectView"
             app:layout_constraintTop_toTopOf="@id/itemCallRejectView"
-            tools:text="@string/join" />
+            tools:text="@string/action_join" />
 
         <Button
             android:id="@+id/itemCallRejectView"
@@ -74,7 +74,7 @@
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="@string/ignore" />
+            tools:text="@string/action_ignore" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
index 9e2a5ef3ed..60fe8dafcd 100644
--- a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
@@ -23,7 +23,7 @@
         android:id="@+id/messageMediaPlayView"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:contentDescription="@string/play_video"
+        android:contentDescription="@string/action_play"
         android:src="@drawable/ic_material_play_circle"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/messageThumbnailView"
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index 371828d914..d6658d1079 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -47,14 +47,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
-            android:text="@string/decline" />
+            android:text="@string/action_decline" />
 
         <Button
             android:id="@+id/sas_verification_verified_accept_button"
             style="@style/Widget.Vector.Button.Positive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/accept" />
+            android:text="@string/action_accept" />
 
     </LinearLayout>
 
diff --git a/vector/src/main/res/layout/item_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml
index f2a67e9680..544b5fef27 100644
--- a/vector/src/main/res/layout/item_uploads_file.xml
+++ b/vector/src/main/res/layout/item_uploads_file.xml
@@ -56,7 +56,7 @@
         android:id="@+id/uploadsFileActionDownload"
         android:layout_width="@dimen/layout_touch_size"
         android:layout_height="@dimen/layout_touch_size"
-        android:contentDescription="@string/download"
+        android:contentDescription="@string/action_download"
         android:scaleType="center"
         android:src="@drawable/ic_download"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -70,7 +70,7 @@
         android:layout_width="@dimen/layout_touch_size"
         android:layout_height="@dimen/layout_touch_size"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:contentDescription="@string/share"
+        android:contentDescription="@string/action_share"
         android:scaleType="center"
         android:src="@drawable/ic_material_share"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/item_uploads_video.xml b/vector/src/main/res/layout/item_uploads_video.xml
index 20349c4bc9..176b107927 100644
--- a/vector/src/main/res/layout/item_uploads_video.xml
+++ b/vector/src/main/res/layout/item_uploads_video.xml
@@ -24,7 +24,7 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:contentDescription="@string/play_video"
+        android:contentDescription="@string/action_play"
         android:src="@drawable/ic_material_play_circle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index f6c4566086..2a7ec069dd 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -90,7 +90,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:gravity="center"
-        android:text="@string/or_other_mx_capabale_client"
+        android:text="@string/or_other_mx_capable_client"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/merge_image_attachment_overlay.xml b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
index 9020d5c266..d8e2142f87 100644
--- a/vector/src/main/res/layout/merge_image_attachment_overlay.xml
+++ b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
@@ -74,7 +74,7 @@
         android:layout_marginEnd="16dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
-        android:contentDescription="@string/share"
+        android:contentDescription="@string/action_share"
         android:focusable="true"
         android:padding="6dp"
         app:layout_constraintBottom_toBottomOf="@id/overlayTopBackground"
@@ -107,7 +107,7 @@
         android:layout_marginEnd="16dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
-        android:contentDescription="@string/play_video"
+        android:contentDescription="@string/action_play"
         android:focusable="true"
         android:padding="6dp"
         android:scaleType="centerInside"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index ff0e29f82f..c39c8c3422 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -65,7 +65,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:minWidth="120dp"
-        app:bsv_button_text="@string/accept"
+        app:bsv_button_text="@string/action_accept"
         app:bsv_loaded_image_src="@drawable/ic_tick"
         app:bsv_use_flat_button="false"
         app:layout_constraintEnd_toEndOf="parent"
@@ -80,7 +80,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginEnd="4dp"
         android:minWidth="120dp"
-        app:bsv_button_text="@string/reject"
+        app:bsv_button_text="@string/action_reject"
         app:bsv_loaded_image_src="@drawable/ic_tick"
         app:bsv_use_flat_button="true"
         app:layout_constraintEnd_toStartOf="@id/inviteAcceptView"
diff --git a/vector/src/main/res/layout/view_button_state.xml b/vector/src/main/res/layout/view_button_state.xml
index 5cc63ca59f..9da22877c4 100644
--- a/vector/src/main/res/layout/view_button_state.xml
+++ b/vector/src/main/res/layout/view_button_state.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         tools:layout_gravity="center_horizontal"
-        tools:text="@string/join" />
+        tools:text="@string/action_join" />
 
     <Button
         android:id="@+id/buttonStateButtonBig"
@@ -22,7 +22,7 @@
         android:minWidth="120dp"
         tools:layout_gravity="center_horizontal"
         tools:layout_marginTop="40dp"
-        tools:text="@string/join" />
+        tools:text="@string/action_join" />
 
     <ProgressBar
         android:id="@+id/buttonStateLoading"
diff --git a/vector/src/main/res/layout/view_poll_result_line.xml b/vector/src/main/res/layout/view_poll_result_line.xml
deleted file mode 100644
index bf115a3c43..0000000000
--- a/vector/src/main/res/layout/view_poll_result_line.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="40dp"
-    android:orientation="horizontal"
-    tools:parentTag="android.widget.LinearLayout">
-
-    <ImageView
-        android:id="@+id/pollResultItemSelectedIcon"
-        android:layout_width="24dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="@string/poll_item_selected_aria"
-        android:paddingStart="2dp"
-        android:paddingEnd="2dp"
-        android:src="@drawable/ic_check_white_24dp"
-        app:tint="?vctr_content_secondary"
-        tools:ignore="MissingPrefix" />
-
-    <TextView
-        android:id="@+id/pollResultItemLabel"
-        style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="1"
-        android:textColor="?vctr_content_primary"
-        tools:text="Open a Github Issue" />
-
-    <TextView
-        android:id="@+id/pollResultItemPercent"
-        style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:textColor="?vctr_content_primary"
-        tools:text="47%" />
-</merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_voice_message_recorder.xml b/vector/src/main/res/layout/view_voice_message_recorder.xml
index 9f8e58d724..31a513d00b 100644
--- a/vector/src/main/res/layout/view_voice_message_recorder.xml
+++ b/vector/src/main/res/layout/view_voice_message_recorder.xml
@@ -36,7 +36,7 @@
         android:layout_width="56dp"
         android:layout_height="@dimen/composer_min_height"
         android:background="@drawable/bg_send"
-        android:contentDescription="@string/send"
+        android:contentDescription="@string/action_send"
         android:scaleType="center"
         android:src="@drawable/ic_send"
         android:visibility="gone"
diff --git a/vector/src/main/res/menu/menu_devtools.xml b/vector/src/main/res/menu/menu_devtools.xml
index dcef953d8f..a8c695f855 100644
--- a/vector/src/main/res/menu/menu_devtools.xml
+++ b/vector/src/main/res/menu/menu_devtools.xml
@@ -19,6 +19,6 @@
         app:showAsAction="ifRoom"
         android:icon="@drawable/ic_send"
         app:iconTint="?vctr_content_secondary"
-        android:title="@string/send" />
+        android:title="@string/action_send" />
 
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_manage_space.xml b/vector/src/main/res/menu/menu_manage_space.xml
index ac657e0df2..86defa7869 100644
--- a/vector/src/main/res/menu/menu_manage_space.xml
+++ b/vector/src/main/res/menu/menu_manage_space.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_unsent_messages"
-        android:title="@string/delete"
+        android:title="@string/action_delete"
         app:showAsAction="always" />
 
     <item
diff --git a/vector/src/main/res/menu/menu_space_add_room.xml b/vector/src/main/res/menu/menu_space_add_room.xml
index 048b89892c..e0d40246fb 100644
--- a/vector/src/main/res/menu/menu_space_add_room.xml
+++ b/vector/src/main/res/menu/menu_space_add_room.xml
@@ -3,6 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/spaceAddRoomSaveItem"
-        android:title="@string/save"
+        android:title="@string/action_save"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index 54967f1706..d7c3115ce0 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -16,7 +16,7 @@
 
     <item
         android:id="@+id/invite"
-        android:title="@string/invite"
+        android:title="@string/action_invite"
         app:showAsAction="never" />
 
     <item
@@ -38,7 +38,7 @@
         tools:visible="true" />
 
     <item android:id="@+id/join_conference"
-        android:title="@string/join"
+        android:title="@string/action_join"
         app:actionLayout="@layout/layout_join_conference_action"
         app:showAsAction="always"
         />
diff --git a/vector/src/main/res/menu/menu_widget.xml b/vector/src/main/res/menu/menu_widget.xml
index cdf2ae8e33..d2dd6614c1 100644
--- a/vector/src/main/res/menu/menu_widget.xml
+++ b/vector/src/main/res/menu/menu_widget.xml
@@ -19,7 +19,7 @@
 
     <item
         android:id="@+id/action_delete"
-        android:title="@string/delete"
+        android:title="@string/action_delete"
         app:showAsAction="never" />
 
     <item
diff --git a/vector/src/main/res/menu/vector_attachments_preview.xml b/vector/src/main/res/menu/vector_attachments_preview.xml
index 385bb224fd..2385fa9a7f 100755
--- a/vector/src/main/res/menu/vector_attachments_preview.xml
+++ b/vector/src/main/res/menu/vector_attachments_preview.xml
@@ -7,7 +7,7 @@
     <item
         android:id="@+id/attachmentsPreviewRemoveAction"
         android:icon="@drawable/ic_delete"
-        android:title="@string/delete"
+        android:title="@string/action_delete"
         app:iconTint="?colorOnPrimary"
         app:showAsAction="always" />
 
diff --git a/vector/src/main/res/menu/vector_media_viewer.xml b/vector/src/main/res/menu/vector_media_viewer.xml
index 1af6203ac9..bc187d3869 100644
--- a/vector/src/main/res/menu/vector_media_viewer.xml
+++ b/vector/src/main/res/menu/vector_media_viewer.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/mediaViewerShareAction"
         android:icon="@drawable/ic_material_share"
-        android:title="@string/share"
+        android:title="@string/action_share"
         app:iconTint="?colorSecondary"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/vector_room_member_profile.xml b/vector/src/main/res/menu/vector_room_member_profile.xml
index 0667550a9b..4bec253b1b 100644
--- a/vector/src/main/res/menu/vector_room_member_profile.xml
+++ b/vector/src/main/res/menu/vector_room_member_profile.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/roomMemberProfileShareAction"
         android:icon="@drawable/ic_material_share"
-        android:title="@string/share"
+        android:title="@string/action_share"
         app:iconTint="?colorSecondary"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/vector_room_profile.xml b/vector/src/main/res/menu/vector_room_profile.xml
index ef1bbbc7d8..637481b37e 100644
--- a/vector/src/main/res/menu/vector_room_profile.xml
+++ b/vector/src/main/res/menu/vector_room_profile.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/roomProfileShareAction"
         android:icon="@drawable/ic_material_share"
-        android:title="@string/share"
+        android:title="@string/action_share"
         app:iconTint="?colorSecondary"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/vector_room_settings.xml b/vector/src/main/res/menu/vector_room_settings.xml
index c009f56989..e75eada0a2 100644
--- a/vector/src/main/res/menu/vector_room_settings.xml
+++ b/vector/src/main/res/menu/vector_room_settings.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/roomSettingsSaveAction"
-        android:title="@string/save"
+        android:title="@string/action_save"
         app:iconTint="?colorSecondary"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 536f41194e..a749235757 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -32,7 +32,7 @@
     <string name="notice_profile_change_redacted">حدَّثَ %1$s ملفه الشخصي %2$s</string>
     <string name="notice_room_third_party_invite">أرسلَ %1$s دعوة إلى %2$s للإنضمام إلى الغُرفة</string>
     <string name="notice_crypto_unable_to_decrypt">** يتعذَّر فك التشفير: ⁨%s⁩ **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">لم يُرسل جِهاز المُرسل مفاتيحًا لهذه الرِّسالة.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">لم يُرسل جِهاز المُرسل مفاتيحًا لهذه الرِّسالة.</string>
     <string name="unable_to_send_message">تعذَّر إرسال الرِّسالة</string>
     <string name="message_failed_to_upload">فَشلَ رفع الصُّورة</string>
     <string name="network_error">خطأ في الشَّبكة</string>
@@ -225,19 +225,19 @@
     <string name="title_activity_historical">الأرشيف</string>
     <string name="title_activity_bug_report">أبلِغ عن علة</string>
     <string name="ok">حسنا</string>
-    <string name="cancel">ألغِ</string>
-    <string name="save">احفظ</string>
-    <string name="leave">اترك</string>
-    <string name="send">أرسِل</string>
-    <string name="resend">أعِد الإرسال</string>
-    <string name="quote">اقتبس</string>
-    <string name="share">شارِك</string>
-    <string name="forward">مرّر</string>
+    <string name="action_cancel">ألغِ</string>
+    <string name="action_save">احفظ</string>
+    <string name="action_leave">اترك</string>
+    <string name="action_send">أرسِل</string>
+    <string name="action_resend">أعِد الإرسال</string>
+    <string name="action_quote">اقتبس</string>
+    <string name="action_share">شارِك</string>
+    <string name="action_forward">مرّر</string>
     <string name="permalink">رابط دائم</string>
     <string name="view_source">اعرض المصدر</string>
     <string name="view_decrypted_source">اعرض المصدر بلا تعمية</string>
-    <string name="delete">احذف</string>
-    <string name="rename">غيّر الاسم</string>
+    <string name="action_delete">احذف</string>
+    <string name="action_rename">غيّر الاسم</string>
     <string name="report_content">أبلِغ عن المحتوى</string>
     <string name="active_call">مكالمة نشطة</string>
     <string name="ongoing_conference_call">مكالمة اجتماع جارية.
@@ -258,7 +258,7 @@
     <string name="action_open">افتح</string>
     <string name="action_close">أغلِق</string>
     <string name="copied_to_clipboard">نُسخ إلى الحافظة</string>
-    <string name="disable">عطّل</string>
+    <string name="action_disable">عطّل</string>
     <string name="dialog_title_confirmation">أكّد</string>
     <string name="dialog_title_warning">تحذير</string>
     <string name="bottom_action_home">الرئيسيّة</string>
@@ -373,9 +373,9 @@
     <string name="yes">نعم</string>
     <string name="no">لا</string>
     <string name="_continue">تابع</string>
-    <string name="remove">أزِل</string>
-    <string name="join">انضم</string>
-    <string name="reject">ارفض</string>
+    <string name="action_remove">أزِل</string>
+    <string name="action_join">انضم</string>
+    <string name="action_reject">ارفض</string>
     <string name="room_jump_to_first_unread">انتقل إلى أول رسالة غير مقروءة.</string>
     <string name="room_preview_invitation_format">لقد دعاك ⁨%s⁩ للانضمام إلى هذه الغرفة</string>
     <string name="room_preview_room_interactions_disabled">هذه معاينة عن الغرفة. عُطّل التفاعل مع الغرفة.</string>
@@ -428,14 +428,6 @@
     <string name="tab_title_search_rooms">الغرف</string>
     <string name="tab_title_search_messages">الرسائل</string>
     <string name="tab_title_search_files">الملفات</string>
-    <string name="room_recents_directory">الدليل</string>
-    <string name="room_recents_favourites">المفضلة</string>
-    <string name="room_recents_conversations">الغرف</string>
-    <string name="room_recents_invites">الدعوات</string>
-    <string name="room_recents_create_room">أنشئ غرفة</string>
-    <string name="room_recents_join_room">انضم إلى غرفة</string>
-    <string name="room_recents_join_room_title">انضم إلى غرفة</string>
-    <string name="room_recents_join_room_prompt">اكتب معرّف غرفة أو اختصارها</string>
     <string name="directory_searching_title">يبحث في الدليل..</string>
     <string name="room_settings_leave_conversation">اترك المحادثة</string>
     <string name="room_settings_forget">انسَ</string>
@@ -526,7 +518,6 @@
     <string name="widget_integration_must_be_in_room">لست في هذه الغرفة.</string>
     <string name="widget_integration_no_permission_in_room">ليس لديك تصريح لفعل هذا في هذه الغرفة.</string>
     <string name="settings_labs_native_camera">استخدم الكمرة الأصيلة</string>
-    <!-- share keys -->
     <string name="conference_call_warning_title">تحذير!</string>
     <string name="room_unknown_devices_messages_notification">لم تُرسل الرسائل بسبب وجود أجهزة مجهولة. ماذا أفعل؟ %1$s. ‏%2$s.</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">ليس ’⁨%s⁩‘ تنسيقا صالحا لاختصار</string>
@@ -586,11 +577,9 @@
     <string name="widget_integration_room_not_visible">الغرفة ⁨%s⁩ غير ظاهرة.</string>
     <string name="you_added_a_new_device">لقد أضفت جهازا جديدا ’⁨%s⁩‘ يطلب مفاتيح التعمية.</string>
     <string name="ignore_request">تجاهل الطلب</string>
-    <!-- conference call -->
     <string name="command_error">خطأ في الأمر</string>
     <string name="unrecognized_command">لم يُفهم الأمر: ⁨%s⁩</string>
-    <!-- notification statuses -->
-    <string name="redact">أزل</string>
+    <string name="action_redact">أزل</string>
     <string name="missing_permissions_to_start_conf_call">تحتاج تصريح الدعوة لبدء اجتماع في هذه الغرفة</string>
     <string name="or">أو</string>
     <string name="action_quick_reply">ردّ سريع</string>
@@ -699,14 +688,14 @@
 
 رجاءً اسمح بالوصول في المنبثقة التالية لتستكشف مستخدميك في دفتر العناوين من Element.</string>
     <string name="media_slider_saved">حُفظت</string>
-    <string name="preview">عايِن</string>
+    <string name="action_preview">عايِن</string>
     <string name="room_sync_in_progress">يُزامن…</string>
     <string name="room_preview_unlinked_email_warning">أُرسلت الدعوة إلى ⁨%s⁩ غير المرتبط بهذا الحساب.
 لربما عليك الولوج بحساب آخر، أو إضافة هذا البريد إلى حسابك هذا.</string>
     <string name="room_preview_try_join_an_unknown_room">تحاول الوصول إلى ⁨%s⁩. أتريد الانضمام للمشاركة في النقاش؟</string>
     <string name="room_preview_try_join_an_unknown_room_default">إحدى الغرف</string>
     <string name="room_title_one_member">عضو واحد</string>
-    <string name="invite">ادعُ</string>
+    <string name="action_invite">ادعُ</string>
     <string name="join_room">انضم إلى الغرفة</string>
     <string name="auth_reset_password_next_step_button">لقد أكّدت عنوان بريدي الإلكتروني</string>
     <string name="read_receipts_list">قائمة علامات القراءة</string>
@@ -737,7 +726,6 @@
     <string name="search_hint">ابحث</string>
     <string name="search_members_hint">رشّح أعضاء الغرفة</string>
     <string name="tab_title_search_people">الناس</string>
-    <string name="room_recents_low_priority">أولوية منخفضة</string>
     <string name="room_settings_all_messages_noisy">كل الرسائل (مزعج)</string>
     <string name="room_settings_all_messages">كل الرسائل</string>
     <string name="room_settings_mention_only">الإشارات فقط</string>
@@ -774,13 +762,11 @@
         <item quantity="many">%d ودجة نشطة</item>
         <item quantity="other">%d ودجة نشطة</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="room_add_matrix_apps">أضِف تطبيقات ماترِكس</string>
     <string name="your_unverified_device_requesting">يطلب جهازك غير المؤكّد ”‏⁨%s⁩“ مفاتيح التعمية.</string>
     <string name="start_verification">ابدأ التأكيد</string>
     <string name="share_without_verifying">شارِك دون تأكيد</string>
     <string name="encrypted_message">رسالة معمّاة</string>
-    <!-- groups creation -->
     <string name="create">أنشئ</string>
     <string name="community_name">اسم المجتمع</string>
     <string name="community_id">معرّف المجتمع</string>
@@ -853,7 +839,6 @@
     <string name="notification_off">معطّل</string>
     <string name="notification_noisy">مزعج</string>
     <string name="conference_call_warning_message">ما زالت مكالمات الاجتماعات قيد التطوير وقد لا يُعتمد عليها.</string>
-    <!-- slash commands -->
     <string name="unknown_devices_alert_message">تحتوي هذه الغرفة أجهزة مجهولة لم يُتأكّد منها.
 يعني هذا عدم وجود أي ضمانات بأن الأجهزة هي فعلا ملك لمن يستخدمها.
 ننصحك بأن تبدأ عملية التأكيد لكل جهاز وذلك قبل أن تتابع. يمكنك طبعا إرسال الرسالة دون تأكيد إن أردت ذلك.
@@ -875,8 +860,6 @@
     <string name="ssl_cert_not_trust">قد يعني هذا بأن أحدهم يعترض الاتصال بعدوانية، أو أن هاتفك لا يثق بالشهادة التي قدّمها الخادوم البعيد.</string>
     <string name="ssl_cert_new_account_expl">إن قال مدير الخادوم بأن هذا متوقع، فتأكد من أن البصمة أدناه تطابق البصمة التي وفّرها.</string>
     <string name="ssl_expected_existing_expl">تغيّرت الشهادة من شهادة كنت تثق بها إلى شهادة لا تثق بها. لربما جدّد الخادوم شهادته. راسل إدارة الخادوم واسألهم عن البصمة المتوقعة.</string>
-    <string name="room_recents_join">انضم</string>
-    <string name="room_recents_start_chat">ابدأ دردشة</string>
     <string name="directory_search_results_title">تصفح الدليل</string>
     <plurals name="directory_search_rooms_for">
         <item quantity="zero">لم يُعثر على غرف تطابق ‏⁨%2$s⁩</item>
@@ -918,13 +901,12 @@
     <string name="widget_integration_positive_power_level">يجب أن يكون مستوى السلطة عددا صحيحا موجبا.</string>
     <string name="community_name_hint">مثال</string>
     <string name="community_id_hint">مثال</string>
-    <!-- group details -->
     <string name="title_activity_room">الغرفة</string>
     <string name="groups_invite_header">دعوة</string>
     <string name="send_files_in">أرسل إلى</string>
     <string name="title_activity_choose_sticker">أرسِل ملصقا</string>
     <string name="dialog_title_third_party_licences">رُخص الأطراف الثالثة</string>
-    <string name="download">نزِّل</string>
+    <string name="action_download">نزِّل</string>
     <string name="option_send_voice">أرسِل صوتًا</string>
     <string name="option_send_sticker">أرسِل ملصقًا</string>
     <string name="no_sticker_application_dialog_content">ليس ثمة أية حزمة ملصقات مفعّلة حاليًا.
@@ -935,8 +917,8 @@
     <string name="e2e_re_request_encryption_key_sent">أُرسل طلب المفتاح.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">أُرسل الطلب</string>
     <string name="template_e2e_re_request_encryption_key_dialog_content">رجاءً أطلِق Element في جهاز آخر يقدر على فك تعمية الرسالة ليُرسل المفاتيح إلى هذا الجهاز.</string>
-    <string name="speak">انطِق</string>
-    <string name="clear">امسح</string>
+    <string name="action_speak">انطِق</string>
+    <string name="action_clear">امسح</string>
     <string name="room_participants_online">متّصل</string>
     <string name="room_participants_offline">غير متّصل</string>
     <string name="room_participants_idle">خامل</string>
@@ -1097,7 +1079,7 @@
 ظهور الرسائل في «ماترِكس» شبيه كثيرًا بالبريد الإلكتروني. نسياننا لرسائلك يعني أن الرسائل التي أرسلتها لن تُشارك مع أي مستخدم جديد أو غير مسجّل، إلا أن المستخدمين المسجّلين الذي يقدرون على الوصول إليها سيمتلكون نسخة عنها.</string>
     <string name="encryption_information_claimed_ed25519_fingerprint_key">طُلب مفتاح البصمة Ed25519</string>
     <string name="title_activity_keys_backup_restore">الرسائل الآمنة</string>
-    <string name="skip">تخطي</string>
+    <string name="action_skip">تخطي</string>
     <string name="done">تم</string>
     <string name="dialog_title_error">خطأ</string>
     <string name="settings_call_category">المكالمات</string>
@@ -1114,14 +1096,14 @@
     <string name="no_permissions_to_start_conf_call_in_direct_room">ليس لديك تصريح لبدء إجتماع</string>
     <string name="no_permissions_to_start_conf_call">ليس لديك تصريح لبدء إجتماع في هذه الغرفة</string>
     <string name="start_chatting">إبدأ بالمحادثة</string>
-    <string name="reset">إعادة ضبط</string>
-    <string name="dismiss">إصرف</string>
-    <string name="pause_video">أوقف</string>
-    <string name="play_video">شغل</string>
-    <string name="disconnect">إفصل</string>
-    <string name="revoke">أبّطل</string>
+    <string name="action_reset">إعادة ضبط</string>
+    <string name="action_dismiss">إصرف</string>
+    <string name="action_pause">أوقف</string>
+    <string name="action_play">شغل</string>
+    <string name="action_disconnect">إفصل</string>
+    <string name="action_revoke">أبّطل</string>
     <string name="none">لاشيء</string>
-    <string name="stay">إبقى</string>
+    <string name="action_stay">إبقى</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">ستفقد الوصول إلى رسائلك المشفرة إلا إذا أخذت نسخة إحتياطية من مفاتيحك قبل تسجيلك للخروج.</string>
     <string name="backup">نسخة إحتياطية</string>
     <string name="are_you_sure">هل أنت متأكد؟</string>
@@ -1313,11 +1295,11 @@
     <string name="action_sign_out_confirmation_simple">أمتأكد من الخروج؟</string>
     <string name="call_notification_reject">رَفض</string>
     <string name="call_notification_answer">قبُول</string>
-    <string name="decline">رَفض</string>
-    <string name="review">مراجعة</string>
-    <string name="ignore">تجاهل</string>
-    <string name="abort">إِجهَاض</string>
-    <string name="accept">قبُول</string>
+    <string name="action_decline">رَفض</string>
+    <string name="action_review">مراجعة</string>
+    <string name="action_ignore">تجاهل</string>
+    <string name="action_abort">إِجهَاض</string>
+    <string name="action_accept">قبُول</string>
     <string name="call_anyway">اتصل على أي حال</string>
     <string name="cannot_call_yourself">لا يمكن مكالمة نفسك</string>
     <string name="learn_more">تَعَلَّم المَزِيد</string>
diff --git a/vector/src/main/res/values-az/strings.xml b/vector/src/main/res/values-az/strings.xml
index 3821dcfb73..d92a66f2c3 100644
--- a/vector/src/main/res/values-az/strings.xml
+++ b/vector/src/main/res/values-az/strings.xml
@@ -50,7 +50,7 @@
     <string name="notice_room_third_party_registered_invite">%1$s %2$s üçün dəvəti qəbul etdi</string>
 
     <string name="notice_crypto_unable_to_decrypt">** Şifrəni aça bilmir: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Göndərənin cihazı bu mesaj üçün açarları bizə göndərməyib.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Göndərənin cihazı bu mesaj üçün açarları bizə göndərməyib.</string>
 
     <string name="could_not_redact">Redaktə etmək olmur</string>
     <string name="unable_to_send_message">Mesaj göndərmək olmur</string>
diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
index c5f3d3b407..942c012bfc 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -34,18 +34,18 @@
     <string name="loading">Učitavanje…</string>
 
     <string name="ok">U redu</string>
-    <string name="cancel">Otkaži</string>
-    <string name="save">Sačuvaj</string>
-    <string name="leave">Napusti</string>
-    <string name="stay">Ostani</string>
-    <string name="send">Pošalji</string>
-    <string name="resend">Pošalji ponovo</string>
-    <string name="redact">Ukloni</string>
-    <string name="share">Podeli</string>
+    <string name="action_cancel">Otkaži</string>
+    <string name="action_save">Sačuvaj</string>
+    <string name="action_leave">Napusti</string>
+    <string name="action_stay">Ostani</string>
+    <string name="action_send">Pošalji</string>
+    <string name="action_resend">Pošalji ponovo</string>
+    <string name="action_redact">Ukloni</string>
+    <string name="action_share">Podeli</string>
     <string name="later">Kasnije</string>
-    <string name="forward">Prosledi</string>
-    <string name="delete">Obriši</string>
-    <string name="rename">Preimenuj</string>
+    <string name="action_forward">Prosledi</string>
+    <string name="action_delete">Obriši</string>
+    <string name="action_rename">Preimenuj</string>
     <string name="ongoing_conference_call">Konferencijski poziv u toku.
 \nPriključi se kao %1$s ili %2$s</string>
     <string name="ongoing_conference_call_voice">Glas</string>
@@ -60,14 +60,14 @@
     <string name="call_anyway">Ipak zovi</string>
     <string name="send_anyway">Ipak pošalji</string>
     <string name="or">ili</string>
-    <string name="invite">Pošalji pozivnicu</string>
-    <string name="accept">Prihvati</string>
-    <string name="skip">Preskoči</string>
+    <string name="action_invite">Pošalji pozivnicu</string>
+    <string name="action_accept">Prihvati</string>
+    <string name="action_skip">Preskoči</string>
     <string name="done">Gotovo</string>
-    <string name="abort">Obustavi</string>
-    <string name="ignore">Ignoriši</string>
-    <string name="review">Pregledaj</string>
-    <string name="decline">Odbaci</string>
+    <string name="action_abort">Obustavi</string>
+    <string name="action_ignore">Ignoriši</string>
+    <string name="action_review">Pregledaj</string>
+    <string name="action_decline">Odbaci</string>
 
     <string name="action_exit">Izađi</string>
     <string name="actions">Akcije</string>
@@ -81,7 +81,7 @@
     <string name="action_mark_room_read">Označi kao pročitano</string>
     <string name="action_open">Otvori</string>
     <string name="action_close">Zatvori</string>
-    <string name="disable">Onemogući</string>
+    <string name="action_disable">Onemogući</string>
 
     <string name="dialog_title_confirmation">Potvrda</string>
     <string name="dialog_title_warning">Upozorenje</string>
@@ -128,7 +128,7 @@
     <string name="auth_repeat_password_placeholder">Ponovi lozinku</string>
     <string name="auth_repeat_new_password_placeholder">Potvrdite vašu novu lozinku</string>
     <string name="auth_invalid_login_param">Pogrešno korisničko ime i/ili lozinka</string>
-    <string name="clear">Obriši</string>
+    <string name="action_clear">Obriši</string>
     <string name="view_source">Vidi izvor</string>
     <string name="report_content">Prijavi sadržaj</string>
     <string name="send_bug_report_progress">Napredak (%s%%)</string>
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 13e254acf7..f6c80b4817 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -47,7 +47,7 @@
     <string name="room_error_join_failed_empty_room">В момента не е възможно да се присъедините отново към празна стая.</string>
     <string name="medium_email">Имейл адрес</string>
     <string name="medium_phone_number">Телефонен номер</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Устройството на подателя не изпрати ключовете за това съобщение.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Устройството на подателя не изпрати ключовете за това съобщение.</string>
     <string name="summary_user_sent_sticker">%1$s изпрати стикер.</string>
     <string name="room_displayname_invite_from">Покана от %s</string>
     <string name="room_displayname_room_invite">Покана за стая</string>
@@ -212,7 +212,6 @@
     <string name="notice_direct_room_created_by_you">Създадохте дискусията</string>
     <string name="notice_direct_room_created">%1$s създаде дискусията</string>
     <string name="encrypted_message">Шифровано съобщение</string>
-    <!-- groups creation -->
     <string name="light_theme">Светла тема</string>
     <string name="dark_theme">Тъмна тема</string>
     <string name="black_theme">Черна тема</string>
@@ -272,20 +271,20 @@
     <string name="title_activity_group_details">Информация за общността</string>
     <string name="loading">Зареждане…</string>
     <string name="ok">ОК</string>
-    <string name="cancel">Откажи</string>
-    <string name="save">Запази</string>
-    <string name="leave">Напусни</string>
-    <string name="send">Изпрати</string>
-    <string name="resend">Изпрати отново</string>
-    <string name="redact">Премахни</string>
-    <string name="quote">Цитирай</string>
-    <string name="share">Сподели</string>
+    <string name="action_cancel">Откажи</string>
+    <string name="action_save">Запази</string>
+    <string name="action_leave">Напусни</string>
+    <string name="action_send">Изпрати</string>
+    <string name="action_resend">Изпрати отново</string>
+    <string name="action_redact">Премахни</string>
+    <string name="action_quote">Цитирай</string>
+    <string name="action_share">Сподели</string>
     <string name="later">По-късно</string>
-    <string name="forward">Препрати</string>
+    <string name="action_forward">Препрати</string>
     <string name="permalink">Permalink</string>
     <string name="view_source">Виж източника</string>
-    <string name="delete">Изтрий</string>
-    <string name="rename">Преименувай</string>
+    <string name="action_delete">Изтрий</string>
+    <string name="action_rename">Преименувай</string>
     <string name="report_content">Докладвай съдържанието</string>
     <string name="active_call">Активен разговор</string>
     <string name="notification_listening_for_events">Следене за събития</string>
@@ -305,7 +304,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Групови разговори не се поддържат в шифровани стаи</string>
     <string name="send_anyway">Изпрати въпреки това</string>
     <string name="or">или</string>
-    <string name="invite">Покани</string>
+    <string name="action_invite">Покани</string>
     <string name="offline">Офлайн</string>
     <string name="action_exit">Изход</string>
     <string name="actions">Действия</string>
@@ -318,7 +317,7 @@
     <string name="action_quick_reply">Бърз отговор</string>
     <string name="action_open">Отвори</string>
     <string name="action_close">Затвори</string>
-    <string name="disable">Изключи</string>
+    <string name="action_disable">Изключи</string>
     <string name="dialog_title_confirmation">Потвърждение</string>
     <string name="dialog_title_warning">Предупреждение</string>
     <string name="bottom_action_home">Начало</string>
@@ -517,17 +516,6 @@
     <string name="tab_title_search_messages">СЪОБЩЕНИЯ</string>
     <string name="tab_title_search_people">ХОРА</string>
     <string name="tab_title_search_files">ФАЙЛОВЕ</string>
-    <string name="room_recents_join">ВЛЕЗ</string>
-    <string name="room_recents_directory">ДИРЕКТОРИЯ</string>
-    <string name="room_recents_favourites">ЛЮБИМИ</string>
-    <string name="room_recents_conversations">СТАИ</string>
-    <string name="room_recents_low_priority">НИСЪК ПРИОРИТЕТ</string>
-    <string name="room_recents_invites">ПОКАНИ</string>
-    <string name="room_recents_start_chat">Започни чат</string>
-    <string name="room_recents_create_room">Създай стая</string>
-    <string name="room_recents_join_room">Присъедини се към стая</string>
-    <string name="room_recents_join_room_title">Присъединяване към стая</string>
-    <string name="room_recents_join_room_prompt">Напишете ID или псевдоним на стая</string>
     <string name="directory_search_results_title">Прегледай директорията</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d стая</item>
@@ -759,7 +747,6 @@
         <item quantity="one">%d активно приспособление</item>
         <item quantity="other">%d активни приспособления</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Неуспешно създаване на приспособление.</string>
     <string name="widget_integration_failed_to_send_request">Неуспешно изпращане на заявката.</string>
     <string name="widget_integration_positive_power_level">Нивото на достъп трябва да бъде позитивно число.</string>
@@ -793,10 +780,10 @@
     <string name="yes">ДА</string>
     <string name="no">НЕ</string>
     <string name="_continue">Продължи</string>
-    <string name="remove">Премахни</string>
-    <string name="join">Влез</string>
-    <string name="preview">Прегледай</string>
-    <string name="reject">Откажи</string>
+    <string name="action_remove">Премахни</string>
+    <string name="action_join">Влез</string>
+    <string name="action_preview">Прегледай</string>
+    <string name="action_reject">Откажи</string>
     <string name="rejoin">Повторно присъединяване</string>
     <string name="forget_room">Забрави стаята</string>
     <string name="avatar">Профилна снимка</string>
@@ -861,19 +848,15 @@
     <string name="largest">Най-голям</string>
     <string name="huge">Огромен</string>
     <string name="settings_labs_native_camera">Използване на камерата на телефона</string>
-    <!-- share keys -->
     <string name="you_added_a_new_device">Добавихте ново устройство \'%s\', което изисква ключове за шифроване.</string>
     <string name="your_unverified_device_requesting">Вашето непотвърдено устройство \'%s\' изисква ключове за шифроване.</string>
     <string name="start_verification">Започни потвърждението</string>
     <string name="share_without_verifying">Сподели без потвърждение</string>
     <string name="ignore_request">Игнорирай поканата</string>
-    <!-- conference call -->
     <string name="conference_call_warning_title">Предупреждение!</string>
     <string name="conference_call_warning_message">Груповите разговори са в процес на разработка и не са надеждни.</string>
-    <!-- slash commands -->
     <string name="command_error">Грешка в командата</string>
     <string name="unrecognized_command">Неразпозната команда: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Изключено</string>
     <string name="notification_noisy">Шумно</string>
     <string name="create">Създай</string>
@@ -882,7 +865,6 @@
     <string name="community_name_hint">Пример</string>
     <string name="community_id">ID на общност</string>
     <string name="community_id_hint">пример</string>
-    <!-- group details -->
     <string name="group_details_home">Начало</string>
     <string name="group_details_people">Хора</string>
     <string name="group_details_rooms">Стаи</string>
@@ -937,9 +919,9 @@
     <string name="deactivate_account_prompt_password">За да продължите, моля въведете паролата си:</string>
     <string name="deactivate_account_submit">Деактивирай акаунта</string>
     <string name="dialog_title_third_party_licences">Лицензи от трети страни</string>
-    <string name="download">Изтегли</string>
-    <string name="speak">Говори</string>
-    <string name="clear">Изчисти</string>
+    <string name="action_download">Изтегли</string>
+    <string name="action_speak">Говори</string>
+    <string name="action_clear">Изчисти</string>
     <string name="e2e_re_request_encryption_key"><u>Изисквай повторно ключове за шифроване</u> от другите ми устройства.</string>
     <string name="e2e_re_request_encryption_key_sent">Заявката за ключове беше изпратена.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Изпратена заявка</string>
@@ -1037,7 +1019,7 @@
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
     <string name="call_anyway">Звънни въпреки това</string>
-    <string name="accept">Приемам</string>
+    <string name="action_accept">Приемам</string>
     <string name="auth_accept_policies">Моля прегледайте и приемете политиките на сървъра:</string>
     <string name="settings_call_category">Обаждания</string>
     <string name="template_settings_call_ringtone_use_app_ringtone">Използвай мелодията по подразбиране на ${app_name} за входящи повиквания</string>
@@ -1133,7 +1115,7 @@
     <string name="title_activity_keys_backup_setup">Резервно копие на ключовете</string>
     <string name="title_activity_keys_backup_restore">Използвай резервно копие на ключовете</string>
     <string name="keys_backup_is_not_finished_please_wait">Резервното копиране на ключовете не е завършило. Моля почакайте…</string>
-    <string name="skip">Пропусни</string>
+    <string name="action_skip">Пропусни</string>
     <string name="done">Готово</string>
     <string name="settings_notification_advanced">Разширени настройки за известия</string>
     <string name="settings_notification_by_event">Важност на известията според типа събитие</string>
@@ -1230,8 +1212,8 @@
     <string name="are_you_sure">Сигурни ли сте?</string>
     <string name="backup">Резервно копие</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Ако не направите резервно копие на ключовете преди да излезете, ще загубите достъп до шифрованите съобщения.</string>
-    <string name="stay">Остани</string>
-    <string name="abort">Прекрати</string>
+    <string name="action_stay">Остани</string>
+    <string name="action_abort">Прекрати</string>
     <string name="action_sign_out_confirmation_simple">Сигурни ли сте, че искате да се отпишете\?</string>
     <string name="settings_data_save_mode_summary">Режим икономия на данни игнорира уведомленията за пишещи хора, както и информация за онлайн статуса на потребители.</string>
     <string name="encryption_message_recovery">Възстановяване на шифровани съобщения</string>
@@ -1277,7 +1259,7 @@
     <string name="keys_backup_restoring_computing_key_waiting_message">Изчисляване на ключ за възстановяване…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Изтегляне на ключове…</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Импортиране на ключове…</string>
-    <string name="ignore">Отхвърли</string>
+    <string name="action_ignore">Отхвърли</string>
     <string name="login_error_unknown_host">URL адресът не е достъпен, моля проверете</string>
     <string name="login_error_ssl_handshake">Устройството Ви използва остарял TLS протокол за сигурност, който е уязвим към атаки. За ваша безопасност няма да може да се свържете</string>
     <string name="settings_send_message_with_enter">Изпращай съобщения с Enter</string>
@@ -1387,8 +1369,8 @@
     <string name="room_list_rooms_empty_title">Стаи</string>
     <string name="room_list_rooms_empty_body">Вашите стаи се показват тук</string>
     <string name="title_activity_emoji_reaction_picker">Реакции</string>
-    <string name="reactions_agree">Съгласен съм</string>
-    <string name="reactions_like">Харесвам</string>
+    <string name="action_agree">Съгласен съм</string>
+    <string name="action_like">Харесвам</string>
     <string name="message_add_reaction">Добави реакция</string>
     <string name="message_view_reaction">Виж реакциите</string>
     <string name="reactions">Реакции</string>
@@ -1470,8 +1452,8 @@
     <string name="direct_room_filter_hint">Филтрирай по потребител или ID…</string>
     <string name="joining_room">Присъединяване в стая…</string>
     <string name="message_view_edit_history">Виж историята на редакциите</string>
-    <string name="review">Прегледай</string>
-    <string name="decline">Откажи</string>
+    <string name="action_review">Прегледай</string>
+    <string name="action_decline">Откажи</string>
     <string name="widget_integration_review_terms">За да продължите трябва да приемете условията за използване на услугата.</string>
     <string name="terms_of_service">Условия за ползване</string>
     <string name="review_terms">Прегледай условията</string>
@@ -1479,8 +1461,8 @@
     <string name="terms_description_for_integration_manager">Използвайте ботове, връзки с други мрежи, приспособления и стикери</string>
     <string name="read_at">Прочетете на</string>
     <string name="none">Нищо</string>
-    <string name="revoke">Оттегли</string>
-    <string name="disconnect">Прекъсни</string>
+    <string name="action_revoke">Оттегли</string>
+    <string name="action_disconnect">Прекъсни</string>
     <string name="people_no_identity_server">Не е настроен сървър за самоличност.</string>
     <string name="call_failed_no_ice_title">Обаждането се провали поради грешно настроен сървър</string>
     <string name="call_failed_no_ice_description">Попитайте администратора на сървъра (%1$s) да конфигурира TURN сървър за да може разговорите да работят надеждно.
@@ -1782,8 +1764,8 @@
     <string name="event_redacted">Съобщението беше изтрито</string>
     <string name="settings_show_redacted">Показвай премахнатите съобщения</string>
     <string name="settings_show_redacted_summary">Показвай индикатор на мястото на премахнатите съобщения</string>
-    <string name="play_video">Възпроизведи</string>
-    <string name="pause_video">Пауза</string>
+    <string name="action_play">Възпроизведи</string>
+    <string name="action_pause">Пауза</string>
     <string name="room_participants_kick_reason">Причина за изгонване</string>
     <string name="room_participants_kick_title">Изгонване на потребител</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Сигурни ли сте, че искате да откажете изпратената към този потребител покана\?</string>
@@ -1836,8 +1818,8 @@
     <string name="no_permissions_to_start_webrtc_call">Нямате привилегии да започнете разговор в тази стая</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Нямате привилегии да започнете конферентен разговор</string>
     <string name="no_permissions_to_start_conf_call">Нямате привилегии да стартирате конферентен разговор в тази стая</string>
-    <string name="reset">Нулирай</string>
-    <string name="dismiss">Затвори</string>
+    <string name="action_reset">Нулирай</string>
+    <string name="action_dismiss">Затвори</string>
     <string name="encryption_information_cross_signing_state">Кръстосано-подписване</string>
     <string name="verification_conclusion_ok_self_notice">Новата ви сесия вече е потвърдена и има достъп до шифрованите съобщения. Другите потребители ще я виждат като доверена.</string>
     <string name="verification_conclusion_ok_notice">Съобщенията с този потребител са шифровани от-край-до-край и не могат да бъдат разчетени от трети страни.</string>
@@ -1921,7 +1903,6 @@
     <string name="verification_request_waiting">Изчакване…</string>
     <string name="sent_verification_conclusion">Резултат от проверка</string>
     <string name="sent_a_reaction">Реагира с: %s</string>
-    <string name="sent_a_bot_buttons">Бот бутони</string>
     <string name="sent_a_poll">Анкета</string>
     <string name="send_a_sticker">Стикер</string>
     <string name="sent_a_file">Файл</string>
@@ -2065,15 +2046,6 @@
     <string name="verification_use_passphrase">Ако не можете да достъпите съществуваща сесия</string>
     <string name="verification_cannot_access_other_session">Използвай парола или ключ за възстановяване</string>
     <string name="command_description_poll">Създава проста анкета</string>
-    <string name="poll_item_selected_aria">Избрана опция</string>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d глас - Финални резултати</item>
-        <item quantity="other">%d гласа - Финални резултати</item>
-    </plurals>
-    <plurals name="poll_info">
-        <item quantity="one">%d глас</item>
-        <item quantity="other">%d гласа</item>
-    </plurals>
     <string name="delete_account_data_warning">Изтриване на профилните данни от тип %1$s\?
 \n
 \nВнимавайте с това - може да доведе до неочаквано поведение.</string>
@@ -2174,7 +2146,7 @@
     <string name="command_description_discard_session_not_handled">Поддържа се само в шифровани стаи</string>
     <string name="command_description_discard_session">Принудително премахва текущата изходяща групова сесия от шифрованата стая</string>
     <string name="template_use_latest_app">Използвайте последната версия на ${app_name} за устройствата си:</string>
-    <string name="or_other_mx_capabale_client">или друг Matrix клиент поддържаш кръстосано-подписване</string>
+    <string name="or_other_mx_capable_client">или друг Matrix клиент поддържаш кръстосано-подписване</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
     <string name="template_app_desktop_web">${app_name} Web
diff --git a/vector/src/main/res/values-bn-rBD/strings.xml b/vector/src/main/res/values-bn-rBD/strings.xml
index db2ee10bbc..f834222d25 100644
--- a/vector/src/main/res/values-bn-rBD/strings.xml
+++ b/vector/src/main/res/values-bn-rBD/strings.xml
@@ -395,17 +395,6 @@
         <item quantity="other">%d ঘরগুলি</item>
     </plurals>
     <string name="directory_search_results_title">ব্রাউস নির্দেশনা</string>
-    <string name="room_recents_join_room_prompt">আদর্শ ঘরের পরিচয় অথবা একটা ঘর আর উপনাম</string>
-    <string name="room_recents_join_room_title">যোগকরুন একটা ঘর</string>
-    <string name="room_recents_join_room">যোগদান করুন ঘরে</string>
-    <string name="room_recents_create_room">ঘর তৈরিকরা</string>
-    <string name="room_recents_start_chat">চ্যাট শুরু করুন</string>
-    <string name="room_recents_invites">আমন্ত্রণ</string>
-    <string name="room_recents_low_priority">কম গুরুত্ব</string>
-    <string name="room_recents_conversations">ঘরগুলি</string>
-    <string name="room_recents_favourites">প্রিয়</string>
-    <string name="room_recents_directory">নির্দেশক</string>
-    <string name="room_recents_join">যোগদান</string>
     <string name="tab_title_search_files">নথি</string>
     <string name="tab_title_search_people">লোকজন</string>
     <string name="tab_title_search_messages">বার্তাগুলি</string>
@@ -686,7 +675,7 @@
     <string name="dialog_title_error">ত্রুটি</string>
     <string name="dialog_title_warning">সতর্কতা</string>
     <string name="dialog_title_confirmation">প্রতিপাদন</string>
-    <string name="disable">অক্ষম</string>
+    <string name="action_disable">অক্ষম</string>
     <string name="copied_to_clipboard">ক্লিপবোর্ডে অনুলিপি করা হয়েছে</string>
     <string name="action_copy">অনুলিপি</string>
     <string name="action_close">বন্ধ</string>
@@ -705,10 +694,10 @@
     <string name="call_notification_hangup">বন্ধ করুন</string>
     <string name="call_notification_reject">পতন</string>
     <string name="call_notification_answer">গ্রহণ</string>
-    <string name="decline">পতন</string>
-    <string name="review">পর্যালোচনা</string>
-    <string name="ignore">উপেক্ষা</string>
-    <string name="abort">বাতিল</string>
+    <string name="action_decline">পতন</string>
+    <string name="action_review">পর্যালোচনা</string>
+    <string name="action_ignore">উপেক্ষা</string>
+    <string name="action_abort">বাতিল</string>
     <string name="done">সম্পন্ন</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' একটি উপনাম জন্য বৈধ বিন্যাস নয়</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">অবৈধ উদীয়মান বিন্যাস</string>
@@ -911,10 +900,10 @@
     <string name="template_settings_background_fdroid_sync_mode_battery_description">রায়ট এমনভাবে পটভূমিতে সিঙ্ক হবে যা ডিভাইসের সীমিত সংস্থান (ব্যাটারি) সংরক্ষণ করে।
 \nআপনার ডিভাইস রিসোর্স স্থিতির উপর নির্ভর করে সিঙ্কটি অপারেটিং সিস্টেম দ্বারা পিছিয়ে যেতে পারে।</string>
     <string name="settings_background_fdroid_sync_mode_battery">ব্যাটারির জন্য অনুকূলিত</string>
-    <string name="skip">বাদ</string>
-    <string name="accept">স্বীকার</string>
+    <string name="action_skip">বাদ</string>
+    <string name="action_accept">স্বীকার</string>
     <string name="offline">অফলাইন</string>
-    <string name="invite">আমন্ত্রণ</string>
+    <string name="action_invite">আমন্ত্রণ</string>
     <string name="or">বা</string>
     <string name="send_anyway">যেকোন ভাবেই পাঠাও</string>
     <string name="call_anyway">যেকোন ভাবেই কল করুন</string>
@@ -929,33 +918,33 @@
     <string name="ongoing_conference_call_voice">ধ্বনি</string>
     <string name="ongoing_conference_call">চলমান সম্মেলন কল।
 \n %1$s বা %2$s হিসাবলে জুড়ুন</string>
-    <string name="dismiss">বাতিল</string>
-    <string name="pause_video">থামাও</string>
-    <string name="play_video">চালু</string>
+    <string name="action_dismiss">বাতিল</string>
+    <string name="action_pause">থামাও</string>
+    <string name="action_play">চালু</string>
     <string name="active_call">সক্রিয় কল</string>
     <string name="report_content">কন্টেন্ট রিপোর্ট করুন</string>
-    <string name="disconnect">বিযুক্ত</string>
-    <string name="revoke">রদ কর</string>
+    <string name="action_disconnect">বিযুক্ত</string>
+    <string name="action_revoke">রদ কর</string>
     <string name="none">কোনটা না</string>
-    <string name="rename">পুনঃনামকরণ</string>
-    <string name="delete">মুছুন</string>
+    <string name="action_rename">পুনঃনামকরণ</string>
+    <string name="action_delete">মুছুন</string>
     <string name="view_decrypted_source">ডিক্রিপ্টেড সোর্স দেখুন</string>
     <string name="view_source">সোর্স দেখুন</string>
     <string name="permalink">পার্মালিঙ্ক</string>
-    <string name="forward">ফরওয়ার্ড</string>
+    <string name="action_forward">ফরওয়ার্ড</string>
     <string name="later">পরে</string>
-    <string name="clear">পরিষ্কার</string>
-    <string name="speak">বলা</string>
-    <string name="share">ভাগ</string>
-    <string name="download">ডাউনলোড</string>
-    <string name="quote">উদ্ধৃতি</string>
-    <string name="redact">অপসারণ</string>
-    <string name="resend">আবার পাঠান</string>
-    <string name="send">পাঠান</string>
-    <string name="stay">থাক</string>
-    <string name="leave">ত্যাগ</string>
-    <string name="save">সংরক্ষিত</string>
-    <string name="cancel">বাতিল</string>
+    <string name="action_clear">পরিষ্কার</string>
+    <string name="action_speak">বলা</string>
+    <string name="action_share">ভাগ</string>
+    <string name="action_download">ডাউনলোড</string>
+    <string name="action_quote">উদ্ধৃতি</string>
+    <string name="action_redact">অপসারণ</string>
+    <string name="action_resend">আবার পাঠান</string>
+    <string name="action_send">পাঠান</string>
+    <string name="action_stay">থাক</string>
+    <string name="action_leave">ত্যাগ</string>
+    <string name="action_save">সংরক্ষিত</string>
+    <string name="action_cancel">বাতিল</string>
     <string name="ok">ঠিক</string>
     <string name="loading">লোড হচ্ছে…</string>
     <string name="dialog_title_third_party_licences">তৃতীয় পক্ষের লাইসেন্সগুলি</string>
@@ -1077,7 +1066,7 @@
     <string name="message_failed_to_upload">চিত্র আপলোড করতে ব্যর্থ</string>
     <string name="unable_to_send_message">বার্তা পাঠাতে অক্ষম</string>
     <string name="could_not_redact">পুনরায় প্রতিক্রিয়া করতে পারেনি</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">প্রেরকের ডিভাইস আমাদের এই বার্তার জন্য কীগুলি প্রেরণ করেনি।</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">প্রেরকের ডিভাইস আমাদের এই বার্তার জন্য কীগুলি প্রেরণ করেনি।</string>
     <string name="notice_crypto_unable_to_decrypt">** ডিক্রিপ্ট করতে অক্ষম: %s **</string>
     <string name="notice_power_level_diff">%1$s %2$s থেকে %3$s পর্যন্ত</string>
     <string name="notice_power_level_changed">%1$s %2$s এর পাওয়ার স্তর পরিবর্তন করেছে।</string>
@@ -1290,10 +1279,10 @@
     <string name="room_sync_in_progress">সিঙ্ক করা হচ্ছে…</string>
     <string name="open_chat_header">হেডার খোলো</string>
     <string name="list_members">সদস্যদের তালিকা</string>
-    <string name="reject">প্রত্যাখ্যান</string>
-    <string name="preview">প্রিভিউ</string>
-    <string name="join">যোগদান</string>
-    <string name="remove">অপসারণ</string>
+    <string name="action_reject">প্রত্যাখ্যান</string>
+    <string name="action_preview">প্রিভিউ</string>
+    <string name="action_join">যোগদান</string>
+    <string name="action_remove">অপসারণ</string>
     <string name="_continue">প্রলম্বিত</string>
     <string name="no">না</string>
     <string name="yes">হ্যাঁ</string>
diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml
index 0fd00b03fe..1307061350 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@@ -99,7 +99,7 @@
     <string name="notice_power_level_changed">%1$s %2$s এর পাওয়ার স্তর পরিবর্তন করেছে।</string>
     <string name="notice_power_level_diff">%1$s %2$s থেকে %3$s পর্যন্ত</string>
     <string name="notice_crypto_unable_to_decrypt">** ডিক্রিপ্ট করতে অক্ষম: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">প্রেরকের ডিভাইস আমাদের এই বার্তার জন্য কীগুলি প্রেরণ করেনি।</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">প্রেরকের ডিভাইস আমাদের এই বার্তার জন্য কীগুলি প্রেরণ করেনি।</string>
     <string name="could_not_redact">পুনরায় প্রতিক্রিয়া করতে পারেনি</string>
     <string name="unable_to_send_message">বার্তা পাঠাতে অক্ষম</string>
     <string name="message_failed_to_upload">চিত্র আপলোড করতে ব্যর্থ</string>
@@ -226,25 +226,25 @@
     <string name="loading">লোড হচ্ছে…</string>
 
     <string name="ok">ঠিক</string>
-    <string name="cancel">বাতিল</string>
-    <string name="save">সংরক্ষিত</string>
-    <string name="leave">ত্যাগ</string>
-    <string name="stay">থাক</string>
-    <string name="send">পাঠান</string>
-    <string name="resend">আবার পাঠান</string>
-    <string name="redact">অপসারণ</string>
-    <string name="quote">উদ্ধৃতি</string>
-    <string name="download">ডাউনলোড</string>
-    <string name="share">ভাগ</string>
-    <string name="speak">বলা</string>
-    <string name="clear">পরিষ্কার</string>
+    <string name="action_cancel">বাতিল</string>
+    <string name="action_save">সংরক্ষিত</string>
+    <string name="action_leave">ত্যাগ</string>
+    <string name="action_stay">থাক</string>
+    <string name="action_send">পাঠান</string>
+    <string name="action_resend">আবার পাঠান</string>
+    <string name="action_redact">অপসারণ</string>
+    <string name="action_quote">উদ্ধৃতি</string>
+    <string name="action_download">ডাউনলোড</string>
+    <string name="action_share">ভাগ</string>
+    <string name="action_speak">বলা</string>
+    <string name="action_clear">পরিষ্কার</string>
     <string name="later">পরে</string>
-    <string name="forward">ফরওয়ার্ড</string>
+    <string name="action_forward">ফরওয়ার্ড</string>
     <string name="permalink">পার্মালিঙ্ক</string>
     <string name="view_source">সোর্স দেখুন</string>
     <string name="view_decrypted_source">ডিক্রিপ্টেড সোর্স দেখুন</string>
-    <string name="delete">মুছুন</string>
-    <string name="rename">পুনঃনামকরণ</string>
+    <string name="action_delete">মুছুন</string>
+    <string name="action_rename">পুনঃনামকরণ</string>
     <string name="report_content">কন্টেন্ট রিপোর্ট করুন</string>
     <string name="active_call">সক্রিয় কল</string>
     <string name="ongoing_conference_call">চলমান সম্মেলন কল। 
@@ -261,13 +261,13 @@
     <string name="call_anyway">যেকোন ভাবেই কল করুন</string>
     <string name="send_anyway">যেকোন ভাবেই পাঠাও</string>
     <string name="or">বা</string>
-    <string name="invite">আমন্ত্রণ</string>
+    <string name="action_invite">আমন্ত্রণ</string>
     <string name="offline">অফলাইন</string>
-    <string name="accept">স্বীকার</string>
-    <string name="skip">বাদ</string>
+    <string name="action_accept">স্বীকার</string>
+    <string name="action_skip">বাদ</string>
     <string name="done">সম্পন্ন</string>
-    <string name="abort">বাতিল</string>
-    <string name="ignore">উপেক্ষা</string>
+    <string name="action_abort">বাতিল</string>
+    <string name="action_ignore">উপেক্ষা</string>
 
     <string name="action_exit">প্রস্থান</string>
     <string name="actions">ক্রিয়াকলাপ</string>
@@ -282,7 +282,7 @@
     <string name="action_open">খুলুন</string>
     <string name="action_close">বন্ধ</string>
     <string name="copied_to_clipboard">ক্লিপবোর্ডে অনুলিপি করা হয়েছে</string>
-    <string name="disable">অক্ষম</string>
+    <string name="action_disable">অক্ষম</string>
 
     <string name="dialog_title_confirmation">প্রতিপাদন</string>
     <string name="dialog_title_warning">সতর্কতা</string>
@@ -529,10 +529,10 @@
     <string name="no">না</string>
     <string name="_continue">প্রলম্বিত</string>
 
-    <string name="remove">অপসারণ</string>
-    <string name="join">যোগদান</string>
-    <string name="preview">প্রিভিউ</string>
-    <string name="reject">প্রত্যাখ্যান</string>
+    <string name="action_remove">অপসারণ</string>
+    <string name="action_join">যোগদান</string>
+    <string name="action_preview">প্রিভিউ</string>
+    <string name="action_reject">প্রত্যাখ্যান</string>
 
     <string name="list_members">সদস্যদের তালিকা</string>
     <string name="open_chat_header">হেডার খোলো</string>
@@ -684,18 +684,6 @@
     <string name="tab_title_search_people">লোকজন</string>
     <string name="tab_title_search_files">নথি</string>
 
-    <string name="room_recents_join">যোগদান</string>
-    <string name="room_recents_directory">নির্দেশক</string>
-    <string name="room_recents_favourites">প্রিয়</string>
-    <string name="room_recents_conversations">ঘরগুলি</string>
-    <string name="room_recents_low_priority">"কম গুরুত্ব "</string>
-    <string name="room_recents_invites">আমন্ত্রণ</string>
-    <string name="room_recents_start_chat">চ্যাট শুরু করুন</string>
-    <string name="room_recents_create_room">ঘর তৈরিকরা</string>
-    <string name="room_recents_join_room">যোগদান করুন ঘরে</string>
-    <string name="room_recents_join_room_title">যোগকরুন একটা ঘর</string>
-    <string name="room_recents_join_room_prompt">আদর্শ ঘরের পরিচয় অথবা একটা ঘর আর উপনাম</string>
-
     <string name="directory_search_results_title">ব্রাউস নির্দেশনা</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">"একটা ঘর "</item>
@@ -1260,10 +1248,10 @@
     <string name="command_description_emote">কর্ম প্রদর্শন করে</string>
     <string name="command_description_ban_user">দেওয়া আইডি সঙ্গে ব্যবহারকারী কে নিষিদ্ধ করে</string>
     <string name="none">কোনটা না</string>
-    <string name="revoke">রদ কর</string>
-    <string name="disconnect">বিযুক্ত</string>
-    <string name="review">পর্যালোচনা</string>
-    <string name="decline">পতন</string>
+    <string name="action_revoke">রদ কর</string>
+    <string name="action_disconnect">বিযুক্ত</string>
+    <string name="action_review">পর্যালোচনা</string>
+    <string name="action_decline">পতন</string>
 
     <string name="people_no_identity_server">কোনও পরিচয় সার্ভার কনফিগার করা নেই।</string>
 
@@ -1427,9 +1415,9 @@
     <string name="resource_limit_soft_mau"> এই হোমসার্ভারটি তার মাসিক অ্যাক্টিভ ব্যবহারকারীর সীমাটিতে আঘাত করেছে তাই <b> কিছু ব্যবহারকারী লগ ইন করতে পারবেন না </b>।</string>
     <string name="resource_limit_hard_mau">এই হোমসার্ভারটি তার মাসিক সক্রিয় ব্যবহারকারীর সীমাতে ছুঁয়েছে।</string>
 
-    <string name="play_video">চালু</string>
-    <string name="pause_video">থামাও</string>
-    <string name="dismiss">বাতিল</string>
+    <string name="action_play">চালু</string>
+    <string name="action_pause">থামাও</string>
+    <string name="action_dismiss">বাতিল</string>
 
 
     <string name="action_copy">অনুলিপি</string>
diff --git a/vector/src/main/res/values-bs/strings.xml b/vector/src/main/res/values-bs/strings.xml
index 8628a56a26..01cf6ae13d 100644
--- a/vector/src/main/res/values-bs/strings.xml
+++ b/vector/src/main/res/values-bs/strings.xml
@@ -18,21 +18,21 @@
     <string name="title_activity_historical">Istorijski</string>
     <string name="title_activity_bug_report">Izvještaj o Greški</string>
     <string name="ok">OK</string>
-    <string name="cancel">Otkaži</string>
-    <string name="save">Snimi</string>
-    <string name="leave">Napusti</string>
-    <string name="send">Pošalji</string>
-    <string name="resend">Pošalji Ponovo</string>
-    <string name="redact">Uredi</string>
-    <string name="quote">Citat</string>
-    <string name="share">Podijeli</string>
+    <string name="action_cancel">Otkaži</string>
+    <string name="action_save">Snimi</string>
+    <string name="action_leave">Napusti</string>
+    <string name="action_send">Pošalji</string>
+    <string name="action_resend">Pošalji Ponovo</string>
+    <string name="action_redact">Uredi</string>
+    <string name="action_quote">Citat</string>
+    <string name="action_share">Podijeli</string>
     <string name="later">Poslije</string>
-    <string name="forward">Proslijedi</string>
+    <string name="action_forward">Proslijedi</string>
     <string name="permalink">Permalink</string>
     <string name="view_source">Pogledaj Izvor</string>
     <string name="view_decrypted_source">Pogledaj Dekriptovani Izvor</string>
-    <string name="delete">Izbriši</string>
-    <string name="rename">Preimenuj</string>
+    <string name="action_delete">Izbriši</string>
+    <string name="action_rename">Preimenuj</string>
     <string name="report_content">Prijavi sadržaj</string>
     <string name="active_call">Aktivni poziv</string>
     <string name="ongoing_conference_call">"Konferencijski poziv u toku.\nPridruži se putem %1$s ili %2$s."</string>
@@ -46,7 +46,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Konferencijski pozivi nisu podržani u šifriranim sobama</string>
     <string name="send_anyway">Ipak pošalji</string>
     <string name="or">ili</string>
-    <string name="invite">Pozovi</string>
+    <string name="action_invite">Pozovi</string>
     <string name="offline">Offline</string>
     <string name="action_sign_out">Odjavi se</string>
     <string name="action_voice_call">Glasovni Poziv</string>
@@ -58,7 +58,7 @@
     <string name="action_open">Otvori</string>
     <string name="action_close">Zatvori</string>
     <string name="copied_to_clipboard">Kopirano</string>
-    <string name="disable">Isključi</string>
+    <string name="action_disable">Isključi</string>
     <string name="dialog_title_confirmation">Potvrda</string>
     <string name="dialog_title_warning">Upozorenje</string>
     <string name="bottom_action_home">Naslovna</string>
@@ -226,10 +226,10 @@ Dopustite pristup sljedećem skočnom prozoru da biste otkrili kontakte koji kor
     <string name="yes">DA</string>
     <string name="no">NE</string>
     <string name="_continue">Nastavi</string>
-    <string name="remove">Ukloni</string>
-    <string name="join">Spoji</string>
-    <string name="preview">Pregled</string>
-    <string name="reject">Odbij</string>
+    <string name="action_remove">Ukloni</string>
+    <string name="action_join">Spoji</string>
+    <string name="action_preview">Pregled</string>
+    <string name="action_reject">Odbij</string>
     <string name="room_jump_to_first_unread">Idi na prvu nepročitanu poruku.</string>
     <string name="room_preview_invitation_format">Pozvani ste da %s se pridružite u ovu sobu</string>
     <string name="room_preview_unlinked_email_warning">Ova je pozivnica poslana na%, koja nije povezana s ovim računom.
@@ -318,17 +318,6 @@ Da li ste sigurani?</string>
     <string name="tab_title_search_messages">PORUKE</string>
     <string name="tab_title_search_people">LJUDI</string>
     <string name="tab_title_search_files">FAJLOVI</string>
-    <string name="room_recents_join">PRIDRUŽI SE</string>
-    <string name="room_recents_directory">DIREKTORIJ</string>
-    <string name="room_recents_favourites">FAVORITI</string>
-    <string name="room_recents_conversations">SOBE</string>
-    <string name="room_recents_low_priority">NISKI PRIORITET</string>
-    <string name="room_recents_invites">POZIVI</string>
-    <string name="room_recents_start_chat">Započni razgovor</string>
-    <string name="room_recents_create_room">Napravi sobu</string>
-    <string name="room_recents_join_room">Pridruži se sobi</string>
-    <string name="room_recents_join_room_title">Pridriži se u sobu</string>
-    <string name="room_recents_join_room_prompt">Upišite ID sobe ili alias sobe</string>
     <string name="directory_search_results_title">Pretražite imenik</string>
     <string name="directory_searching_title">Traži direktorij..</string>
     <string name="room_settings_favourite">Favorit</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 9f8f2a98b0..d55d9b8fd5 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -38,7 +38,7 @@
     <string name="notice_room_third_party_invite">%1$s ha enviat una invitació a %2$s perquè s\'uneixi a la sala</string>
     <string name="notice_room_third_party_registered_invite">%1$s ha acceptat la invitació de %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** No s\'ha pogut desxifrar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositiu del remitent no ens ha enviat les claus per aquest missatge.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">El dispositiu del remitent no ens ha enviat les claus per aquest missatge.</string>
     <string name="could_not_redact">No s\'ha pogut redactar</string>
     <string name="unable_to_send_message">No s\'ha pogut enviar el missatge</string>
     <string name="message_failed_to_upload">No s\'ha pogut pujar la imatge</string>
@@ -48,7 +48,6 @@
     <string name="notice_display_name_set">%1$s a canviat el seu àlies a %2$s</string>
     <string name="notice_placed_video_call">%s ha realitzat una videotrucada.</string>
     <string name="notice_placed_voice_call">%s ha realitzat una trucada de veu.</string>
-    <!-- Room display name -->
     <string name="room_displayname_invite_from">Invitació de %s</string>
     <string name="room_displayname_room_invite">Convida a la sala</string>
     <string name="room_displayname_two_members">%1$s i %2$s</string>
@@ -263,16 +262,13 @@
     <string name="notice_widget_jitsi_added">%1$s ha iniciat una videoconferència</string>
     <string name="notice_widget_jitsi_added_by_you">Has iniciat una videoconferència</string>
     <string name="notice_widget_jitsi_removed">%1$s ha finalitzat la videoconferència</string>
-    <!-- theme -->
     <string name="light_theme">Tema clar</string>
     <string name="dark_theme">Tema fosc</string>
     <string name="black_theme">Tema negre</string>
-    <!-- permanent notification subtitle -->
     <string name="notification_sync_in_progress">Sincronitzant…</string>
     <string name="notification_listening_for_events">Escoltant esdeveniments</string>
     <string name="notification_noisy_notifications">Notificacions amb so</string>
     <string name="notification_silent_notifications">Notificacions silencioses</string>
-    <!-- titles -->
     <string name="title_activity_home">Missatges</string>
     <string name="title_activity_room">Sala</string>
     <string name="title_activity_settings">Configuració</string>
@@ -280,23 +276,22 @@
     <string name="title_activity_historical">Historial</string>
     <string name="title_activity_bug_report">Informe d\'errors</string>
     <string name="title_activity_group_details">Detalls de la comunitat</string>
-    <!-- button names -->
     <string name="ok">D\'acord</string>
-    <string name="cancel">Cancel·la</string>
-    <string name="save">Desa</string>
-    <string name="leave">Marxa</string>
-    <string name="send">Envia</string>
-    <string name="resend">Reenvia</string>
-    <string name="redact">Elimina</string>
-    <string name="quote">Cita</string>
-    <string name="share">Comparteix</string>
+    <string name="action_cancel">Cancel·la</string>
+    <string name="action_save">Desa</string>
+    <string name="action_leave">Marxa</string>
+    <string name="action_send">Envia</string>
+    <string name="action_resend">Reenvia</string>
+    <string name="action_redact">Elimina</string>
+    <string name="action_quote">Cita</string>
+    <string name="action_share">Comparteix</string>
     <string name="later">Més tard</string>
-    <string name="forward">Reenvia</string>
+    <string name="action_forward">Reenvia</string>
     <string name="permalink">Enllaç permanent</string>
     <string name="view_source">Visualitza el codi font</string>
     <string name="view_decrypted_source">Visualitza el codi font desencriptat</string>
-    <string name="delete">Elimina</string>
-    <string name="rename">Canvia el nom</string>
+    <string name="action_delete">Elimina</string>
+    <string name="action_rename">Canvia el nom</string>
     <string name="report_content">Informa del contingut</string>
     <string name="active_call">Trucada activa</string>
     <string name="ongoing_conference_call">Videoconferència en curs.
@@ -311,9 +306,8 @@
     <string name="room_no_conference_call_in_encrypted_rooms">No s\'admeten conferències en sales xifrades</string>
     <string name="send_anyway">Envia igualment</string>
     <string name="or">o</string>
-    <string name="invite">Convida</string>
+    <string name="action_invite">Convida</string>
     <string name="offline">Fora de línia</string>
-    <!-- actions -->
     <string name="action_sign_out">Tanca la sessió</string>
     <string name="action_voice_call">Trucada</string>
     <string name="action_video_call">Videotrucada</string>
@@ -324,25 +318,20 @@
     <string name="action_open">Obre</string>
     <string name="action_close">Tanca</string>
     <string name="copied_to_clipboard">S\'ha copiat al porta-retalls</string>
-    <string name="disable">Desactiva</string>
-    <!-- dialog titles -->
+    <string name="action_disable">Desactiva</string>
     <string name="dialog_title_confirmation">Confirmació</string>
     <string name="dialog_title_warning">Avís</string>
-    <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Inici</string>
     <string name="bottom_action_favourites">Preferits</string>
     <string name="bottom_action_people">Persones</string>
     <string name="bottom_action_rooms">Sales</string>
-    <!-- Home screen -->
     <string name="home_filter_placeholder_home">Filtra noms de sala</string>
     <string name="home_filter_placeholder_favorites">Filtra preferits</string>
     <string name="home_filter_placeholder_people">Filtra persones</string>
     <string name="home_filter_placeholder_rooms">Filtra noms de sala</string>
     <string name="home_filter_placeholder_groups">Filtra noms de comunitat</string>
-    <!-- Home fragment -->
     <string name="invitations_header">Invitacions</string>
     <string name="low_priority_header">Prioritat baixa</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">Xats personals</string>
     <string name="local_address_book_header">Llibreta d\'adreces local</string>
     <string name="user_directory_header">Directori d\'usuari</string>
@@ -350,7 +339,6 @@
     <string name="no_conversation_placeholder">No hi ha xats</string>
     <string name="template_no_contact_access_placeholder">No has donat permís a ${app_name} perquè pugui accedir als teus contactes locals</string>
     <string name="no_result_placeholder">Sense resultats</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">Sales</string>
     <string name="rooms_directory_header">Directori de sala</string>
     <string name="no_room_placeholder">No hi ha sales</string>
@@ -359,7 +347,6 @@
         <item quantity="one">%d usuari</item>
         <item quantity="other">%d usuaris</item>
     </plurals>
-    <!-- Groups fragment -->
     <string name="groups_invite_header">Convida</string>
     <string name="groups_header">Comunitats</string>
     <string name="no_group_placeholder">No hi ha grups</string>
@@ -395,7 +382,6 @@
     <string name="option_take_photo_video">Fes una foto o un vídeo</string>
     <string name="option_take_photo">Fes una foto</string>
     <string name="option_take_video">Fes un vídeo</string>
-    <!-- Authentication -->
     <string name="auth_login">Entra</string>
     <string name="auth_register">Crea un compte</string>
     <string name="auth_submit">Tramet</string>
@@ -443,7 +429,6 @@
     <string name="auth_reset_password_success_message">La contrasenya s\'ha reiniciat.
 \n
 \nSe t\'ha desconnectat de totes les teves sessions i no rebràs més notificacions. Per reactivar les notificacions, torna a iniciar sessió a cada dispositiu.</string>
-    <!-- Login Screen -->
     <string name="login_error_must_start_http">La URL ha de començar per http[s]://</string>
     <string name="login_error_network_error">No s\'ha pogut iniciar la sessió: error de xarxa</string>
     <string name="login_error_unable_login">No s\'ha pogut iniciar la sessió</string>
@@ -458,28 +443,20 @@
     <string name="login_error_limit_exceeded">S\'han enviat massa peticions</string>
     <string name="login_error_user_in_use">Aquest nom d\'usuari ja està en ús</string>
     <string name="login_error_login_email_not_yet">L\'enllaç del correu electrònic que encara no heu fet clic</string>
-    <!-- crypto warnings -->
-    <!-- read receipts list Screen -->
     <string name="read_receipts_list">Llista de confirmacions de lectura</string>
-    <!-- accounts list Screen -->
-    <!-- image size selection -->
     <string name="compression_options">Envia com</string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Gran</string>
     <string name="compression_opt_list_medium">Mitjana</string>
     <string name="compression_opt_list_small">Petita</string>
-    <!-- media upload / download messages -->
     <string name="attachment_cancel_download">"Voleu cancel·lar la baixada?</string>
     <string name="attachment_cancel_upload">Voleu cancel·lar la pujada?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
-    <!-- room creation dialog Screen -->
     <string name="yesterday">Ahir</string>
     <string name="today">Avui</string>
-    <!-- room info dialog Screen -->
     <string name="room_info_room_name">Nom de la sala</string>
     <string name="room_info_room_topic">Tema de la sala</string>
-    <!-- call string -->
     <string name="call">Truca</string>
     <string name="call_connected">Trucada establerta</string>
     <string name="call_connecting">Establint la trucada…</string>
@@ -493,10 +470,8 @@
     <string name="call_error_ice_failed">Ha fallat la connexió de mitjans</string>
     <string name="call_error_camera_init_failed">No es pot iniciar la càmera</string>
     <string name="call_error_answered_elsewhere">s\'ha contestat la trucada des d\'un altre lloc</string>
-    <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Fes una foto o un vídeo"</string>
     <string name="media_picker_cannot_record_video">No es poden gravar vídeos"</string>
-    <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informació</string>
     <string name="template_permissions_rationale_msg_storage">Per poder enviar i desar fitxers adjunts, ${app_name} necessita permís per accedir a la galeria de fotos i vídeos.
 \n
@@ -517,31 +492,25 @@
 \n
 \nPermets que ${app_name} accedeixi als teus contactes amb aquesta finalitat\?</string>
     <string name="permissions_action_not_performed_missing_permissions">No s\'ha realitzat l\'acció per falta de permisos</string>
-    <!-- medias slider string -->
     <string name="media_slider_saved">Desat</string>
     <string name="media_slider_saved_message">Desar a baixades?</string>
     <string name="yes">SÍ</string>
     <string name="no">NO</string>
     <string name="_continue">Continua</string>
-    <!-- Actions -->
-    <string name="remove">Elimina</string>
-    <string name="join">Uneix-te</string>
-    <string name="preview">Previsualitza</string>
-    <string name="reject">Rebutja</string>
-    <!-- Room -->
+    <string name="action_remove">Elimina</string>
+    <string name="action_join">Uneix-te</string>
+    <string name="action_preview">Previsualitza</string>
+    <string name="action_reject">Rebutja</string>
     <string name="room_jump_to_first_unread">Vés fins al primer no llegit</string>
-    <!-- Room Preview -->
     <string name="room_preview_invitation_format">L\'usuari %s t\'ha convidat a unir-te a aquesta sala</string>
     <string name="room_preview_unlinked_email_warning">Aquesta invitació s\'ha enviat a %s, que no està associat amb aquest compte.
 \nPotser hauries d\'iniciar sessió amb un compte diferent o afegir aquest correu electrònic al teu compte.</string>
     <string name="room_preview_try_join_an_unknown_room">Estàs intentant accedir a %s. Vols unir-te per poder participar en la discussió\?</string>
     <string name="room_preview_try_join_an_unknown_room_default">una sala</string>
     <string name="room_preview_room_interactions_disabled">Això és una previsualització de la sala. Les interaccions de la sala estan desactivades.</string>
-    <!-- Chat creation -->
     <string name="room_creation_title">Nou xat</string>
     <string name="room_creation_add_member">Afegeix un participant</string>
     <string name="room_title_one_member">1 participant</string>
-    <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Marxa de la sala</string>
     <string name="room_participants_leave_prompt_msg">Estàs segur que vols marxar de la sala\?</string>
     <string name="room_participants_remove_prompt_msg">Estàs segur que vols eliminar %s d\'aquest xat\?</string>
@@ -570,7 +539,6 @@
 \nN\'estàs segur\?</string>
     <string name="room_participants_invite_prompt_msg">Estàs segur que vols convidar a %s a aquest xat\?</string>
     <string name="room_participants_ban_prompt_msg">Si vetes un usuari, se l\'expulsarà d\'aquesta sala i no podrà tornar a unir-s\'hi.</string>
-    <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Convida per ID</u></string>
     <string name="people_search_local_contacts">CONTACTES LOCALS (%d)</string>
     <string name="people_search_user_directory">DIRECTORI D\'USUARI (%s)</string>
@@ -578,7 +546,6 @@
     <string name="people_search_invite_by_id_dialog_title">Convida un usuari per ID</string>
     <string name="people_search_invite_by_id_dialog_description">Introdueix un o més correus electrònics o identificadors de Matrix</string>
     <string name="people_search_invite_by_id_dialog_hint">Correu electrònic o ID de Matrix</string>
-    <!--  Chat -->
     <string name="room_menu_search">Cerca</string>
     <string name="room_one_user_is_typing">%s està escrivint…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s estan escrivint…</string>
@@ -594,7 +561,6 @@
     <string name="room_delete_unsent_messages">Elimina els missatges no enviats</string>
     <string name="room_message_file_not_found">No s\'ha trobat el fitxer</string>
     <string name="room_do_not_have_permission_to_post">No tens permís per publicar en aquesta sala.</string>
-    <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Confia</string>
     <string name="ssl_do_not_trust">No hi confiïs</string>
     <string name="ssl_logout_account">Tanca sessió</string>
@@ -606,7 +572,6 @@
     <string name="ssl_unexpected_existing_expl">El certificat ha canviat respecte aquell en el qual el telefon confia. Això NO ÉS GENS HABITUAL. Es recomana que NO ACCEPTEU el certificat nou.</string>
     <string name="ssl_expected_existing_expl">El certificat en el que confiàveu ha canviat per un en el que no confieu. El servidor pot haver renovat el certificat. Contacteu amb l\'administrador del servidor per saber l\'empremta digital esperada.</string>
     <string name="ssl_only_accept">Només accepteu el certificat si l\'administrador del servidor ha publicat una empremta digital que coincideixi amb l\'anterior.</string>
-    <!-- Room Details -->
     <string name="room_details_title">Detalls de la sala</string>
     <string name="room_details_people">Participants</string>
     <string name="room_details_files">Fitxers</string>
@@ -614,14 +579,12 @@
     <string name="malformed_id">L\'ID és incorrecte. Ha de ser una adreça de correu electrònic o un identificador de Matrix com \'@partlocal:domini\'</string>
     <string name="room_details_people_invited_group_name">CONVIDATS</string>
     <string name="room_details_people_present_group_name">S\'HAN UNIT</string>
-    <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Motiu per informar d\'aquest contingut</string>
     <string name="room_event_action_report_prompt_ignore_user">Vols amagar tots els missatges d\'aquest usuari\?
 \n
 \nTingues en compte que aquesta acció reiniciarà l\'aplicació i pot trigar una estona.</string>
     <string name="room_event_action_cancel_upload">Cancel·la la pujada</string>
     <string name="room_event_action_cancel_download">Cancel·la la baixada</string>
-    <!-- Search -->
     <string name="search_hint">Cerca</string>
     <string name="search_members_hint">Filtra els participants de la sala</string>
     <string name="search_no_results">No hi ha resultats</string>
@@ -629,29 +592,14 @@
     <string name="tab_title_search_messages">MISSATGES</string>
     <string name="tab_title_search_people">PARTICIPANTS</string>
     <string name="tab_title_search_files">FITXERS</string>
-    <!-- Room recents -->
-    <string name="room_recents_join">UNEIX-TE</string>
-    <string name="room_recents_directory">DIRECTORI</string>
-    <string name="room_recents_favourites">PREFERITS</string>
-    <string name="room_recents_conversations">SALES</string>
-    <string name="room_recents_low_priority">PRIORITAT BAIXA</string>
-    <string name="room_recents_invites">CONVIDA</string>
-    <string name="room_recents_start_chat">Inicia un xat</string>
-    <string name="room_recents_create_room">Crea una sala</string>
-    <string name="room_recents_join_room">Uneix-te a la sala</string>
-    <string name="room_recents_join_room_title">Uneix-te a una sala</string>
-    <string name="room_recents_join_room_prompt">Escriviu un id de sala o un àlies de sala</string>
-    <!-- Directory -->
     <string name="directory_search_results_title">Navega pel directori</string>
     <string name="directory_searching_title">S\'està cercant al directori…</string>
-    <!-- home room settings -->
     <string name="room_settings_favourite">Preferit</string>
     <string name="room_settings_de_prioritize">Treu prioritat</string>
     <string name="room_settings_direct_chat">Xat directe</string>
     <string name="room_settings_leave_conversation">Marxa del xat</string>
     <string name="room_settings_forget">Oblida</string>
     <string name="room_settings_add_homescreen_shortcut">Afegeix a la pantalla d\'inici</string>
-    <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Missatges</string>
     <string name="room_sliding_menu_settings">Configuració</string>
     <string name="room_sliding_menu_version">Versió</string>
@@ -659,7 +607,6 @@
     <string name="room_sliding_menu_third_party_notices">Avisos de tercers</string>
     <string name="room_sliding_menu_copyright">Copyright</string>
     <string name="room_sliding_menu_privacy_policy">Política de privacitat</string>
-    <!-- Vector Settings -->
     <string name="settings_profile_picture">Foto de perfil</string>
     <string name="settings_display_name">Àlies</string>
     <string name="settings_email_address">Correu electrònic</string>
@@ -711,7 +658,6 @@
     <string name="settings_always_show_timestamps">Mostra sempre l\'hora a tots els missatges</string>
     <string name="settings_12_24_timestamps">Mostra l\'hora en el format de 12 hores</string>
     <string name="settings_vibrate_on_mention">Vibra quan mencionin un usuari</string>
-    <!-- analytics -->
     <string name="settings_analytics">Analítiques</string>
     <string name="settings_data_save_mode">Mode d\'estalvi de dades</string>
     <string name="devices_details_dialog_title">Detalls de la sessió</string>
@@ -758,42 +704,33 @@
     <string name="settings_phone_number_verification_error">S\'ha produït un error mentre es validava el número de telèfon</string>
     <string name="settings_phone_number_code">Codi</string>
     <string name="settings_flair">Insígnia</string>
-    <!-- medias saving settings -->
     <string name="media_saving_period_3_days">Tres dies</string>
     <string name="media_saving_period_1_week">Una setmana</string>
     <string name="media_saving_period_1_month">Un mes</string>
     <string name="media_saving_period_forever">Per sempre</string>
-    <!-- Room Settings -->
-    <!-- room global settings-->
     <string name="room_settings_room_photo">Foto de la sala</string>
     <string name="room_settings_room_name">Nom de la sala</string>
     <string name="room_settings_topic">Tema</string>
     <string name="room_settings_room_tag">Etiqueta de la sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetat com a:</string>
-    <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Preferit</string>
     <string name="room_settings_tag_pref_entry_low_priority">Prioritat baixa</string>
     <string name="room_settings_tag_pref_entry_none">Cap</string>
-    <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Accés i visibilitat</string>
     <string name="room_settings_directory_visibility">Mostra aquesta sala al directori de sales</string>
     <string name="room_settings_room_access_rules_pref_title">Accés a la sala</string>
     <string name="room_settings_room_read_history_rules_pref_title">Permisos de lectura de l\'històric de la sala</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Qui pot llegir l\'històric\?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Qui pot accedir a la sala?</string>
-    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Qualsevol</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Només participants (a partir del moment en què es seleccioni aquesta opció)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Només participants (des de que són convidats)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Només participants (des de que s\'uneixen a la sala)</string>
-    <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">La sala ha de tenir una adreça per tal d\'unir-s\'hi.</string>
     <string name="room_settings_room_access_entry_only_invited">Només persones que hagin estat convidades</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Qualsevol que tingui l\'enllaç de la sala, a part dels convidats</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Qualsevol que tingui l\'enllaç de la sala, inclosos els convidats</string>
-    <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Usuaris vetats</string>
-    <!-- advanced -->
     <string name="room_settings_category_advanced_title">Avançat</string>
     <string name="room_settings_room_internal_id">ID intern d\'aquesta sala</string>
     <string name="room_settings_addresses_pref_title">Adreces</string>
@@ -804,7 +741,6 @@
     <string name="room_settings_labs_end_to_end_warnings">Necessites tancar la sessió per poder activar el xifrat.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Xifra només a sessions verificades</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">No enviïs mai, des d\'aquesta sessió, missatges xifrats a sessions no verificades en aquesta sala.</string>
-    <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Aquesta sala no té adreces locals</string>
     <string name="room_settings_addresses_add_new_address">Adreça nova (p.e. #foo:matrix.org)</string>
     <string name="room_settings_no_flair">Aquesta sala no mostra insígnies per a cap comunitat</string>
@@ -823,12 +759,9 @@
     <string name="room_settings_addresses_e2e_disabled">El xifrat en aquesta sala està desactivat.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Activa el xifrat
 \n(avís: no es podrà desactivar!)</string>
-    <!-- Directory -->
     <string name="directory_title">Directori</string>
     <string name="settings_theme">Tema</string>
-    <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s ha intentat carregar un moment concret de la cronologia d\'aquesta sala però no l\'ha trobat.</string>
-    <!-- encryption dialog -->
     <string name="encryption_information_title">Informació de l\'encriptació d\'extrem a extrem</string>
     <string name="encryption_information_device_info">Informació d\'esdeveniment</string>
     <string name="encryption_information_user_id">ID d\'usuari</string>
@@ -872,23 +805,19 @@
     <string name="encryption_information_verify_device_warning">Verifica comparant el següent amb la configuració d\'usuari de la teva altra sessió:</string>
     <string name="encryption_information_verify_device_warning2">Si no coincideixen pot ser que la seguretat de la comunicació estigui compromesa.</string>
     <string name="encryption_information_verify_key_match">Verifica que les claus coincideixen</string>
-    <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">La sala conté sessions desconegudes</string>
     <string name="unknown_devices_alert_message">Aquesta sala conté sessions desconegudes que no han estat verificades.
 \nAixò vol dir que no hi ha garanties de que aquestes sessions pertanyin als usuaris que diuen ser.
 \nRecomanem que, abans de continuar, duguis a terme el procés de verificació de cadascuna de les sessions. Però, si ho prefereixes, pots reenviar el missatge sense la verificació.
 \n
 \nSessions desconegudes:</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">Tria un directori de sales</string>
     <string name="directory_server_fail_to_retrieve_server">És possible que el servidor no estigui disponible o que estigui sobrecarregat</string>
     <string name="directory_server_type_homeserver">Introdueix un servidor base per veure les seves sales públiques</string>
     <string name="directory_server_placeholder">URL del servidor base</string>
     <string name="directory_server_all_rooms_on_server">Totes les sales del servidor %s</string>
     <string name="directory_server_native_rooms">Totes les sales natives de %s</string>
-    <!-- historical -->
     <string name="historical_placeholder">Busca a l\'historial</string>
-    <!-- text size selection -->
     <string name="font_size">Mida de la font</string>
     <string name="tiny">Molt petita</string>
     <string name="small">Petita</string>
@@ -897,12 +826,10 @@
     <string name="larger">Molt gran</string>
     <string name="largest">Més gran</string>
     <string name="huge">Enorme</string>
-    <!-- Widget-->
     <string name="widget_no_power_to_manage">Necessites permisos per gestionar ginys en aquesta sala</string>
     <string name="widget_creation_failure">Ha fallat la creació del giny</string>
     <string name="settings_labs_create_conference_with_jitsi">Fes conferències amb jitsi</string>
     <string name="widget_delete_message_confirmation">Confirmes que vols eliminar el giny d\'aquesta sala\?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">No s\'ha pogut crear el giny.</string>
     <string name="widget_integration_failed_to_send_request">No s\'ha pogut enviar la sol·licitud.</string>
     <string name="widget_integration_positive_power_level">El nivell d\'autoritat ha de ser un enter positiu.</string>
@@ -913,30 +840,24 @@
     <string name="widget_integration_room_not_visible">La sala %s no és visible.</string>
     <string name="room_add_matrix_apps">Afegeix aplicacions de Matrix</string>
     <string name="settings_labs_native_camera">Utilitza la càmera nativa</string>
-    <!-- share keys -->
     <string name="you_added_a_new_device">Has afegit una nova sessió \'%s\' que està sol·licitant les claus de xifrat.</string>
     <string name="your_unverified_device_requesting">La teva sessió no verificada \'%s\' està sol·licitant les claus de xifrat.</string>
     <string name="start_verification">Inicia la verificació</string>
     <string name="share_without_verifying">Comparteix sense verificar</string>
     <string name="ignore_request">Ignora la sol·licitut</string>
-    <!-- conference call -->
     <string name="conference_call_warning_title">Avís!</string>
     <string name="conference_call_warning_message">Les conferències estan en desenvolupament i pot ser que no funcionin bé.</string>
-    <!-- slash commands -->
     <string name="command_error">Error de comandament</string>
     <string name="unrecognized_command">Ordre no reconegut: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Apagat</string>
     <string name="notification_noisy">Amb so</string>
     <string name="encrypted_message">Missatge xifrat</string>
-    <!-- groups creation -->
     <string name="create">Crea</string>
     <string name="create_community">Crea una comunitat</string>
     <string name="community_name">Nom de la comunitat</string>
     <string name="community_name_hint">Exemple</string>
     <string name="community_id">ID de la comunitat</string>
     <string name="community_id_hint">exemple</string>
-    <!-- group details -->
     <string name="group_details_home">Inici</string>
     <string name="group_details_people">Usuaris</string>
     <string name="group_details_rooms">Sales</string>
@@ -1007,13 +928,12 @@
         <item quantity="one">%d giny actiu</item>
         <item quantity="other">%d ginys actius</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="title_activity_choose_sticker">Envia un adhesiu</string>
     <string name="option_send_sticker">Envia un adhesiu</string>
     <string name="dialog_title_third_party_licences">Llicències de tercers</string>
-    <string name="download">Baixa</string>
-    <string name="speak">Parla</string>
-    <string name="clear">Esborra</string>
+    <string name="action_download">Baixa</string>
+    <string name="action_speak">Parla</string>
+    <string name="action_clear">Esborra</string>
     <string name="option_send_voice">Envia veu</string>
     <string name="go_on_with">seguir amb…</string>
     <string name="error_no_external_application_found">Ho sento, no s\'ha trobat cap aplicació externa per completar l\'acció.</string>
@@ -1138,7 +1058,7 @@
     <string name="unknown_error">Ho sentim, s\'ha produït un error</string>
     <string name="merged_events_expand">desplega</string>
     <string name="merged_events_collapse">plega</string>
-    <string name="accept">Accepta</string>
+    <string name="action_accept">Accepta</string>
     <string name="settings_call_category">Trucada</string>
     <string name="template_settings_call_ringtone_use_app_ringtone">Utilitza el to de trucada d\'${app_name} predeterminat per trucades entrants</string>
     <string name="settings_call_ringtone_title">To de trucada entrant</string>
@@ -1204,7 +1124,7 @@
     <string name="no_valid_google_play_services_apk">No s\'ha trobat cap APK de Google Play Services vàlid. Les notificacions poden no funcionar correctament.</string>
     <string name="title_activity_keys_backup_setup">Còpia de seguretat de les claus</string>
     <string name="title_activity_keys_backup_restore">Utilitza la còpia de seguretat de les claus</string>
-    <string name="skip">Omet</string>
+    <string name="action_skip">Omet</string>
     <string name="done">Fet</string>
     <string name="settings_notification_advanced">Configuració de notificacions avançada</string>
     <string name="settings_notification_by_event">Importància de les notificacions per esdeveniment</string>
@@ -1340,8 +1260,8 @@
     <string name="keys_backup_activate">Utilitza la còpia de seguretat de les claus</string>
     <string name="are_you_sure">N\'estàs segur\?</string>
     <string name="backup">Còpia de seguretat</string>
-    <string name="stay">Queda\'t</string>
-    <string name="abort">Avorta</string>
+    <string name="action_stay">Queda\'t</string>
+    <string name="action_abort">Avorta</string>
     <string name="action_sign_out_confirmation_simple">Estàs segur que vols tancar la sessió\?</string>
     <string name="encryption_message_recovery">Recuperació de missatges xifrats</string>
     <string name="error_empty_field_enter_user_name">Introduïu un nom d\'usuari.</string>
@@ -1390,7 +1310,7 @@
 \n
 \nSi no has configurat el nou mètode de recuperació, un atacant podria estar intentant accedir al teu compte. Canvia la contrasenya del teu compte i configura un nou mètode de recuperació a la configuració immediatament.</string>
     <string name="notification_sync_init">Inicialitzant servei</string>
-    <string name="ignore">Ignora</string>
+    <string name="action_ignore">Ignora</string>
     <string name="auth_login_sso">Inicia sessió amb la inscripció única (SSO)</string>
     <string name="login_error_unknown_host">Aquesta URL no està disponible , si us plau verifiqueu-la</string>
     <string name="login_error_ssl_handshake">El teu dispositiu està utilitzant una versió obsoleta del protocol de seguretat TLS, vulnerable a atacs. Per a la teva pròpia seguretat, no et pots connectar</string>
@@ -1501,8 +1421,8 @@
     <string name="room_list_rooms_empty_title">Sales</string>
     <string name="room_list_rooms_empty_body">Les teves sales es mostraran aquí. Clica el + de la part inferior dreta per buscar-ne d\'existents o per crear-ne una.</string>
     <string name="title_activity_emoji_reaction_picker">Reaccions</string>
-    <string name="reactions_agree">Confirmar</string>
-    <string name="reactions_like">M\'agrada</string>
+    <string name="action_agree">Confirmar</string>
+    <string name="action_like">M\'agrada</string>
     <string name="message_add_reaction">Afegir reacció</string>
     <string name="message_view_reaction">Veure reaccions</string>
     <string name="reactions">Reaccions</string>
@@ -1593,7 +1513,7 @@
     <string name="call_notification_hangup">Penja</string>
     <string name="call_notification_reject">Rebutja</string>
     <string name="call_notification_answer">Accepta</string>
-    <string name="decline">Rebutja</string>
+    <string name="action_decline">Rebutja</string>
     <string name="failed_to_remove_widget">No s\'ha pogut eliminar el giny</string>
     <string name="failed_to_add_widget">No s\'ha pogut afegir el giny</string>
     <string name="cannot_call_yourself_with_invite">No pots iniciar una trucada amb tu mateix, espera que els participants acceptin la invitació</string>
@@ -1606,19 +1526,19 @@
     <string name="no_permissions_to_start_webrtc_call">No tens permís per iniciar una trucada en aquesta sala</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">No tens permís per iniciar una conferència</string>
     <string name="no_permissions_to_start_conf_call">No tens permís per iniciar una videoconferència en aquesta sala</string>
-    <string name="reset">Reinicia</string>
-    <string name="dismiss">Omet</string>
-    <string name="pause_video">Atura</string>
-    <string name="disconnect">Desconnecta</string>
-    <string name="revoke">Revoca</string>
+    <string name="action_reset">Reinicia</string>
+    <string name="action_dismiss">Omet</string>
+    <string name="action_pause">Atura</string>
+    <string name="action_disconnect">Desconnecta</string>
+    <string name="action_revoke">Revoca</string>
     <string name="none">Cap</string>
     <string name="active_call_with_duration">Trucada activa (%s)</string>
     <string name="settings_call_show_confirmation_dialog_summary">Demana confirmació abans d\'iniciar una trucada</string>
     <string name="settings_call_show_confirmation_dialog_title">Evita trucada accidental</string>
     <string name="bug_report_error_too_short">La descripció és massa curta</string>
     <string name="send_bug_report_include_key_share_history">Envia l\'historial de sol·licituds de compartició de claus</string>
-    <string name="review">Revisa</string>
-    <string name="play_video">Reprodueix</string>
+    <string name="action_review">Revisa</string>
+    <string name="action_play">Reprodueix</string>
     <string name="call_format_turn_hd_on">Activa l\'HD</string>
     <string name="call_format_turn_hd_off">Desactiva l\'HD</string>
     <string name="call_camera_back">Posterior</string>
@@ -2025,7 +1945,7 @@
     <string name="a11y_open_chat">Obre el xat</string>
     <string name="a11y_mute_microphone">Silencia el micròfon</string>
     <string name="template_settings_security_pin_code_use_biometrics_summary_off">El codi PIN és l\'única manera de desbloquejar ${app_name}.</string>
-    <string name="or_other_mx_capabale_client">o un altre client Matrix compatible amb la signatura creuada</string>
+    <string name="or_other_mx_capable_client">o un altre client Matrix compatible amb la signatura creuada</string>
     <string name="encryption_information_dg_xsigning_disabled">La signatura creuada no està activada</string>
     <string name="encryption_information_dg_xsigning_not_trusted">La signatura creuada està activada
 \nClaus no fiables</string>
@@ -2252,15 +2172,6 @@
     <string name="verification_use_passphrase">Si no pots accedir a una sessió existent</string>
     <string name="verification_cannot_access_other_session">Utilitza una frase de recuperació o una clau</string>
     <string name="command_description_poll">Crea una votació simple</string>
-    <string name="poll_item_selected_aria">Opció seleccionada</string>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d vot - Resultat final</item>
-        <item quantity="other">%d vots - Resultat final</item>
-    </plurals>
-    <plurals name="poll_info">
-        <item quantity="one">%d vot</item>
-        <item quantity="other">%d vots</item>
-    </plurals>
     <string name="delete_account_data_warning">Vols eliminar les dades del compte de tipus %1$s\?
 \n
 \nVés en compte, pot ser que provoqui comportaments inesperats.</string>
@@ -2522,7 +2433,6 @@
     <string name="verification_request_waiting">Esperant…</string>
     <string name="sent_verification_conclusion">Conclusió de la verificació</string>
     <string name="sent_a_reaction">Ha reaccionat amb: %s</string>
-    <string name="sent_a_bot_buttons">Botons de bot</string>
     <string name="sent_a_poll">Votació</string>
     <string name="send_a_sticker">Adhesiu</string>
     <string name="sent_an_image">Imatge.</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index c7eb611e1d..22a566e2ca 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -40,7 +40,7 @@
     <string name="notice_room_third_party_invite">%1$s do této místnosti pozvali %2$s</string>
     <string name="notice_room_third_party_registered_invite">%1$s přijali pozvání pro %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Nelze dešifrovat: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Odesílatelovo zařízení nám neposlalo klíče pro tuto zprávu.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Odesílatelovo zařízení nám neposlalo klíče pro tuto zprávu.</string>
     <string name="could_not_redact">Nelze vymazat</string>
     <string name="unable_to_send_message">Zprávu nelze odeslat</string>
     <string name="message_failed_to_upload">Obrázek nelze nahrát</string>
@@ -280,18 +280,18 @@
     <string name="title_activity_room">Místnost</string>
     <string name="title_activity_settings">Nastavení</string>
     <string name="ok">OK</string>
-    <string name="save">Uložit</string>
+    <string name="action_save">Uložit</string>
     <string name="loading">Načítám…</string>
-    <string name="cancel">Zrušit</string>
-    <string name="send">Odeslat</string>
-    <string name="leave">Opustit</string>
-    <string name="share">Sdílet</string>
-    <string name="forward">Předat</string>
+    <string name="action_cancel">Zrušit</string>
+    <string name="action_send">Odeslat</string>
+    <string name="action_leave">Opustit</string>
+    <string name="action_share">Sdílet</string>
+    <string name="action_forward">Předat</string>
     <string name="view_source">Zobrazit zdroj</string>
-    <string name="delete">Odstranit</string>
-    <string name="rename">Přejmenovat</string>
+    <string name="action_delete">Odstranit</string>
+    <string name="action_rename">Přejmenovat</string>
     <string name="or">nebo</string>
-    <string name="invite">Pozvat</string>
+    <string name="action_invite">Pozvat</string>
     <string name="offline">Offline</string>
     <string name="forget_room">Zapomenout místnost</string>
     <string name="notification_sync_in_progress">Probíhá synchronizace…</string>
@@ -302,9 +302,9 @@
     <string name="title_activity_historical">Historický</string>
     <string name="title_activity_group_details">Podrobnosti o komunitě</string>
     <string name="notification_listening_for_events">Naslouchám událostem</string>
-    <string name="resend">Poslat znovu</string>
-    <string name="redact">Odstranit</string>
-    <string name="quote">Citovat</string>
+    <string name="action_resend">Poslat znovu</string>
+    <string name="action_redact">Odstranit</string>
+    <string name="action_quote">Citovat</string>
     <string name="later">Později</string>
     <string name="permalink">Trvalý odkaz</string>
     <string name="view_decrypted_source">Zobrazit dešifrovaný zdroj</string>
@@ -333,7 +333,7 @@
     <string name="action_open">Otevřít</string>
     <string name="action_close">Zavřít</string>
     <string name="copied_to_clipboard">Zkopírovat do schránky</string>
-    <string name="disable">Vyřadit</string>
+    <string name="action_disable">Vyřadit</string>
     <string name="dialog_title_confirmation">Potvrzení</string>
     <string name="dialog_title_warning">Varování</string>
     <string name="bottom_action_home">Úvod</string>
@@ -452,12 +452,12 @@
     <string name="login_error_user_in_use">Toto uživatelské jméno je již použito</string>
     <string name="title_activity_choose_sticker">Odeslat nálepku</string>
     <string name="dialog_title_third_party_licences">Licenční smlouvy třetích stran</string>
-    <string name="download">Stáhnout</string>
-    <string name="speak">Hovořit</string>
-    <string name="clear">Vymazat</string>
+    <string name="action_download">Stáhnout</string>
+    <string name="action_speak">Hovořit</string>
+    <string name="action_clear">Vymazat</string>
     <string name="missing_permissions_error">Z důvodu chybějících práv není tato akce možná.</string>
     <string name="call_anyway">Přesto volat</string>
-    <string name="accept">Přijmout</string>
+    <string name="action_accept">Přijmout</string>
     <string name="dialog_title_error">Chyba</string>
     <string name="system_alerts_header">Systémová upozornění</string>
     <string name="send_bug_report_description">Prosím, popište chybu. Co jste provedli\? Jaké bylo očekávané chování\? Co se ve skutečnosti stalo\?</string>
@@ -537,16 +537,16 @@
     <string name="yes">ANO</string>
     <string name="no">NE</string>
     <string name="_continue">Pokračovat</string>
-    <string name="remove">Odstranit</string>
-    <string name="join">Vstoupit</string>
-    <string name="preview">Náhled</string>
+    <string name="action_remove">Odstranit</string>
+    <string name="action_join">Vstoupit</string>
+    <string name="action_preview">Náhled</string>
     <string name="room_preview_invitation_format">Byli jste pozváni od %s ke vstupu do místnosti</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Žádost odeslána</string>
     <string name="template_e2e_re_request_encryption_key_dialog_content">Prosím, spusťte ${app_name} na jiném zařízení, které může dešifrovat zprávu, aby poslalo klíče této relaci.</string>
     <string name="read_receipts_list">Seznam doručenek</string>
     <string name="groups_list">Seznam skupin</string>
     <string name="permissions_action_not_performed_missing_permissions">Omlouváme se, ale akce nebyla provedena z důvodu chybějících oprávnění</string>
-    <string name="reject">Odmítnout</string>
+    <string name="action_reject">Odmítnout</string>
     <string name="list_members">Zobrazit členy</string>
     <string name="open_chat_header">Otevřít záhlaví</string>
     <string name="room_sync_in_progress">Synchronizuji…</string>
@@ -673,10 +673,10 @@
     <string name="are_you_sure">Opravdu\?</string>
     <string name="backup">Záloha</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Pokud nezazálohujete své klíče před odhlášením, přijdete o přístup ke svým zašifrovaným zprávám.</string>
-    <string name="stay">Zůstat</string>
-    <string name="skip">Přeskočit</string>
+    <string name="action_stay">Zůstat</string>
+    <string name="action_skip">Přeskočit</string>
     <string name="done">Hotovo</string>
-    <string name="abort">Zrušit</string>
+    <string name="action_abort">Zrušit</string>
     <string name="action_sign_out_confirmation_simple">Opravdu se chcete odhlásit\?</string>
     <string name="video_call_in_progress">Video hovor probíhá…</string>
     <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} potřebuje oprávnění pro přístup k Vaší kameře a mikrofonu pro uskutečnění video hovoru.
@@ -714,17 +714,6 @@
     <string name="tab_title_search_messages">ZPRÁVY</string>
     <string name="tab_title_search_people">LIDÉ</string>
     <string name="tab_title_search_files">SOUBORY</string>
-    <string name="room_recents_join">VSTOUPIT</string>
-    <string name="room_recents_directory">ADRESÁŘ</string>
-    <string name="room_recents_favourites">OBLÍBENÉ</string>
-    <string name="room_recents_conversations">MÍSTNOSTI</string>
-    <string name="room_recents_low_priority">NÍZKÁ PRIORITA</string>
-    <string name="room_recents_invites">POZVÁNKY</string>
-    <string name="room_recents_start_chat">Začít konverzaci</string>
-    <string name="room_recents_create_room">Vytvořit místnost</string>
-    <string name="room_recents_join_room">Vstoupit do místnosti</string>
-    <string name="room_recents_join_room_title">Vstoupit do místnosti</string>
-    <string name="room_recents_join_room_prompt">Zadejte ID nebo přezdívku místnosti</string>
     <string name="directory_search_results_title">Procházet adresář</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d místnost</item>
@@ -767,13 +756,13 @@
     <string name="settings_notification_by_event">Důležitost oznámení na základě události</string>
     <string name="notification_sync_init">Spouštím služby</string>
     <string name="title_activity_verify_device">Ověřit relaci</string>
-    <string name="disconnect">Odpojit</string>
-    <string name="ignore">Ignorovat</string>
-    <string name="decline">Odmítnout</string>
+    <string name="action_disconnect">Odpojit</string>
+    <string name="action_ignore">Ignorovat</string>
+    <string name="action_decline">Odmítnout</string>
     <string name="action_mark_room_read">Označit za přečtené</string>
     <string name="none">Žádný</string>
-    <string name="revoke">Zrušit</string>
-    <string name="review">Přehled</string>
+    <string name="action_revoke">Zrušit</string>
+    <string name="action_review">Přehled</string>
     <string name="people_no_identity_server">Není konfigurován žádný ověřovací server.</string>
     <string name="call_failed_no_ice_title">Volání se nezdařilo kvůli chybné konfiguraci serveru</string>
     <string name="call_failed_no_ice_description">Prosím, požádejte administrátora domovského serveru (%1$s) o konfiguraci TURN serveru, aby hovory fungovaly spolehlivě.
@@ -1542,8 +1531,8 @@
     <string name="room_list_rooms_empty_title">Místnosti</string>
     <string name="room_list_rooms_empty_body">Tady budou zobrazeny Vaše místnosti. K vyhledání existujících místností nebo založení nové klepněte na + vpravo dole.</string>
     <string name="title_activity_emoji_reaction_picker">Reakce</string>
-    <string name="reactions_agree">Souhlasit</string>
-    <string name="reactions_like">Líbí se</string>
+    <string name="action_agree">Souhlasit</string>
+    <string name="action_like">Líbí se</string>
     <string name="message_add_reaction">Přidat reakci</string>
     <string name="message_view_reaction">Ukázat reakce</string>
     <string name="reactions">Reakce</string>
@@ -1996,17 +1985,6 @@
     <string name="no_connectivity_to_the_server_indicator">Spojení k serveru bylo ztraceno</string>
     <string name="settings_dev_tools">Vývojářské nástroje</string>
     <string name="settings_account_data">Údaje účtu</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d hlas</item>
-        <item quantity="few">%d hlasy</item>
-        <item quantity="other">%d hlasů</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d hlas - Konečné výsledky</item>
-        <item quantity="few">%d hlasy - Konečné výsledky</item>
-        <item quantity="other">%d hlasů - Konečné výsledky</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Zvolená možnost</string>
     <string name="command_description_poll">Vytvoří jednoduché hlasování</string>
     <string name="verification_cannot_access_other_session">Použijte metodu obnovy</string>
     <string name="verification_use_passphrase">Pokud se nemůžete dostat do existující relace</string>
@@ -2155,7 +2133,7 @@
 \n${app_name} Desktop</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">nebo jiný Matrix klient schopný křížového podepisování</string>
+    <string name="or_other_mx_capable_client">nebo jiný Matrix klient schopný křížového podepisování</string>
     <string name="template_use_latest_app">Použijte na svých zařízeních nejnovější ${app_name}:</string>
     <string name="command_description_discard_session">Vynutí zahození probíhající skupinové relace v šifrované místnosti</string>
     <string name="command_description_discard_session_not_handled">Podporováno jen v šifrovaných místnostech</string>
@@ -2210,9 +2188,9 @@
     <string name="identity_server_set_alternative_notice">Jinak můžete zadat URL jakéhokoli jiného serveru identit</string>
     <string name="identity_server_set_alternative_notice_no_default">Zadejte URL serveru identit</string>
     <string name="identity_server_set_alternative_submit">Odeslat</string>
-    <string name="play_video">Přehrát</string>
-    <string name="pause_video">Pozastavit</string>
-    <string name="dismiss">Odmítnout</string>
+    <string name="action_play">Přehrát</string>
+    <string name="action_pause">Pozastavit</string>
+    <string name="action_dismiss">Odmítnout</string>
     <string name="no_permissions_to_start_conf_call">Nemáte povolení zahájit konferenční hovor v této místnosti</string>
     <string name="conference_call_in_progress">Konference již probíhá!</string>
     <string name="video_meeting">Zahájit video schůzku</string>
@@ -2417,7 +2395,6 @@
     <string name="settings_show_room_member_state_events">Zobrazit stavové události účastníků v místnosti</string>
     <string name="settings_show_room_member_state_events_summary">Zahrnuje události pozvat/vstoupit/opustit/vykopnout/vykázat a změny avatara/veřejného jména.</string>
     <string name="sent_a_poll">Hlasování</string>
-    <string name="sent_a_bot_buttons">Tlačítka botů</string>
     <string name="sent_a_reaction">Reagoval(a): %s</string>
     <string name="sent_verification_conclusion">Výsledek ověření</string>
     <string name="universal_link_malformed">Odkaz byl chybně zformován</string>
@@ -2490,7 +2467,7 @@
     <string name="search_banned_user_hint">Filtrovat vykázané uživatele</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Nemáte oprávnění k zahájení hovoru</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Nemáte oprávnění k zahájení konferenčního hovoru</string>
-    <string name="reset">Resetovat</string>
+    <string name="action_reset">Resetovat</string>
     <string name="matrix_to_card_title">Odkaz na Matrix</string>
     <string name="qr_code_not_scanned">QR kód nebyl oskenován!</string>
     <string name="invalid_qr_code_uri">Neplatný QR kód (neplatné URI)!</string>
@@ -2759,7 +2736,7 @@
     <string name="invite_to_space_with_name_desc">Budou moci %s prozkoumat</string>
     <string name="invite_to_space_with_name">Pozvat do %s</string>
     <string name="invite_by_link">Sdílet odkaz</string>
-    <string name="invite_by_mxid">Pozvat podle uživatelského jména</string>
+    <string name="invite_by_username">Pozvat podle uživatelského jména</string>
     <string name="invite_by_email">Pozvat emailem</string>
     <string name="invite_people_to_your_space_desc">V tomto okamžiku jste to jen Vy. %s bude s dalšími lepší.</string>
     <string name="invite_people_menu">Pozvat lidi</string>
@@ -3015,7 +2992,7 @@
     <string name="discovery_invite">Pozvání e-mailem, vyhledávání kontaktů a další…</string>
     <string name="finish_setting_up_discovery">Dokončit nastavení objevování.</string>
     <string name="create_space_identity_server_info_none">V současné době nepoužíváte server identit. Chcete-li pozvat kolegy a být pro ně zjistitelní, nakonfigurujte jej níže.</string>
-    <string name="invite_by_mxid_or_mail">Pozvat pomocí uživatelského jména nebo e-mailu</string>
+    <string name="invite_by_username_or_mail">Pozvat pomocí uživatelského jména nebo e-mailu</string>
     <string name="create_spaces_invite_public_header_desc">Zajistěte, aby měli do společnosti %s přístup ti správní lidé. Další můžete pozvat později.</string>
     <string name="create_spaces_invite_public_header">Kdo jsou vaši kolegové\?</string>
     <string name="command_description_add_to_space">Přidat do daného prostoru</string>
diff --git a/vector/src/main/res/values-da/strings.xml b/vector/src/main/res/values-da/strings.xml
index 077bf0efda..57d8e5c547 100644
--- a/vector/src/main/res/values-da/strings.xml
+++ b/vector/src/main/res/values-da/strings.xml
@@ -39,7 +39,7 @@
     <string name="notice_room_third_party_invite">%1$s inviterede %2$s til rummet</string>
     <string name="notice_room_third_party_registered_invite">%1$s accepterede invitationen til %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Kunne ikke dekryptere: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Afsenderens enhed har ikke sendt os nøglerne til denne besked.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Afsenderens enhed har ikke sendt os nøglerne til denne besked.</string>
     <string name="could_not_redact">Kunne ikke hemmeligholde</string>
     <string name="unable_to_send_message">Kunne ikke sende besked</string>
     <string name="message_failed_to_upload">Kunne ikke uploade billede</string>
@@ -68,21 +68,21 @@
     <string name="title_activity_member_details">Medlemsdetaljer</string>
     <string name="title_activity_historical">Historisk</string>
     <string name="ok">OK</string>
-    <string name="cancel">Afbryd</string>
-    <string name="save">Gem</string>
-    <string name="leave">Forlad</string>
-    <string name="send">Send</string>
-    <string name="resend">Send igen</string>
-    <string name="redact">Tilbagehold</string>
-    <string name="quote">Citér</string>
-    <string name="share">Del</string>
+    <string name="action_cancel">Afbryd</string>
+    <string name="action_save">Gem</string>
+    <string name="action_leave">Forlad</string>
+    <string name="action_send">Send</string>
+    <string name="action_resend">Send igen</string>
+    <string name="action_redact">Tilbagehold</string>
+    <string name="action_quote">Citér</string>
+    <string name="action_share">Del</string>
     <string name="later">Senere</string>
-    <string name="forward">Videresend</string>
+    <string name="action_forward">Videresend</string>
     <string name="permalink">Permanent link</string>
     <string name="view_source">Se Kilde</string>
     <string name="view_decrypted_source">Se Dekrypteret Kilde</string>
-    <string name="delete">Slet</string>
-    <string name="rename">Omdøb</string>
+    <string name="action_delete">Slet</string>
+    <string name="action_rename">Omdøb</string>
     <string name="report_content">Rapporter indhold</string>
     <string name="active_call">Aktivt opkald</string>
     <string name="ongoing_conference_call">Igangværende konferenceopkald.\nForbind med %1$s eller %2$s</string>
@@ -96,7 +96,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Konferenceopkald er ikke understøttede i krypterede rum</string>
     <string name="send_anyway">Send Alligevel</string>
     <string name="or">eller</string>
-    <string name="invite">Invitér</string>
+    <string name="action_invite">Invitér</string>
     <string name="offline">Offline</string>
     <string name="action_sign_out">Log ud</string>
     <string name="action_voice_call">Stemmeopkald</string>
@@ -108,7 +108,7 @@
     <string name="action_open">Åben</string>
     <string name="action_close">Luk</string>
     <string name="copied_to_clipboard">Kopieret til udklipsholder</string>
-    <string name="disable">Slå fra</string>
+    <string name="action_disable">Slå fra</string>
     <string name="dialog_title_confirmation">Bekræftigelse</string>
     <string name="dialog_title_warning">Advarsel</string>
     <string name="bottom_action_home">Hjem</string>
@@ -282,10 +282,10 @@ Vil du give ${app_name} adgang til dine kontakter?</string>
     <string name="yes">JA</string>
     <string name="no">NEJ</string>
     <string name="_continue">Fortsæt</string>
-    <string name="remove">Fjern</string>
-    <string name="join">Forbind</string>
-    <string name="preview">Forhåndsvisning</string>
-    <string name="reject">Afvis</string>
+    <string name="action_remove">Fjern</string>
+    <string name="action_join">Forbind</string>
+    <string name="action_preview">Forhåndsvisning</string>
+    <string name="action_reject">Afvis</string>
     <string name="room_jump_to_first_unread">Spring til første ulæste besked.</string>
     <string name="room_preview_invitation_format">Du er blevet inviteret til at forbinde til dette rum af %s</string>
     <string name="room_preview_unlinked_email_warning">Denne invitation blev sendt til %s som ikke er tilknyttet denne konto.
@@ -407,14 +407,6 @@ Er du sikker?</string>
     <string name="tab_title_search_messages">MEDDELELSER</string>
     <string name="tab_title_search_people">FOLK</string>
     <string name="tab_title_search_files">FILER</string>
-    <string name="room_recents_directory">OVERSIGT</string>
-    <string name="room_recents_favourites">FAVORITTER</string>
-    <string name="room_recents_conversations">RUM</string>
-    <string name="room_recents_low_priority">LAV PRIORITET</string>
-    <string name="room_recents_invites">INVITATIONER</string>
-    <string name="room_recents_start_chat">Start chat</string>
-    <string name="room_recents_create_room">Opret rum</string>
-    <string name="room_recents_join_room_prompt">Indtast ID eller alias på et rum</string>
     <string name="directory_search_results_title">Gennemse oversigt</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">1 rum</item>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 6422e2357f..c1c7165ded 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -39,24 +39,16 @@
     <string name="notice_room_third_party_invite">%1$s hat eine Einladung an %2$s gesendet</string>
     <string name="notice_room_third_party_registered_invite">%1$s hat die Einladung in %2$s akzeptiert</string>
     <string name="notice_crypto_unable_to_decrypt">** Nicht entschlüsselbar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Das absendende Gerät hat uns keine Schlüssel für diese Nachricht übermittelt.</string>
-    <!-- Room Screen -->
+    <string name="notice_crypto_error_unknown_inbound_session_id">Das absendende Gerät hat uns keine Schlüssel für diese Nachricht übermittelt.</string>
     <string name="could_not_redact">Entfernen nicht möglich</string>
     <string name="unable_to_send_message">Nachricht kann nicht gesendet werden</string>
     <string name="message_failed_to_upload">Bild konnte nicht hochgeladen werden</string>
-    <!-- general errors -->
     <string name="network_error">Netzwerk-Fehler</string>
     <string name="matrix_error">Matrix-Fehler</string>
-    <!-- Home Screen -->
-    <!-- Last seen time -->
-    <!-- call events -->
-    <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Es ist aktuell nicht möglich, einen leeren Raum erneut zu betreten.</string>
-    <!-- medium friendly name -->
     <string name="medium_email">E-Mail-Adresse</string>
     <string name="medium_phone_number">Telefonnummer</string>
     <string name="summary_user_sent_sticker">%1$s hat einen Sticker gesendet.</string>
-    <!-- Room display name -->
     <string name="room_displayname_invite_from">Einladung von %s</string>
     <string name="room_displayname_room_invite">Raumeinladung</string>
     <string name="room_displayname_two_members">%1$s und %2$s</string>
@@ -271,7 +263,6 @@
     <string name="notice_widget_jitsi_removed_by_you">Du hast eine Videokonferenz beendet</string>
     <string name="notice_widget_jitsi_added_by_you">Du hast eine Videokonferenz gestartet</string>
     <string name="notice_widget_jitsi_added">Videokonferenz von %1$s gestartet</string>
-    <!-- titles -->
     <string name="title_activity_home">Nachrichten</string>
     <string name="title_activity_room">"Raum</string>
     <string name="title_activity_settings">Einstellungen</string>
@@ -280,23 +271,22 @@
     <string name="call_notification_answer">Akzeptiere</string>
     <string name="call_notification_reject">Ablehnen</string>
     <string name="call_notification_hangup">Anruf beenden</string>
-    <!-- button names -->
     <string name="ok">Ok</string>
-    <string name="cancel">Abbrechen</string>
-    <string name="save">Speichern</string>
-    <string name="leave">Verlassen</string>
-    <string name="send">Senden</string>
-    <string name="resend">Erneut senden</string>
-    <string name="redact">Entfernen</string>
-    <string name="quote">Zitieren</string>
-    <string name="share">Teilen</string>
+    <string name="action_cancel">Abbrechen</string>
+    <string name="action_save">Speichern</string>
+    <string name="action_leave">Verlassen</string>
+    <string name="action_send">Senden</string>
+    <string name="action_resend">Erneut senden</string>
+    <string name="action_redact">Entfernen</string>
+    <string name="action_quote">Zitieren</string>
+    <string name="action_share">Teilen</string>
     <string name="later">Später</string>
-    <string name="forward">Weiterleiten</string>
+    <string name="action_forward">Weiterleiten</string>
     <string name="permalink">Permalink</string>
     <string name="view_source">Rohdaten anzeigen</string>
     <string name="view_decrypted_source">Entschlüsselte Rohdaten anzeigen</string>
-    <string name="delete">Löschen</string>
-    <string name="rename">Umbenennen</string>
+    <string name="action_delete">Löschen</string>
+    <string name="action_rename">Umbenennen</string>
     <string name="report_content">Inhalt melden</string>
     <string name="active_call">Aktives Gespräch</string>
     <string name="ongoing_conference_call">Laufendes Konferenzgespräch
@@ -311,8 +301,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Konferenzgespräche in verschlüsselten Räumen werden nicht unterstützt</string>
     <string name="send_anyway">Trotzdem senden</string>
     <string name="or">oder</string>
-    <string name="invite">Einladen</string>
-    <!-- actions -->
+    <string name="action_invite">Einladen</string>
     <string name="action_sign_out">Abmelden</string>
     <string name="action_voice_call">Sprachanruf</string>
     <string name="action_video_call">Videoanruf</string>
@@ -323,31 +312,25 @@
     <string name="action_open">Öffnen</string>
     <string name="action_close">Schließen</string>
     <string name="copied_to_clipboard">In Zwischenablage kopiert</string>
-    <string name="disable">Deaktivieren</string>
-    <!-- dialog titles -->
+    <string name="action_disable">Deaktivieren</string>
     <string name="dialog_title_confirmation">Bestätigung</string>
     <string name="dialog_title_warning">Warnung</string>
-    <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Home</string>
     <string name="bottom_action_favourites">Favoriten</string>
     <string name="bottom_action_people">Personen</string>
     <string name="bottom_action_rooms">Räume</string>
-    <!-- Home screen -->
     <string name="home_filter_placeholder_home">Raumnamen filtern</string>
     <string name="home_filter_placeholder_favorites">Favoriten filtern</string>
     <string name="home_filter_placeholder_people">Personen filtern</string>
     <string name="home_filter_placeholder_rooms">Raumnamen filtern</string>
-    <!-- Home fragment -->
     <string name="invitations_header">Einladungen</string>
     <string name="low_priority_header">Niedrige Priorität</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">Konversationen</string>
     <string name="local_address_book_header">Lokales Adressbuch</string>
     <string name="matrix_only_filter">Nur Matrix-Kontakte</string>
     <string name="no_conversation_placeholder">Keine Konversationen</string>
     <string name="template_no_contact_access_placeholder">${app_name} wurde nicht erlaubt, auf lokale Kontakte zuzugreifen</string>
     <string name="no_result_placeholder">Keine Ergebnisse</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">Räume</string>
     <string name="rooms_directory_header">Raumverzeichnis</string>
     <string name="no_room_placeholder">Keine Räume</string>
@@ -383,7 +366,6 @@
     <string name="start_video_call">Videoanruf starten</string>
     <string name="option_send_files">Dateien senden</string>
     <string name="option_take_photo_video">Foto oder Video aufnehmen</string>
-    <!-- Authentication -->
     <string name="auth_login">Anmelden</string>
     <string name="auth_register">Konto erstellen</string>
     <string name="auth_submit">Absenden</string>
@@ -429,7 +411,6 @@
     <string name="auth_reset_password_success_message">Dein Passwort wurde zurückgesetzt.
 \n
 \nDu wurdest aus allen Sitzungen abgemeldet und wirst keine Push-Benachrichtigungen mehr erhalten. Um die Push-Benachrichtigungen wieder zu aktivieren, musst du dich auf jedem Gerät erneut anmelden.</string>
-    <!-- Login Screen -->
     <string name="login_error_must_start_http">URL muss mit \'http[s]://\' beginnen</string>
     <string name="login_error_network_error">Login unmöglich: Netzwerkfehler</string>
     <string name="login_error_unable_login">Login unmöglich</string>
@@ -444,28 +425,20 @@
     <string name="login_error_limit_exceeded">Es wurden zu viele Anfragen gesendet</string>
     <string name="login_error_user_in_use">Dieser Benutzername wird bereits verwendet</string>
     <string name="login_error_login_email_not_yet">Der Link in der E-Mail wurde noch nicht geöffnet</string>
-    <!-- crypto warnings -->
-    <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lesebestätigungsliste</string>
-    <!-- accounts list Screen -->
-    <!-- image size selection -->
     <string name="compression_options">Sende als</string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Groß</string>
     <string name="compression_opt_list_medium">Mittel</string>
     <string name="compression_opt_list_small">Klein</string>
-    <!-- media upload / download messages -->
     <string name="attachment_cancel_download">Download abbrechen?</string>
     <string name="attachment_cancel_upload">Upload abbrechen?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm:%2$ds</string>
-    <!-- room creation dialog Screen -->
     <string name="yesterday">Gestern</string>
     <string name="today">Heute</string>
-    <!-- room info dialog Screen -->
     <string name="room_info_room_name">Raumname</string>
     <string name="room_info_room_topic">Raumthema</string>
-    <!-- call string -->
     <string name="call_connected">Anruf verbunden</string>
     <string name="call_connecting">Verbindungsaufbau…</string>
     <string name="call_ended">Anruf beendet</string>
@@ -478,10 +451,8 @@
     <string name="call_error_ice_failed">Medien-Verbindung fehlgeschlagen</string>
     <string name="call_error_camera_init_failed">Kann Kamera nicht initialisieren</string>
     <string name="call_error_answered_elsewhere">Anruf woanders entgegengenommen</string>
-    <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Foto oder Video aufnehmen</string>
     <string name="media_picker_cannot_record_video">Video kann nicht aufgenommen werden</string>
-    <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Information</string>
     <string name="template_permissions_rationale_msg_storage">${app_name} benötigt die Berechtigung, auf deine Fotos und Videos zugreifen zu können, um Anhänge zu senden und zu speichern.\n\nBitte erlaube den Zugriff im nächsten Dialog, um Dateien von deinem Gerät zu versenden.</string>
     <string name="template_permissions_rationale_msg_camera">${app_name} benötigt die Berechtigung, auf deine Kamera zugreifen zu können, um Bilder aufzunehmen und Video-Anrufe durchzuführen.</string>
@@ -500,31 +471,25 @@
 \n
 \nStimmst du der Nutzung deines Adressbuchs zu diesem Zweck zu\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Entschuldige. Die Aktion wurde aufgrund fehlender Berechtigungen nicht ausgeführt</string>
-    <!-- medias slider string -->
     <string name="media_slider_saved">Gespeichert</string>
     <string name="media_slider_saved_message">In Downloads speichern?</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
     <string name="_continue">Fortsetzen</string>
-    <!-- Actions -->
-    <string name="remove">Entfernen</string>
-    <string name="join">Betreten</string>
-    <string name="preview">Vorschau</string>
-    <string name="reject">Ablehnen</string>
-    <!-- Room -->
+    <string name="action_remove">Entfernen</string>
+    <string name="action_join">Betreten</string>
+    <string name="action_preview">Vorschau</string>
+    <string name="action_reject">Ablehnen</string>
     <string name="room_jump_to_first_unread">Zur ersten ungelesenen Nachricht</string>
-    <!-- Room Preview -->
     <string name="room_preview_invitation_format">Du wurdest von %s in diesen Raum eingeladen</string>
     <string name="room_preview_unlinked_email_warning">Diese Einladung wurde an %s gesendet, welche nicht mit diesem Konto verknüpft ist.
 \nDu kannst dich mit einem anderen Konto anmelden oder diese E-Mail-Adresse zu diesem Konto hinzufügen.</string>
     <string name="room_preview_try_join_an_unknown_room">Du möchtest auf %s zugreifen. Möchtest du den Raum betreten, um an der Diskussion teilzunehmen?</string>
     <string name="room_preview_try_join_an_unknown_room_default">einen Raum</string>
     <string name="room_preview_room_interactions_disabled">Das ist die Vorschau des Raums. Interaktionen mit dem Raum sind deaktiviert.</string>
-    <!-- Chat creation -->
     <string name="room_creation_title">Neuer Chat</string>
     <string name="room_creation_add_member">Mitglied hinzufügen</string>
     <string name="room_title_one_member">1 Mitglied</string>
-    <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Raum verlassen</string>
     <string name="room_participants_leave_prompt_msg">Raum wirklich verlassen\?</string>
     <string name="room_participants_remove_prompt_msg">%s wirklich aus diesem Chat entfernen möchtest\?</string>
@@ -552,14 +517,12 @@
     <string name="room_participants_power_level_prompt">Du wirst diese Änderung nicht rückgängig machen können, da die Person dieselbe Berechtigungsstufe wie du erhalten wird.
 \nBist du sicher\?</string>
     <string name="room_participants_invite_prompt_msg">"Bist du sicher, dass du %s in diesen Chat einladen willst?"</string>
-    <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Mit ID einladen</u></string>
     <string name="people_search_local_contacts">LOKALE KONTAKTE (%d)</string>
     <string name="people_search_filter_text">Nur Matrix-Benutzer</string>
     <string name="people_search_invite_by_id_dialog_title">Benutzer per ID einladen</string>
     <string name="people_search_invite_by_id_dialog_description">Bitte gib eine oder mehrere E-Mail-Adressen oder eine Matrix-ID ein</string>
     <string name="people_search_invite_by_id_dialog_hint">E-Mail oder Matrix-ID</string>
-    <!--  Chat -->
     <string name="room_menu_search">Suchen</string>
     <string name="room_one_user_is_typing">%s schreibt…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s schreiben…</string>
@@ -575,7 +538,6 @@
     <string name="room_delete_unsent_messages">Nicht gesendete Nachrichten löschen</string>
     <string name="room_message_file_not_found">Datei nicht gefunden</string>
     <string name="room_do_not_have_permission_to_post">Du bist nicht berechtigt, in diesen Raum zu schreiben.</string>
-    <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Vertrauen</string>
     <string name="ssl_do_not_trust">Nicht vertrauen</string>
     <string name="ssl_logout_account">Abmelden</string>
@@ -587,7 +549,6 @@
     <string name="ssl_unexpected_existing_expl">Das Zertifikat unterscheidet sich von dem Zertifikat, dem dein Gerät ursprünglich vertraut hat. Dies ist SEHR UNGEWÖHNLICH. Es wird empfohlen, dass du dieses neue Zertifikat NICHT AKZEPTIERST.</string>
     <string name="ssl_expected_existing_expl">Das Zertifikat hat sich von einem ursprünglich vertrauenswürdigem Zertifikat in ein nicht vertrauenswürdiges Zertifikat geändert. Eventuell wurde das Zertifikat des Servers erneuert. Bitte erkundige dich beim Server-Administrator, welcher Fingerprint als vertrauenswürdig gilt.</string>
     <string name="ssl_only_accept">Akzeptiere das Zertifikat nur dann, wenn der Server-Administrator einen Fingerprint veröffentlicht hat, der mit dem obigen übereinstimmt.</string>
-    <!-- Room Details -->
     <string name="room_details_title">Raumdetails</string>
     <string name="room_details_people">Personen</string>
     <string name="room_details_files">Dateien</string>
@@ -595,14 +556,12 @@
     <string name="malformed_id">Ungültige ID. Eine E-Mail-Adresse oder eine Matrix-ID (\'@localpart:domain\') ist erforderlich</string>
     <string name="room_details_people_invited_group_name">EINGELADEN</string>
     <string name="room_details_people_present_group_name">TEILNEHMER</string>
-    <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Grund für das Melden dieses Inhalts</string>
     <string name="room_event_action_report_prompt_ignore_user">Möchtest du alle Nachrichten dieses Nutzers verbergen\?
 \n
 \nBeachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string>
     <string name="room_event_action_cancel_upload">Hochladen abbrechen</string>
     <string name="room_event_action_cancel_download">Herunterladen abbrechen</string>
-    <!-- Search -->
     <string name="search_hint">Suchen</string>
     <string name="search_members_hint">Raummitglieder filtern</string>
     <string name="search_no_results">Keine Suchergebnisse</string>
@@ -610,28 +569,13 @@
     <string name="tab_title_search_messages">NACHRICHTEN</string>
     <string name="tab_title_search_people">PERSONEN</string>
     <string name="tab_title_search_files">DATEIEN</string>
-    <!-- Room recents -->
-    <string name="room_recents_join">BEITRETEN</string>
-    <string name="room_recents_directory">VERZEICHNIS</string>
-    <string name="room_recents_favourites">FAVORITEN</string>
-    <string name="room_recents_conversations">RÄUME</string>
-    <string name="room_recents_low_priority">NIEDRIGE PRIORITÄT</string>
-    <string name="room_recents_invites">EINLADUNGEN</string>
-    <string name="room_recents_start_chat">Gespräch beginnen</string>
-    <string name="room_recents_create_room">Raum erstellen</string>
-    <string name="room_recents_join_room">Raum beitreten</string>
-    <string name="room_recents_join_room_title">Einem Raum beitreten</string>
-    <string name="room_recents_join_room_prompt">Raum-ID oder Raum-Alias eingeben</string>
-    <!-- Directory -->
     <string name="directory_search_results_title">Verzeichnis durchsuchen</string>
     <string name="directory_searching_title">Verzeichnis wird durchsucht…</string>
-    <!-- home room settings -->
     <string name="room_settings_favourite">Favorit</string>
     <string name="room_settings_de_prioritize">Niedrige Priorität</string>
     <string name="room_settings_direct_chat">Direkter Chat</string>
     <string name="room_settings_leave_conversation">Konversation verlassen</string>
     <string name="room_settings_forget">Vergessen</string>
-    <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Nachrichten</string>
     <string name="room_sliding_menu_settings">Einstellungen</string>
     <string name="room_sliding_menu_version">Version</string>
@@ -639,7 +583,6 @@
     <string name="room_sliding_menu_third_party_notices">Nutzungshinweise von Drittanbietern</string>
     <string name="room_sliding_menu_copyright">Urheberrechtserklärung</string>
     <string name="room_sliding_menu_privacy_policy">Datenschutzerklärung</string>
-    <!-- Vector Settings -->
     <string name="settings_profile_picture">Profilbild</string>
     <string name="settings_display_name">Anzeigename</string>
     <string name="settings_email_address">E-Mail-Adresse</string>
@@ -667,7 +610,6 @@
     <string name="settings_copyright">Urheberrechtserklärung</string>
     <string name="settings_privacy_policy">Datenschutzerklärung</string>
     <string name="settings_clear_cache">Cache leeren</string>
-    <!--string name="settings_room_privacy_label">Privacy</string-->
     <string name="settings_user_settings">Nutzereinstellungen</string>
     <string name="settings_notifications">Benachrichtigungen</string>
     <string name="settings_ignored_users">Ignorierte Benutzer</string>
@@ -723,37 +665,29 @@
     <string name="settings_phone_number_verification_error_empty_code">Hier Aktivierungscode eintragen</string>
     <string name="settings_phone_number_verification_error">Fehler beim Verifizieren der Telefonnummer</string>
     <string name="settings_phone_number_code">Code</string>
-    <!-- Room Settings -->
-    <!-- room global settings-->
     <string name="room_settings_room_photo">Raumbild</string>
     <string name="room_settings_room_name">Raumname</string>
     <string name="room_settings_topic">Thema</string>
     <string name="room_settings_room_tag">Raummarkierung</string>
     <string name="room_settings_tag_pref_dialog_title">Markiert als:</string>
-    <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Favorit</string>
     <string name="room_settings_tag_pref_entry_low_priority">Niedrige Priorität</string>
     <string name="room_settings_tag_pref_entry_none">Keine</string>
-    <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Zugriff und Sichtbarkeit</string>
     <string name="room_settings_directory_visibility">Diesen Raum im Raumverzeichnis anzeigen</string>
     <string name="room_settings_room_access_rules_pref_title">Raumzugriff</string>
     <string name="room_settings_room_read_history_rules_pref_title">Lesbarkeit des Chatverlaufs</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Wer kann den Chatverlauf lesen?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Wer kann auf diesen Raum zugreifen?</string>
-    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Alle</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Nur Mitglieder</string>
     <string name="room_settings_read_history_entry_members_only_invited">Nur Mitglieder (ab Einladung)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Nur Mitglieder (ab Beitreten)</string>
-    <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Um einen Link zu einem Raum erstellen zu können, muss dieser eine Adresse haben.</string>
     <string name="room_settings_room_access_entry_only_invited">Nur eingeladene Personen</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Alle, die den Raumlink kennen (ausgenommen Gäste)</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Alle, die den Raumlink kennen (auch Gäste)</string>
-    <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Verbannte Benutzer</string>
-    <!-- advanced -->
     <string name="room_settings_category_advanced_title">Erweitert</string>
     <string name="room_settings_room_internal_id">Interne ID dieses Raumes</string>
     <string name="room_settings_addresses_pref_title">Adressen</string>
@@ -764,7 +698,6 @@
     <string name="room_settings_labs_end_to_end_warnings">Du musst dich abmelden, um die Verschlüsselung aktivieren zu können.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Nur für verifizierte Sitzungen verschlüsseln</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Niemals verschlüsselte Nachrichten an unverifizierte Sitzungen in diesem Raum von dieser Sitzung senden.</string>
-    <!-- Raum settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Dieser Raum hat keine lokalen Adressen</string>
     <string name="room_settings_addresses_add_new_address">Neue Adresse (z. B. #foo:matrix.org)</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Ungültiges Adressformat</string>
@@ -778,11 +711,8 @@
     <string name="room_settings_addresses_e2e_enabled">Verschlüsselung ist in diesem Raum aktiviert.</string>
     <string name="room_settings_addresses_e2e_disabled">Verschlüsselung ist in diesem Raum deaktiviert.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Verschlüsselung aktivieren \n(Warnung: Kann nicht wieder deaktiviert werden!)</string>
-    <!-- Directory -->
     <string name="directory_title">Verzeichnis</string>
-    <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s versuchte einen bestimmten Punkt in diesem Chatverlauf zu laden, konnte ihn aber nicht finden.</string>
-    <!-- encryption dialog -->
     <string name="encryption_information_title">Ende-zu-Ende-Verschlüsselungs-Informationen</string>
     <string name="encryption_information_device_info">Ereignisinformation</string>
     <string name="encryption_information_user_id">Nutzer-ID</string>
@@ -826,21 +756,18 @@
     <string name="encryption_information_verify_device_warning">Vergleiche die folgenden Zeichen mit den Einstellungen in der Sitzung des anderen Nutzers und bestätige:</string>
     <string name="encryption_information_verify_device_warning2">Falls sie nicht übereinstimmen, wurde die Kommunikation vielleicht kompromittiert.</string>
     <string name="encryption_information_verify_key_match">Ich bestätige, dass die Schlüssel übereinstimmen</string>
-    <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Raum enthält unbekannte Sitzungen</string>
     <string name="unknown_devices_alert_message">Dieser Raum enthält unbekannte Sitzungen, die noch nicht verifiziert wurden.
 \nEs gibt also keine Garantie, dass diese Sitzung wirklich der angegebenen Person gehören.
 \nWir empfehlen, den Verifizierungsprozess für jedes Gerät zu durchlaufen, bevor du fortfährst. Du kannst die Nachricht aber auch ohne Verifizierung senden, wenn du das vorziehst. 
 \n
 \nUnbekannte Sitzungen:</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">Raumverzeichnis auswählen</string>
     <string name="directory_server_fail_to_retrieve_server">Der Server kann nicht verfügbar oder überlastet sein</string>
     <string name="directory_server_type_homeserver">Gib einen Home-Server ein, um seine öffentlichen Räume aufzulisten</string>
     <string name="directory_server_placeholder">Server-Name</string>
     <string name="directory_server_all_rooms_on_server">Alle Räume auf dem %s-Server</string>
     <string name="directory_server_native_rooms">Alle nativen %s-Räume</string>
-    <!-- historical -->
     <string name="historical_placeholder">Suche nach historischen</string>
     <string name="settings_user_interface">Bedienoberfläche</string>
     <string name="settings_interface_language">Sprache</string>
@@ -871,7 +798,6 @@
     <string name="widget_creation_failure">Widget konnte nicht erstellt werden</string>
     <string name="settings_labs_create_conference_with_jitsi">Konferenzgespräche mit Jitsi durchführen</string>
     <string name="widget_delete_message_confirmation">Soll das Widget wirklich aus diesem Raum gelöscht werden?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Widget konnte nicht erstellt werden.</string>
     <string name="widget_integration_positive_power_level">Berechtigungslevel muss eine positive ganze Zahl sein.</string>
     <string name="widget_integration_must_be_in_room">Du bist nicht Mitglied in diesem Raum.</string>
@@ -898,17 +824,14 @@
     <string name="option_take_photo">Foto aufnehmen</string>
     <string name="option_take_video">Video aufnehmen</string>
     <string name="settings_labs_native_camera">Systemeigene Kamera verwenden</string>
-    <!-- share keys -->
     <string name="share_without_verifying">Ohne Verifizierung teilen</string>
     <string name="ignore_request">Anfrage ignorieren</string>
     <string name="settings_analytics">Anonymisierte Analysedaten</string>
     <string name="title_activity_bug_report">Fehlerbericht</string>
     <string name="conference_call_warning_title">Warnung!</string>
     <string name="conference_call_warning_message">Konferenzgespräche werden noch entwickelt und sind vielleicht nicht zuverlässig.</string>
-    <!-- slash commands -->
     <string name="command_error">Befehlsfehler</string>
     <string name="unrecognized_command">Unbekanntes Kommando: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Aus</string>
     <string name="notification_noisy">Laut</string>
     <string name="encrypted_message">Verschlüsselte Nachricht</string>
@@ -942,7 +865,6 @@
     <string name="community_name_hint">Beispiel</string>
     <string name="community_id">Community-ID</string>
     <string name="community_id_hint">Beispiel</string>
-    <!-- group details -->
     <string name="group_details_home">Startseite</string>
     <string name="group_details_people">Personen</string>
     <string name="group_details_rooms">Räume</string>
@@ -1000,7 +922,6 @@
         <item quantity="one">%d aktives Widget</item>
         <item quantity="other">%d aktive Widgets</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="avatar">Profilbild</string>
     <plurals name="membership_changes">
         <item quantity="one">%d Mitgliedsänderung</item>
@@ -1048,9 +969,9 @@
     <string name="deactivate_account_prompt_password">Um fortzufahren, bitte Passwort eingeben:</string>
     <string name="deactivate_account_submit">Account deaktivieren</string>
     <string name="dialog_title_third_party_licences">Drittanbieter-Lizenzen</string>
-    <string name="download">Download</string>
-    <string name="speak">Sprechen</string>
-    <string name="clear">Leeren</string>
+    <string name="action_download">Download</string>
+    <string name="action_speak">Sprechen</string>
+    <string name="action_clear">Leeren</string>
     <string name="e2e_re_request_encryption_key">Schlüssel von deinen anderen Sitzungen erneut anfordern.</string>
     <string name="e2e_re_request_encryption_key_sent">Schlüsselanfrage gesendet.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Anfrage gesendet</string>
@@ -1171,7 +1092,7 @@
     <string name="template_settings_call_ringtone_use_app_ringtone">Nutze den Standard-Klingelton von ${app_name} für eingehende Anrufe</string>
     <string name="settings_call_ringtone_title">Klingelton für eingehende Anrufe</string>
     <string name="settings_call_ringtone_dialog_title">Wähle Klingelton für Anrufe:</string>
-    <string name="accept">Akzeptieren</string>
+    <string name="action_accept">Akzeptieren</string>
     <string name="auth_accept_policies">Bitte lese und akzeptiere die Richtlinien dieses Home-Servers:</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Tests ausführen</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Läuft… (%1$d von %2$d)</string>
@@ -1244,7 +1165,7 @@
     <string name="title_activity_keys_backup_setup">Schlüsselsicherung</string>
     <string name="title_activity_keys_backup_restore">Schlüsselsicherung verwenden</string>
     <string name="keys_backup_is_not_finished_please_wait">Schlüsselsicherung ist nicht abgeschlossen. Bitte warten…</string>
-    <string name="skip">Überspringen</string>
+    <string name="action_skip">Überspringen</string>
     <string name="done">Fertig</string>
     <string name="settings_notification_advanced">Erweiterte Benachrichtigungseinstellungen</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Angepasste Einstellungen.</string>
@@ -1342,8 +1263,8 @@
     <string name="are_you_sure">Sicher\?</string>
     <string name="backup">Sicherung</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Alle verschlüsselten Nachrichten gehen verloren, wenn Du dich abmeldest ohne die Schlüssel gesichert zu haben.</string>
-    <string name="stay">Bleiben</string>
-    <string name="abort">Abbrechen</string>
+    <string name="action_stay">Bleiben</string>
+    <string name="action_abort">Abbrechen</string>
     <string name="action_sign_out_confirmation_simple">Wirklich abmelden\?</string>
     <string name="encryption_message_recovery">Wiederherstellung verschlüsselter Nachrichten</string>
     <string name="error_empty_field_enter_user_name">Bitte gib einen Benutzernamen ein.</string>
@@ -1388,7 +1309,7 @@
     <string name="keys_backup_restoring_computing_key_waiting_message">Berechne Wiederherstellungsschlüssel…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Lade Schlüssel herunter…</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Importiere Schlüssel…</string>
-    <string name="ignore">Ignorieren</string>
+    <string name="action_ignore">Ignorieren</string>
     <string name="auth_login_sso">Mit Single-Sign-On anmelden</string>
     <string name="login_error_unknown_host">Diese URL ist nicht erreichbar, bitte prüfen</string>
     <string name="login_error_ssl_handshake">Dein Gerät nutzt eine veraltetes TLS-Sicherheitsprotokoll, das anfällig für Angriffe ist. Zu deiner Sicherheit wirst du nicht in der Lage sein, dich zu verbinden</string>
@@ -1479,8 +1400,8 @@
     <string name="room_list_rooms_empty_title">Räume</string>
     <string name="room_list_rooms_empty_body">Deine Räume werden hier angezeigt. Drück auf das + unten rechts, um bestehende zu durchstöbern oder neue zu eröffnen.</string>
     <string name="title_activity_emoji_reaction_picker">Reaktionen</string>
-    <string name="reactions_agree">Zustimmen</string>
-    <string name="reactions_like">Mag ich</string>
+    <string name="action_agree">Zustimmen</string>
+    <string name="action_like">Mag ich</string>
     <string name="message_add_reaction">Reaktion hinzufügen</string>
     <string name="message_view_reaction">Reaktionen ansehen</string>
     <string name="reactions">Reaktionen</string>
@@ -1575,12 +1496,12 @@
     <string name="direct_room_start_search">Beginne mit der Eingabe, um Ergebnisse zu erhalten</string>
     <string name="direct_room_filter_hint">Filtern nach Benutzername oder ID…</string>
     <string name="joining_room">Raum betreten…</string>
-    <string name="decline">Ablehnen</string>
+    <string name="action_decline">Ablehnen</string>
     <string name="push_gateway_item_app_id">App-ID:</string>
-    <string name="review">Überprüfung</string>
+    <string name="action_review">Überprüfung</string>
     <string name="none">Keine</string>
-    <string name="revoke">Widerrufen</string>
-    <string name="disconnect">Trennen</string>
+    <string name="action_revoke">Widerrufen</string>
+    <string name="action_disconnect">Trennen</string>
     <string name="people_no_identity_server">Kein Identitätsserver konfiguriert.</string>
     <string name="call_failed_no_ice_title">Anruf aufgrund eines Serverfehlers fehlgeschlagen</string>
     <string name="call_failed_no_ice_use_alt">Versuche es mit %s</string>
@@ -2023,15 +1944,6 @@
     <string name="no_connectivity_to_the_server_indicator">Verbindung zum Server wurde unterbrochen</string>
     <string name="settings_dev_tools">Entwicklerwerkzeuge</string>
     <string name="settings_account_data">Kontodaten</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d Stimme</item>
-        <item quantity="other">%d Stimmen</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d Stimme - Endergebnis</item>
-        <item quantity="other">%d Stimmen - Endergebnis</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Ausgewählte Option</string>
     <string name="command_description_poll">Erstellt eine einfache Umfrage</string>
     <string name="verification_cannot_access_other_session">Nutze eine Wiederherstellungsmethode</string>
     <string name="verification_use_passphrase">Wenn du auf keine existierende Sitzung zugreifen kannst</string>
@@ -2161,7 +2073,7 @@
 \n${app_name} Desktop</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">oder einen anderen cross-signing-fähigen Matrix Client</string>
+    <string name="or_other_mx_capable_client">oder einen anderen cross-signing-fähigen Matrix Client</string>
     <string name="template_use_latest_app">Nutze die neueste Version von ${app_name} auf deinen anderen Geräten:</string>
     <string name="command_description_discard_session">Erzwingt das Verwerfen der aktuell ausgehende Gruppensitzung in einem verschlüsseltem Raum</string>
     <string name="command_description_discard_session_not_handled">Wird nur in verschlüsselten Räumen unterstützt</string>
@@ -2200,12 +2112,12 @@
         <item quantity="other">Einladungen gesendet an %1$s und %2$d weitere Benutzer</item>
     </plurals>
     <string name="invite_users_to_room_failure">Wir konnten den Benutzer nicht einladen. Bitte überprüfe den Benutzernamen, welchen du einladen möchtest und versuche es erneut.</string>
-    <string name="pause_video">Pause</string>
+    <string name="action_pause">Pause</string>
     <string name="action_copy">Kopieren</string>
     <string name="bottom_action_notification">Benachrichtigungen</string>
     <string name="template_call_failed_no_connection">${app_name}-Anruf fehlgeschlagen</string>
-    <string name="play_video">Abspielen</string>
-    <string name="dismiss">Ablehnen</string>
+    <string name="action_play">Abspielen</string>
+    <string name="action_dismiss">Ablehnen</string>
     <string name="dialog_title_success">Erfolg</string>
     <string name="call_failed_no_connection_description">Echtzeitverbindung konnte nicht hergestellt werden.
 \nBitte den Administrator deines Home-Servers, einen TURN-Server zu konfigurieren, dass Anrufe zuverlässig funktionieren.</string>
@@ -2434,7 +2346,6 @@
     <string name="settings_show_room_member_state_events">Status-Ereignisse der Raummitglieder zeigen</string>
     <string name="settings_show_room_member_state_events_summary">Bezieht Einladungs-/Beitritts-/Verlassen-/Entfernen-/Verbannen-Ereignisse und Avatar-/Anzeigenamen-Wechsel mit ein.</string>
     <string name="sent_a_poll">Umfrage</string>
-    <string name="sent_a_bot_buttons">Bot-Schaltflächen</string>
     <string name="sent_a_reaction">Reagierte mit: %s</string>
     <string name="universal_link_malformed">Der Link war fehlerhaft</string>
     <string name="no_permissions_to_start_webrtc_call">Du bist nicht berechtigt, einen Anruf in diesem Raum zu starten</string>
@@ -2442,7 +2353,7 @@
     <string name="delete_account_data_warning">Kontodaten vom Typ %1$s löschen\?
 \n
 \nVorsicht! Es kann zu unerwartetem Verhalten führen.</string>
-    <string name="reset">Zurücksetzen</string>
+    <string name="action_reset">Zurücksetzen</string>
     <string name="settings_troubleshoot_test_push_loop_failed">Pushempfang fehlgeschlagen. Lösung könnte eine Neuinstallation der Applikation sein.</string>
     <string name="settings_troubleshoot_test_push_loop_success">Die Applikation empfängt den PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Die Applikation wartet auf den PUSH</string>
@@ -2780,7 +2691,7 @@
     <string name="invite_just_to_this_room">Nur zu diesem Raum</string>
     <string name="invite_to_space_with_name">In Space \"%s\" einladen</string>
     <string name="invite_by_link">Link teilen</string>
-    <string name="invite_by_mxid">Mithilfe eines Benutzernamens einladen</string>
+    <string name="invite_by_username">Mithilfe eines Benutzernamens einladen</string>
     <string name="invite_by_email">Mithilfe einer E-Mail-Adresse einladen</string>
     <string name="invite_people_menu">Personen einladen</string>
     <string name="invite_people_to_your_space">Lade Personen in deinen Space ein</string>
@@ -3003,7 +2914,7 @@
     <string name="you_will_leave_all_in">Du wirst alle Räume und Spaces in %s verlassen.</string>
     <string name="leave_all_rooms_and_spaces">Alle Räume und Spaces verlassen</string>
     <string name="space_leave_prompt_msg_with_name">Willst du %s wirklich verlassen\?</string>
-    <string name="invite_by_mxid_or_mail">Mit Benutzername oder E-Mail einladen</string>
+    <string name="invite_by_username_or_mail">Mit Benutzername oder E-Mail einladen</string>
     <string name="command_description_add_to_space">Zum ausgewählten Space hinzufügen</string>
     <string name="create_space_in_progress">Erstelle Space…</string>
     <string name="settings_developer_mode_show_info_on_screen_summary">Hilfreiche Informationen zur Fehlersuche anzeigen</string>
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 1ae7629fef..da46dab8e6 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -38,7 +38,7 @@
     <string name="notice_room_third_party_registered_invite">Ο/Η %1$s δέχτηκε την πρόσκληση για το %2$s</string>
 
     <string name="notice_crypto_unable_to_decrypt">** Αδυναμία αποκρυπτογράφησης: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Η συσκευή του/της αποστολέα δεν μας έχει στείλει τα κλειδιά για αυτό το μήνυμα.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Η συσκευή του/της αποστολέα δεν μας έχει στείλει τα κλειδιά για αυτό το μήνυμα.</string>
 
     <string name="unable_to_send_message">Αποτυχία αποστολής μηνύματος</string>
 
@@ -70,7 +70,7 @@
 
     <string name="notice_room_third_party_invite">Ο/Η %1$s έστειλε μία πρόσκληση στον/στην %2$s για να εισέλθει στο δωμάτιο</string>
     <string name="room_error_join_failed_empty_room">Δεν είναι δυνατή ακόμα η επανείσοδος σε ένα άδειο δωμάτιο.</string>
-    <string name="cancel">Ακύρωση</string>
+    <string name="action_cancel">Ακύρωση</string>
     <string name="action_close">Κλείσιμο</string>
     <string name="room_settings_direct_chat">Απευθείας συνομιλία</string>
     <string name="directory_title">Ευρετήριο</string>
@@ -78,18 +78,17 @@
     <string name="room_details_files">Αρχεία</string>
     <string name="room_settings_forget">Παράλειψη</string>
     <string name="send_bug_report_logs_description">Προκειμένου να διαγνωστούν προβλήματα, τα αρχεία καταγραφής από αυτόν τον πελάτη θα σταλούν με αυτήν την αναφορά σφάλματος. Αν προτιμάτε να στείλετε μόνο το παραπάνω κείμενο, απενεργοποιήστε:</string>
-    <string name="leave">Αποχώρηση</string>
+    <string name="action_leave">Αποχώρηση</string>
     <string name="settings_messages_sent_by_bot">Μηνύματα από bots</string>
     <string name="permalink">Μόνιμος σύνδεσμος</string>
     <string name="send_bug_report_description">Παρακαλούμε περιγράψτε το σφάλμα. Τι κάνατε; Τι περιμένατε να συμβεί; Τι έγινε τελικά;</string>
-    <string name="quote">Παράθεση</string>
-    <string name="reject">Απόρριψη</string>
-    <string name="remove">Αφαίρεση</string>
-    <string name="resend">Αποστολή ξανά</string>
+    <string name="action_quote">Παράθεση</string>
+    <string name="action_reject">Απόρριψη</string>
+    <string name="action_remove">Αφαίρεση</string>
+    <string name="action_resend">Αποστολή ξανά</string>
     <string name="rooms_directory_header">Ευρετήριο</string>
-    <string name="send">Αποστολή</string>
+    <string name="action_send">Αποστολή</string>
     <string name="send_bug_report_include_logs">Αποστολή πληροφοριών</string>
-    <string name="room_recents_start_chat">Έναρξη συνομιλίας</string>
     <string name="directory_server_fail_to_retrieve_server">Ο διακομιστής είναι μη διαθέσιμος ή υπερφορτωμένος</string>
     <string name="view_decrypted_source">Προβολή αποκρυπτογραφημένου κώδικα</string>
     <string name="view_source">Προβολή κώδικα</string>
@@ -109,7 +108,7 @@
     <string name="title_activity_bug_report">Αναφορά σφάλματος</string>
     <string name="title_activity_group_details">Πληροφορίες κοινότητας</string>
     <string name="loading">Φόρτωση…</string>
-    <string name="save">Αποθήκευση</string>
+    <string name="action_save">Αποθήκευση</string>
     <string name="encrypted_message">Κρυπτογραφημένο μήνυμα</string>
     <string name="light_theme">Ανοιχτόχρωμο θέμα</string>
     <string name="dark_theme">Σκουρόχρωμο θέμα</string>
@@ -117,9 +116,9 @@
     <string name="title_activity_choose_sticker">Αποστολή αυτοκόλλητου</string>
     <string name="dialog_title_third_party_licences">Άδειες τρίτων</string>
     <string name="later">Αργότερα</string>
-    <string name="forward">Μπροστά</string>
-    <string name="delete">Διαγραφή</string>
-    <string name="rename">Μετονομασία</string>
+    <string name="action_forward">Μπροστά</string>
+    <string name="action_delete">Διαγραφή</string>
+    <string name="action_rename">Μετονομασία</string>
     <string name="report_content">Αναφορά περιεχομένου</string>
     <string name="active_call">Ενεργή κλήση</string>
     <string name="ongoing_conference_call_video">Βίντεο</string>
@@ -127,9 +126,9 @@
     <string name="missing_permissions_error">Αυτή η ενέργεια δεν είναι δυνατή λόγω ελλιπών δικαιωμάτων.</string>
     <string name="device_information">Πληροφορίες συσκευής</string>
     <string name="or">ή</string>
-    <string name="invite">Πρόσκληση</string>
+    <string name="action_invite">Πρόσκληση</string>
     <string name="offline">Εκτός σύνδεσης</string>
-    <string name="accept">Αποδοχή</string>
+    <string name="action_accept">Αποδοχή</string>
     <string name="action_exit">Έξοδος</string>
     <string name="actions">Ενέργειες</string>
     <string name="action_sign_out">Αποσύνδεση</string>
@@ -139,7 +138,7 @@
     <string name="action_mark_all_as_read">Σημείωση όλων ως αναγνωσμένων</string>
     <string name="action_quick_reply">Γρήγορη απάντηση</string>
     <string name="action_open">Άνοιγμα</string>
-    <string name="disable">Απενεργοποίηση</string>
+    <string name="action_disable">Απενεργοποίηση</string>
     <string name="dialog_title_confirmation">Επιβεβαίωση</string>
     <string name="dialog_title_error">Σφάλμα</string>
     <string name="bottom_action_favourites">Αγαπημένα</string>
@@ -359,22 +358,22 @@
     <string name="are_you_sure">Είστε σίγουρος;</string>
     <string name="backup">Δημιουργία αντίγραφου ασφαλείας</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Θα χάσετε την πρόσβαση στα κρυπτογραφημένα μηνύματά σας, εκτός εάν δημιουργήσετε αντίγραφα ασφαλείας των κλειδιών σας πριν αποσυνδεθείτε.</string>
-    <string name="redact">Αφαίρεση</string>
-    <string name="download">Κατεβάστε</string>
-    <string name="share">Διαμοιρασμός</string>
-    <string name="clear">Καθαρισμός</string>
-    <string name="revoke">Ανάκληση</string>
-    <string name="disconnect">Αποσύνδεση</string>
-    <string name="pause_video">Παύση</string>
+    <string name="action_redact">Αφαίρεση</string>
+    <string name="action_download">Κατεβάστε</string>
+    <string name="action_share">Διαμοιρασμός</string>
+    <string name="action_clear">Καθαρισμός</string>
+    <string name="action_revoke">Ανάκληση</string>
+    <string name="action_disconnect">Αποσύνδεση</string>
+    <string name="action_pause">Παύση</string>
     <string name="room_participants_header_direct_chats">Прямі повідомлення</string>
-    <string name="decline">Απόρριψη</string>
+    <string name="action_decline">Απόρριψη</string>
     <string name="call_notification_reject">Απόρριψη</string>
     <string name="call_notification_answer">Αποδοχή</string>
-    <string name="review">Ανασκόπηση</string>
-    <string name="ignore">Αγνοείστε</string>
-    <string name="abort">Διακόψτε</string>
+    <string name="action_review">Ανασκόπηση</string>
+    <string name="action_ignore">Αγνοείστε</string>
+    <string name="action_abort">Διακόψτε</string>
     <string name="done">Ολοκληρώθηκε</string>
-    <string name="skip">Παραλείψτε</string>
+    <string name="action_skip">Παραλείψτε</string>
     <string name="send_anyway">Στείλτε ούτως ή άλλως</string>
     <string name="call_anyway">Καλέστε ούτως ή άλλως</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Οι κλήσεις συνδιάσκεψης δεν υποστηρίζονται σε κρυπτογραφημένες αίθουσες</string>
@@ -391,11 +390,11 @@
     <string name="no_permissions_to_start_conf_call_in_direct_room">Δεν έχετε άδεια να ξεκινήσετε μια κλήση συνδιάσκεψης</string>
     <string name="no_permissions_to_start_conf_call">Δεν έχετε άδεια να ξεκινήσετε μια κλήση συνδιάσκεψης σε αυτήν την αίθουσα</string>
     <string name="missing_permissions_to_start_conf_call">Χρειάζεστε άδεια για να προσκαλέσετε να ξεκινήσει μια διάσκεψη σε αυτήν την αίθουσα</string>
-    <string name="reset">Επαναφορά</string>
-    <string name="dismiss">Απόρριψη</string>
-    <string name="play_video">Παίξε</string>
+    <string name="action_reset">Επαναφορά</string>
+    <string name="action_dismiss">Απόρριψη</string>
+    <string name="action_play">Παίξε</string>
     <string name="none">Κανένα</string>
-    <string name="stay">Παραμείνατε</string>
+    <string name="action_stay">Παραμείνατε</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">H δημιουργία αντιγράφων κλειδιού ασφαλείας θα πρέπει να είναι ενεργή σε όλες τις συνεδρίες σας για να αποφύγετε την απώλεια πρόσβασης στα κρυπτογραφημένα μηνύματά σας.</string>
     <string name="room_widget_reload">Επαναφόρτωση γραφικού στοιχείου</string>
     <string name="room_widget_failed_to_load">Αποτυχία φόρτωσης γραφικού στοιχείου
@@ -561,7 +560,7 @@
 \nΗ ορατότητα μηνυμάτων δουλεύει σαν το ηλεκτρονικό ταχυδρομείο. Το να ξεχαστούν τα μηνύματα σημαίνει οτι μηνύματα τα οποία έχετε στείλει δεν θα σταλούν σε νέους ή μη-εγγεγραμμένους χρήστες, αλλα εγγεγραμμένοι χρήστες οι οποίοι έχουν ήδη πρόσβαση σε αυτά τα μηνύματα θα μπορούν ακόμα να τα δούν.</string>
     <string name="forget_room">Λησμόνηση δωματίου</string>
     <string name="room_tombstone_versioned_description">Αυτό το δωμάτιο έχει αντικατασταθεί και δεν είναι πια ενεργό</string>
-    <string name="speak">Μιλήστε</string>
+    <string name="action_speak">Μιλήστε</string>
     <string name="ssl_remain_offline">Παράβλεψη</string>
     <string name="ssl_logout_account">Αποσύνδεση</string>
     <string name="ssl_do_not_trust">Δεν εμπιστεύομαι</string>
@@ -594,13 +593,6 @@
     <string name="room_details_settings">Ρυθμίσεις</string>
     <string name="room_details_title">Λεπτομέρειες Δωματίου</string>
     <string name="room_details_people_invited_group_name">ΚΑΛΕΣΜΕΝΟΣ/Η</string>
-    <string name="room_recents_join_room_prompt">Πληκτρολογείστε ταυτότητα (ID) δωματίου ή ψευδώνυμο δωματίου</string>
-    <string name="room_recents_join_room">Ένταξη στο δωμάτιο</string>
-    <string name="room_recents_create_room">Δημιουργία δωματίου</string>
-    <string name="room_recents_invites">ΠΡΟΣΚΛΗΣΕΙΣ</string>
-    <string name="room_recents_low_priority">ΧΑΜΗΛΗ ΠΡΟΤΕΡΑΙΟΤΗΤΑ</string>
-    <string name="room_recents_conversations">ΔΩΜΑΤΙΑ</string>
-    <string name="room_recents_join">ΣΥΜΜΕΤΟΧΗ</string>
     <string name="search_is_not_supported_in_e2e_room">Η αναζήτηση σε κρυπτογραφημένα δωμάτια δεν υποστηρίζεται ακόμα.</string>
     <string name="tab_title_search_files">ΑΡΧΕΙΑ</string>
     <string name="tab_title_search_messages">ΜΗΝΥΜΑΤΑ</string>
diff --git a/vector/src/main/res/values-en-rGB/strings.xml b/vector/src/main/res/values-en-rGB/strings.xml
index 76003bbc69..eaa0d1f8ec 100644
--- a/vector/src/main/res/values-en-rGB/strings.xml
+++ b/vector/src/main/res/values-en-rGB/strings.xml
@@ -4,7 +4,6 @@
     <string name="home_filter_placeholder_favorites">Filter favourites</string>
     <string name="room_list_quick_actions_favorite_remove">Remove from favourites</string>
     <string name="room_list_quick_actions_favorite_add">Add to favourites</string>
-    <string name="room_recents_favourites">FAVOURITES</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Synchronising Self Signing key</string>
     <string name="bootstrap_crosssigning_progress_save_usk">Synchronising User key</string>
     <string name="bootstrap_crosssigning_progress_save_msk">Synchronising Master key</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index c8f0f5fd02..81b92b9bf5 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -14,7 +14,7 @@
     <string name="notice_room_withdraw">%1$s nuligis inviton por %2$s</string>
     <string name="notice_avatar_url_changed">%1$s ŝanĝis sian profilbildon</string>
     <string name="notice_crypto_unable_to_decrypt">** Ne eblas malĉifri: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">La aparato de la sendinto ne sendis al ni la ŝlosilojn por tiu mesaĝo.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">La aparato de la sendinto ne sendis al ni la ŝlosilojn por tiu mesaĝo.</string>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="notice_display_name_set">%1$s ŝanĝis sian prezentan nomon al %2$s</string>
     <string name="notice_display_name_changed_from">%1$s ŝanĝis sian prezentan nomon de %2$s al %3$s</string>
@@ -227,24 +227,24 @@
     <string name="dialog_title_third_party_licences">Permesiloj de eksteraj liverantoj</string>
     <string name="loading">Enlegante…</string>
     <string name="ok">Bone</string>
-    <string name="cancel">Nuligi</string>
-    <string name="save">Konservi</string>
-    <string name="leave">Eliri</string>
-    <string name="send">Sendi</string>
-    <string name="resend">Resendi</string>
-    <string name="redact">Forigi</string>
-    <string name="quote">Citi</string>
-    <string name="download">Elŝuti</string>
-    <string name="share">Kunhavigi</string>
-    <string name="speak">Paroli</string>
-    <string name="clear">Forviŝi</string>
+    <string name="action_cancel">Nuligi</string>
+    <string name="action_save">Konservi</string>
+    <string name="action_leave">Eliri</string>
+    <string name="action_send">Sendi</string>
+    <string name="action_resend">Resendi</string>
+    <string name="action_redact">Forigi</string>
+    <string name="action_quote">Citi</string>
+    <string name="action_download">Elŝuti</string>
+    <string name="action_share">Kunhavigi</string>
+    <string name="action_speak">Paroli</string>
+    <string name="action_clear">Forviŝi</string>
     <string name="later">Poste</string>
-    <string name="forward">Plusendi</string>
+    <string name="action_forward">Plusendi</string>
     <string name="permalink">Fiksligilo</string>
     <string name="view_source">Vidi fonton</string>
     <string name="view_decrypted_source">Vidi malĉifritan fonton</string>
-    <string name="delete">Forigi</string>
-    <string name="rename">Alinomi</string>
+    <string name="action_delete">Forigi</string>
+    <string name="action_rename">Alinomi</string>
     <string name="title_activity_member_details">Detaloj pri ano</string>
     <string name="title_activity_historical">Historia</string>
     <string name="report_content">Raporti enhavon</string>
@@ -261,7 +261,7 @@
     <string name="device_information">Informoj pri salutaĵo</string>
     <string name="send_anyway">Tamen sendi</string>
     <string name="or">aŭ</string>
-    <string name="invite">Inviti</string>
+    <string name="action_invite">Inviti</string>
     <string name="offline">Eksterrete</string>
     <string name="action_exit">Eliri</string>
     <string name="actions">Agoj</string>
@@ -285,7 +285,6 @@
     <string name="room_details_settings">Agordoj</string>
     <string name="tab_title_search_people">PERSONOJ</string>
     <string name="tab_title_search_files">DOSIEROJ</string>
-    <string name="room_recents_join">ALIĜI</string>
     <string name="group_details_people">Personoj</string>
     <string name="group_details_rooms">Ĉambroj</string>
     <string name="no_users_placeholder">Neniuj uzantoj</string>
@@ -305,26 +304,26 @@
     <string name="are_you_sure">Ĉu vi certas\?</string>
     <string name="backup">Savkopii</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Vi perdos aliron al viaj ĉifritaj mesaĝoj, se vi ne savkopios viajn ŝlosilojn antaŭ adiaŭo.</string>
-    <string name="stay">Resti</string>
+    <string name="action_stay">Resti</string>
     <string name="none">Neniu</string>
-    <string name="revoke">Senvalidigi</string>
-    <string name="disconnect">Malkonekti</string>
+    <string name="action_revoke">Senvalidigi</string>
+    <string name="action_disconnect">Malkonekti</string>
     <string name="missing_permissions_to_start_conf_call">Vi bezonas permeson inviti por komenci grupan vokon en ĉi tiu ĉambro</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Grupaj vokoj ne estas subtenataj de ĉifrataj ĉambroj</string>
-    <string name="accept">Akcepti</string>
-    <string name="skip">Preterpasi</string>
+    <string name="action_accept">Akcepti</string>
+    <string name="action_skip">Preterpasi</string>
     <string name="done">Finite</string>
-    <string name="abort">Ĉesigi</string>
-    <string name="ignore">Malatenti</string>
-    <string name="review">Kontroli</string>
-    <string name="decline">Rifuzi</string>
+    <string name="action_abort">Ĉesigi</string>
+    <string name="action_ignore">Malatenti</string>
+    <string name="action_review">Kontroli</string>
+    <string name="action_decline">Rifuzi</string>
     <string name="action_sign_out">Adiaŭi</string>
     <string name="action_sign_out_confirmation_simple">Ĉu vi certe volas adiaŭi\?</string>
     <string name="action_mark_all_as_read">Marki ĉion legita</string>
     <string name="action_historical">Historia</string>
     <string name="action_mark_room_read">Marki legita</string>
     <string name="copied_to_clipboard">Kopiiĝis al tondujo</string>
-    <string name="disable">Malŝalti</string>
+    <string name="action_disable">Malŝalti</string>
     <string name="dialog_title_confirmation">Konfirmo</string>
     <string name="dialog_title_warning">Averto</string>
     <string name="dialog_title_error">Eraro</string>
@@ -482,13 +481,6 @@
     <string name="search_no_results">Neniuj rezultoj</string>
     <string name="tab_title_search_rooms">ĈAMBROJ</string>
     <string name="tab_title_search_messages">MESAĜOJ</string>
-    <string name="room_recents_favourites">ELSTARIGITAJ</string>
-    <string name="room_recents_conversations">ĈAMBROJ</string>
-    <string name="room_recents_invites">INVITOJ</string>
-    <string name="room_recents_start_chat">Komenci babilon</string>
-    <string name="room_recents_create_room">Krei ĉambron</string>
-    <string name="room_recents_join_room">Aliĝi al ĉambro</string>
-    <string name="room_recents_join_room_title">Aliĝi al ĉambro</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d ĉambro</item>
         <item quantity="other">%d ĉambroj</item>
@@ -638,10 +630,10 @@
     <string name="yes">JES</string>
     <string name="no">NE</string>
     <string name="_continue">Daŭrigi</string>
-    <string name="remove">Forigi</string>
-    <string name="join">Aliĝi</string>
-    <string name="preview">Antaŭrigardi</string>
-    <string name="reject">Rifuzi</string>
+    <string name="action_remove">Forigi</string>
+    <string name="action_join">Aliĝi</string>
+    <string name="action_preview">Antaŭrigardi</string>
+    <string name="action_reject">Rifuzi</string>
     <string name="list_members">Listigi ĉambranojn</string>
     <string name="room_sync_in_progress">Spegulante…</string>
     <string name="room_preview_invitation_format">Vi estis invitita al ĉi tiu ĉambro de %s</string>
@@ -725,9 +717,9 @@
     <string name="open_settings">Malfermi agordojn</string>
     <string name="settings_troubleshoot_test_account_settings_title">Agordoj de konto.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Sciigoj estas ŝaltitaj por via konto.</string>
-    <string name="play_video">Ludi</string>
-    <string name="pause_video">Paŭzigi</string>
-    <string name="dismiss">Eksigi</string>
+    <string name="action_play">Ludi</string>
+    <string name="action_pause">Paŭzigi</string>
+    <string name="action_dismiss">Eksigi</string>
     <string name="no_permissions_to_start_conf_call">Vi ne havas permeson ekigi grupan vokon en ĉi tiu ĉambro</string>
     <string name="conference_call_in_progress">Grupa voko jam daŭras!</string>
     <string name="video_meeting">Komenci grupan vidvokon</string>
@@ -803,7 +795,6 @@
     <string name="verification_request_waiting">Atendante…</string>
     <string name="sent_verification_conclusion">Rezulto de kontrolo</string>
     <string name="sent_a_reaction">Reagis per: %s</string>
-    <string name="sent_a_bot_buttons">Butonoj de robotoj</string>
     <string name="sent_a_poll">Enketo</string>
     <string name="send_a_sticker">Glumarko</string>
     <string name="sent_a_file">Dosiero</string>
@@ -1139,8 +1130,8 @@
     <string name="reactions">Reagoj</string>
     <string name="message_view_reaction">Vidi reagojn</string>
     <string name="message_add_reaction">Aldoni reagon</string>
-    <string name="reactions_like">Ŝati</string>
-    <string name="reactions_agree">Konsenti</string>
+    <string name="action_like">Ŝati</string>
+    <string name="action_agree">Konsenti</string>
     <string name="title_activity_emoji_reaction_picker">Reagoj</string>
     <string name="room_list_rooms_empty_body">Viaj ĉambroj montriĝos ĉi tie. Tuŝetu al la «+» dekstre sube por trovi jam ekzistantajn, aŭ fari viajn proprajn.</string>
     <string name="room_list_rooms_empty_title">Ĉambroj</string>
@@ -1878,8 +1869,6 @@
         <item quantity="one">%1$s ĉambro trovita por %2$s</item>
         <item quantity="other">%1$s ĉambroj trovitaj por %2$s</item>
     </plurals>
-    <string name="room_recents_join_room_prompt">Entajpu identigilon de ĉambro aŭ kromnomon de ĉambro</string>
-    <string name="room_recents_low_priority">MALALTA PRIORITATO</string>
     <string name="search_is_not_supported_in_e2e_room">Serĉado en ĉifritaj ĉambroj ankoraŭ en estas subtenata.</string>
     <string name="search_banned_user_hint">Filtri forbaritajn uzantojn</string>
     <string name="ssl_only_accept">Akceptu la atestilon nur se administranto de la servilo publikigis fingrospuron akordan kun tiu ĉi-supre.</string>
@@ -1986,7 +1975,7 @@
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Vi ne havas permeson komenci vokon</string>
     <string name="no_permissions_to_start_webrtc_call">Vi ne havas permeson komenci vokon en ĉi tiu ĉambro</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Vi ne havas permeson komenci grupan vokon</string>
-    <string name="reset">Restarigi</string>
+    <string name="action_reset">Restarigi</string>
     <string name="rooms_directory_header">Listo de ĉambroj</string>
     <string name="bootstrap_info_confirm_text">Replenigu per via %s por konfirmi ĝin.</string>
     <string name="initialize_cross_signing">Pretigi delegajn subskribojn</string>
@@ -2140,7 +2129,7 @@
     <string name="enter_secret_storage_passphrase_or_key">Por daŭrigi, necesas via %1$s aŭ via %2$s.</string>
     <string name="command_description_discard_session_not_handled">Subtenata nur en ĉifritaj ĉambroj</string>
     <string name="template_use_latest_app">Uzu la plej freŝan version de ${app_name} per aliaj viaj aparatoj:</string>
-    <string name="or_other_mx_capabale_client">aŭ alian klienton de Matrix kapablan je delegaj subskriboj</string>
+    <string name="or_other_mx_capable_client">aŭ alian klienton de Matrix kapablan je delegaj subskriboj</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
     <string name="template_app_desktop_web">${app_name} Web (por TTT)
@@ -2232,15 +2221,6 @@
     <string name="verification_use_passphrase">Se vi ne povas aliri jaman salutaĵon</string>
     <string name="verification_cannot_access_other_session">Uzi rehavan pasfrazon aŭ ŝlosilon</string>
     <string name="command_description_poll">Faras simplan enketon</string>
-    <string name="poll_item_selected_aria">Elektita elekteblo</string>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d voĉo – finaj rezultoj</item>
-        <item quantity="other">%d voĉoj – finaj rezultoj</item>
-    </plurals>
-    <plurals name="poll_info">
-        <item quantity="one">%d voĉo</item>
-        <item quantity="other">%d voĉoj</item>
-    </plurals>
     <string name="delete_account_data_warning">Ĉu forigi la datumojn de konto de la speco «%1$s»\?
 \n
 \nForu tion zorge, ĝi povus kaŭzi neatenditan konduton.</string>
@@ -2361,7 +2341,6 @@
     <string name="room_settings_directory_visibility">Inkluzivigi la ĉambron en katalogo de ĉambroj</string>
     <string name="directory_searching_title">Serĉante tra katalogo…</string>
     <string name="directory_search_results_title">Foliumi katalogon</string>
-    <string name="room_recents_directory">KATALOGO</string>
     <string name="people_search_user_directory">KATALOGO DE UZANTOJ (%s)</string>
     <string name="user_directory_header">Katalogo de uzantoj</string>
     <string name="warning_room_not_created_yet">La ĉambro ankoraŭ ne kreiĝis. Ĉu nuligi kreadon de la ĉambro\?</string>
@@ -2694,7 +2673,7 @@
     <string name="invite_to_space_with_name_desc">Oni povos esplori en %s</string>
     <string name="invite_to_space_with_name">Inviti al %s</string>
     <string name="invite_by_link">Havigi ligilon</string>
-    <string name="invite_by_mxid">Inviti per uzantonomo</string>
+    <string name="invite_by_username">Inviti per uzantonomo</string>
     <string name="invite_by_email">Inviti per retpoŝto</string>
     <string name="invite_people_to_your_space_desc">Nun ĉeestas nur vi. %s eĉ pli bonos kun aliuloj.</string>
     <string name="invite_to_space">Inviti al %s</string>
@@ -2877,7 +2856,7 @@
     <string name="leave_all_rooms_and_spaces">Foriri de ĉiuj ĉambroj kaj aroj</string>
     <string name="space_leave_prompt_msg_with_name">Ĉu vi certe volas foriri de %s\?</string>
     <string name="discovery_section">Trovado (%s)</string>
-    <string name="invite_by_mxid_or_mail">Inviti laŭ uzantonomo aŭ retpoŝtadreso</string>
+    <string name="invite_by_username_or_mail">Inviti laŭ uzantonomo aŭ retpoŝtadreso</string>
     <string name="command_description_add_to_space">Aldoni al la aro</string>
     <string name="call_one_active">Aktiva voko (%1$s) ·</string>
     <plurals name="call_active_status">
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index b96e90fbe2..44d3704a53 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -43,34 +43,26 @@
     <string name="notice_room_third_party_registered_invite">%1$s aceptó la invitación de %2$s</string>
 
     <string name="notice_crypto_unable_to_decrypt">** No se puede descifrar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositivo del remitente no nos ha enviado las claves de este mensaje.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">El dispositivo del remitente no nos ha enviado las claves de este mensaje.</string>
 
-    <!-- Room Screen -->
     <string name="could_not_redact">No se pudo redactar</string>
     <string name="unable_to_send_message">No se puede enviar el mensaje</string>
 
     <string name="message_failed_to_upload">La subida de la imagen falló</string>
 
-    <!-- general errors -->
     <string name="network_error">Error de la red</string>
     <string name="matrix_error">Error de Matrix</string>
 
-    <!-- Home Screen -->
 
-    <!-- Last seen time -->
 
-    <!-- call events -->
 
-    <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">No es posible volver a unirse a una sala vacía.</string>
 
-    <!-- medium friendly name -->
     <string name="medium_email">Correo electrónico</string>
     <string name="medium_phone_number">Número telefónico</string>
 
     <string name="summary_user_sent_sticker">%1$s envió una calcomanía.</string>
 
-    <!-- Room display name -->
     <string name="room_displayname_invite_from">Invitación de %s</string>
     <string name="room_displayname_room_invite">Invitación de Sala</string>
     <string name="room_displayname_two_members">%1$s y %2$s</string>
@@ -86,29 +78,27 @@
     <string name="notice_event_redacted_by">Mensaje eliminado por %1$s</string>
     <string name="notice_event_redacted_with_reason">Mensaje eliminado [motivo: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Mensaje eliminado por %1$s [motivo: %2$s]</string>
-    <!-- titles -->
     <string name="title_activity_home">Mensajes</string>
     <string name="title_activity_room">Sala</string>
     <string name="title_activity_settings">Configuraciones</string>
     <string name="title_activity_member_details">Detalles de los miembros</string>
     <string name="title_activity_historical">Historial</string>
-    <!-- button names -->
     <string name="ok">OK</string>
-    <string name="cancel">Cancelar</string>
-    <string name="save">Guardar</string>
-    <string name="leave">Salir</string>
-    <string name="send">Enviar</string>
-    <string name="resend">Reenviar</string>
-    <string name="redact">Borrar</string>
-    <string name="quote">Citar</string>
-    <string name="share">Compartir</string>
+    <string name="action_cancel">Cancelar</string>
+    <string name="action_save">Guardar</string>
+    <string name="action_leave">Salir</string>
+    <string name="action_send">Enviar</string>
+    <string name="action_resend">Reenviar</string>
+    <string name="action_redact">Borrar</string>
+    <string name="action_quote">Citar</string>
+    <string name="action_share">Compartir</string>
     <string name="later">Luego</string>
-    <string name="forward">Reenviar</string>
+    <string name="action_forward">Reenviar</string>
     <string name="permalink">Enlace Permanente</string>
     <string name="view_source">Ver Fuente</string>
     <string name="view_decrypted_source">Ver Fuente Descifrada</string>
-    <string name="delete">Borrar</string>
-    <string name="rename">Renombrar</string>
+    <string name="action_delete">Borrar</string>
+    <string name="action_rename">Renombrar</string>
     <string name="report_content">Reportar contenido</string>
     <string name="active_call">Llamada activa</string>
     <string name="ongoing_conference_call">Llamada de conferencia en proceso.\nUnirse con %1$s o %2$s.</string>
@@ -122,8 +112,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Las llamadas de conferencia no se pueden realizar en salas cifradas</string>
     <string name="send_anyway">Enviar de todos modos</string>
     <string name="or">o</string>
-    <string name="invite">Invitar</string>
-    <!-- actions -->
+    <string name="action_invite">Invitar</string>
     <string name="action_sign_out">Cerrar la sesión</string>
     <string name="action_voice_call">Llamada de Voz</string>
     <string name="action_video_call">Llamada de Video</string>
@@ -134,31 +123,25 @@
     <string name="action_open">Abrir</string>
     <string name="action_close">Cerrar</string>
     <string name="copied_to_clipboard">Copiado</string>
-    <string name="disable">Desactivar</string>
-    <!-- dialog titles -->
+    <string name="action_disable">Desactivar</string>
     <string name="dialog_title_confirmation">Confirmación</string>
     <string name="dialog_title_warning">Advertencia</string>
-    <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Home</string>
     <string name="bottom_action_favourites">Favoritos</string>
     <string name="bottom_action_people">Personas</string>
     <string name="bottom_action_rooms">Salas</string>
-    <!-- Home screen -->
     <string name="home_filter_placeholder_home">Filtrar salas</string>
     <string name="home_filter_placeholder_favorites">Filtrar favoritos</string>
     <string name="home_filter_placeholder_people">Filtrar personas</string>
     <string name="home_filter_placeholder_rooms">Filtrar salas</string>
-    <!-- Home fragment -->
     <string name="invitations_header">Invitaciones</string>
     <string name="low_priority_header">Prioridad baja</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">Conversaciones</string>
     <string name="local_address_book_header">Libreta local de direcciones</string>
     <string name="matrix_only_filter">Solamente contactos Matrix</string>
     <string name="no_conversation_placeholder">Sin conversaciones</string>
     <string name="template_no_contact_access_placeholder">No ha permitido a ${app_name} acceder a sus contactos locales</string>
     <string name="no_result_placeholder">Sin resultados</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">Salas</string>
     <string name="rooms_directory_header">Directorio de salas</string>
     <string name="no_room_placeholder">Sin salas</string>
@@ -194,7 +177,6 @@
     <string name="start_video_call">Comenzar Llamada de video</string>
     <string name="option_send_files">Enviar archivos</string>
     <string name="option_take_photo_video">Tomar foto o video</string>
-    <!-- Authentication -->
     <string name="auth_login">Iniciar sesión</string>
     <string name="auth_register">Crear cuenta</string>
     <string name="auth_submit">Entregar</string>
@@ -238,7 +220,6 @@
     <string name="auth_reset_password_email_validation_message">Un correo fue enviado a %s. Una vez que sigas el enlace, seleccione abajo.</string>
     <string name="auth_reset_password_error_unauthorized">Falló la verificación de correo electrónico: asegúrese de haber hecho clic en el correo</string>
     <string name="auth_reset_password_success_message">Su contraseña fue actualizada.\n\nHaz sido desconectado de todos tus dispositivos y las notificaciones están apagadas. Para encender las notificaciones, entre su cuenta en cada dispositivo.</string>
-    <!-- Login Screen -->
     <string name="login_error_must_start_http">El enlace sólo puede comenzar con http[s]://</string>
     <string name="login_error_network_error">Sesión falló: Error con la red</string>
     <string name="login_error_unable_login">Sesión falló</string>
@@ -253,28 +234,20 @@
     <string name="login_error_limit_exceeded">Demasiadas peticiones enviadas</string>
     <string name="login_error_user_in_use">Este nombre de usuario ya está reservado para otra persona</string>
     <string name="login_error_login_email_not_yet">El enlace que no siguió</string>
-    <!-- crypto warnings -->
-    <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lista de Recibos de Lectura</string>
-    <!-- accounts list Screen -->
-    <!-- image size selection -->
     <string name="compression_options">Enviar como </string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Grande</string>
     <string name="compression_opt_list_medium">Mediano</string>
     <string name="compression_opt_list_small">Chico</string>
-    <!-- media upload / download messages -->
     <string name="attachment_cancel_download">"¿Cancelar la descarga?</string>
     <string name="attachment_cancel_upload">¿Cancelar la subida?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
-    <!-- room creation dialog Screen -->
     <string name="yesterday">Ayer</string>
     <string name="today">Hoy</string>
-    <!-- room info dialog Screen -->
     <string name="room_info_room_name">Nombre de la Sala</string>
     <string name="room_info_room_topic">Tema de la Sala</string>
-    <!-- call string -->
     <string name="call_connected">Llamada conectada</string>
     <string name="call_connecting">La llamada se está conectando…</string>
     <string name="call_ended">Llamada finalizada</string>
@@ -287,10 +260,8 @@
     <string name="call_error_ice_failed">Conexión de media falló</string>
     <string name="call_error_camera_init_failed">La cámara no se pudo encender</string>
     <string name="call_error_answered_elsewhere">llamada fue contestada en otra parte</string>
-    <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Tomar una foto o grabar un video"</string>
     <string name="media_picker_cannot_record_video">No pudo grabar video"</string>
-    <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Información</string>
     <string name="template_permissions_rationale_msg_storage">${app_name} necesita tu permiso para entrar en tu almacenaje de fotos y videos para enviar y guardar archivos.\n\nPor favor permite el acceso en el siguiente mensaje para poder enviar archivos desde su dispostivo.</string>
     <string name="template_permissions_rationale_msg_camera">${app_name} necesita tu permiso para usar tu cámara para tomar fotos y hacer llamadas de video.</string>
@@ -303,30 +274,24 @@
 
 ¿Permitir el acceso a ${app_name} para leer tus contactos ?</string>
     <string name="permissions_action_not_performed_missing_permissions">Perdón. Operación no realizada debido a permisos faltantes</string>
-    <!-- medias slider string -->
     <string name="media_slider_saved">Guardado</string>
     <string name="media_slider_saved_message">¿Guardar en Descargas\?</string>
     <string name="yes">SÍ</string>
     <string name="no">NO</string>
     <string name="_continue">Continuar</string>
-    <!-- Actions -->
-    <string name="remove">Retirar</string>
-    <string name="join">Entrar</string>
-    <string name="preview">Preestreno</string>
-    <string name="reject">Rechazar</string>
-    <!-- Room -->
+    <string name="action_remove">Retirar</string>
+    <string name="action_join">Entrar</string>
+    <string name="action_preview">Preestreno</string>
+    <string name="action_reject">Rechazar</string>
     <string name="room_jump_to_first_unread">Saltar al primer mensaje no leído.</string>
-    <!-- Room Preview -->
     <string name="room_preview_invitation_format">Has sido invitado por %s a entrar a esta sala</string>
     <string name="room_preview_unlinked_email_warning">Esta invitación fue enviado a %s, que no esta asociado con esta cuenta.\nTal vez desea entrar con otra cuenta, o añadir este correo electrónico a esta cuenta.</string>
     <string name="room_preview_try_join_an_unknown_room">Estás intentando entrar a %s. ¿Desea entrar para participar en la conversación?</string>
     <string name="room_preview_try_join_an_unknown_room_default">una sala</string>
     <string name="room_preview_room_interactions_disabled">Esto es un preestreno de esta sala. Los interacciones están impedidos.</string>
-    <!-- Chat creation -->
     <string name="room_creation_title">Chat Nuevo</string>
     <string name="room_creation_add_member">Añadir miembro</string>
     <string name="room_title_one_member">1 miembro</string>
-    <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Salir de la sala</string>
     <string name="room_participants_leave_prompt_msg">¿Estás seguro que quieres salir de la sala?</string>
     <string name="room_participants_remove_prompt_msg">¿Estás seguro que quieres quitar a %s de este chat?</string>
@@ -353,14 +318,12 @@
     <string name="room_participants_action_devices_list">Mostrar lista de dispositivos</string>
     <string name="room_participants_power_level_prompt">No podrás deshacer este cambio porque estás provocando que el usuario tenga el mismo poder que el tuyo.\n¿Estás seguro?</string>
     <string name="room_participants_invite_prompt_msg">"¿Estás seguro que quieres invitar a %s que entre en este chat?"</string>
-    <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Invitado por ID</u></string>
     <string name="people_search_local_contacts">CONTACTOS LOCALES (%d)</string>
     <string name="people_search_filter_text">Solmente usuarios de Matrix</string>
     <string name="people_search_invite_by_id_dialog_title">Invitar usuario por ID</string>
     <string name="people_search_invite_by_id_dialog_description">Ingrese una o varias direcciones de correo o ID Matrix</string>
     <string name="people_search_invite_by_id_dialog_hint">Correo o ID Matrix</string>
-    <!--  Chat -->
     <string name="room_menu_search">Buscar</string>
     <string name="room_one_user_is_typing">%s está escribiendo…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s están escribiendo…</string>
@@ -376,7 +339,6 @@
     <string name="room_delete_unsent_messages">Borrar mensajes no enviados</string>
     <string name="room_message_file_not_found">No se pudo encontrar el archivo</string>
     <string name="room_do_not_have_permission_to_post">No tienes permiso para enviar en esta sala</string>
-    <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Confiar</string>
     <string name="ssl_do_not_trust">No confiar</string>
     <string name="ssl_logout_account">Salir</string>
@@ -388,7 +350,6 @@
     <string name="ssl_unexpected_existing_expl">El certificado cambio de el que confiaba tu dispositivo. Esto es MUY RARO. Se recomienda que no aceptes el certificado nuevo.</string>
     <string name="ssl_expected_existing_expl">El certificado cambio de uno que confiaba tu dispositivo a un certificado desconfiado. El servidor posiblemente actualizo su certificado. Pongase en contacto con el administrador de el servidor para la huella esperada.</string>
     <string name="ssl_only_accept">SOLAMENTE acepta el certificado de arriba si coincide con el certificado que publicó el administrador de el servidor.</string>
-    <!-- Room Details -->
     <string name="room_details_title">Detalles de la Sala</string>
     <string name="room_details_people">Personas</string>
     <string name="room_details_files">Archivos</string>
@@ -396,13 +357,11 @@
     <string name="malformed_id">Identificación malformada. Debe ser correo electrónico o identificación de Matrix como \'@localpart:domain\'</string>
     <string name="room_details_people_invited_group_name">INVITADO</string>
     <string name="room_details_people_present_group_name">ENTRO</string>
-    <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Razón por reportar este contenido</string>
     <string name="room_event_action_report_prompt_ignore_user">¿Desea ocultar todos los mensajes de este usuario\?
 \nConsidere que esta acción reiniciará la aplicación y tardar un tiempo.</string>
     <string name="room_event_action_cancel_upload">Cancelar Subida</string>
     <string name="room_event_action_cancel_download">Cancelar Descarga</string>
-    <!-- Search -->
     <string name="search_hint">Buscar</string>
     <string name="search_members_hint">Buscar miembros</string>
     <string name="search_no_results">No hay resultados</string>
@@ -410,28 +369,13 @@
     <string name="tab_title_search_messages">MENSAJES</string>
     <string name="tab_title_search_people">PERSONAS</string>
     <string name="tab_title_search_files">ARCHIVOS</string>
-    <!-- Room recents -->
-    <string name="room_recents_join">ENTRAR</string>
-    <string name="room_recents_directory">DIRECTORIO</string>
-    <string name="room_recents_favourites">FAVORITOS</string>
-    <string name="room_recents_conversations">SALAS</string>
-    <string name="room_recents_low_priority">BAJA PRIORIDAD</string>
-    <string name="room_recents_invites">INVITACIONES</string>
-    <string name="room_recents_start_chat">Comenzar chat</string>
-    <string name="room_recents_create_room">Crear sala</string>
-    <string name="room_recents_join_room">Unirse a la sala</string>
-    <string name="room_recents_join_room_title">Unirse a una sala</string>
-    <string name="room_recents_join_room_prompt">Type a room id or a room alias</string>
-    <!-- Directory -->
     <string name="directory_search_results_title">Buscar directorio</string>
     <string name="directory_searching_title">Buscando directorio…</string>
-    <!-- home room settings -->
     <string name="room_settings_favourite">Destacar</string>
     <string name="room_settings_de_prioritize">Despriorizar</string>
     <string name="room_settings_direct_chat">Chat Directo</string>
     <string name="room_settings_leave_conversation">Salir de la Conversacion</string>
     <string name="room_settings_forget">Forget</string>
-    <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Mensajes</string>
     <string name="room_sliding_menu_settings">Configuraciones</string>
     <string name="room_sliding_menu_version">Versión </string>
@@ -439,7 +383,6 @@
     <string name="room_sliding_menu_third_party_notices">Avisos de partidos terceros</string>
     <string name="room_sliding_menu_copyright">Derechos de autor</string>
     <string name="room_sliding_menu_privacy_policy">Políticas de privacidad</string>
-    <!-- Vector Settings -->
     <string name="settings_profile_picture">Foto de Perfil</string>
     <string name="settings_display_name">Nombre Visible</string>
     <string name="settings_email_address">Correo Electrónico</string>
@@ -467,7 +410,6 @@
     <string name="settings_copyright">Derechos de autor</string>
     <string name="settings_privacy_policy">Políticas de privacidad</string>
     <string name="settings_clear_cache">Borrar memoria cache</string>
-    <!--string name="settings_room_privacy_label">Privacy</string-->
     <string name="settings_user_settings">Configuraciones de Usuario</string>
     <string name="settings_notifications">Notificaciones</string>
     <string name="settings_ignored_users">Usuarios ignorados</string>
@@ -520,37 +462,29 @@
     <string name="settings_phone_number_verification_error_empty_code">Escribe un código de activación</string>
     <string name="settings_phone_number_verification_error">Error en la validación de tu número telefónico</string>
     <string name="settings_phone_number_code">Código</string>
-    <!-- Room Settings -->
-    <!-- room global settings-->
     <string name="room_settings_room_photo">Foto de la Sala</string>
     <string name="room_settings_room_name">Nombre de la Sala</string>
     <string name="room_settings_topic">Tema</string>
     <string name="room_settings_room_tag">Etiqueta de la Sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetado como:</string>
-    <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Destacar</string>
     <string name="room_settings_tag_pref_entry_low_priority">Baja prioridad</string>
     <string name="room_settings_tag_pref_entry_none">Ninguno</string>
-    <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Acceso y Visibilidad</string>
     <string name="room_settings_directory_visibility">Inscribir esta sala en el directorio de salas</string>
     <string name="room_settings_room_access_rules_pref_title">Acceso a la Sala</string>
     <string name="room_settings_room_read_history_rules_pref_title">Historial y Legibilidad de la Sala</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">¿Quien puede leer el historial?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">¿Quien puede entrar a la sala?</string>
-    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Todos</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Solamente miembros (desde seleccionar esta opción)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Solamente miembros (desde su invitación)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Solamente miembros (desde entrar a la sala)</string>
-    <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Para hacer enlace a una sala debe tener una dirección.</string>
     <string name="room_settings_room_access_entry_only_invited">Solamente los invitados</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Los que saben el enlace de esta sala, excepto húespedes</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Los que saben el enlace de la sala, incluso húespedes</string>
-    <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Usuarios prohibidos</string>
-    <!-- advanced -->
     <string name="room_settings_category_advanced_title">Avanzado</string>
     <string name="room_settings_room_internal_id">La identificación interna de esta sala</string>
     <string name="room_settings_addresses_pref_title">Direcciones</string>
@@ -561,7 +495,6 @@
     <string name="room_settings_labs_end_to_end_warnings">Necesitas salir de tu cuenta para encender el cifrado.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Cifrar solamente para dispositivos verificados</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Nunca enviar mensajes cifrados a dispositivos no verificados en esta sala de este dispositivo.</string>
-    <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Esta sala no tiene direcciones locales</string>
     <string name="room_settings_addresses_add_new_address">Dirección nueva (e.g #foo:matrix.org")</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Formato de alias no válido</string>
@@ -575,11 +508,8 @@
     <string name="room_settings_addresses_e2e_enabled">La cifración está encendida en esta sala.</string>
     <string name="room_settings_addresses_e2e_disabled">La cifración está apagada en esta sala.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Encender cifración \n(¡Aviso: no se puede apagar!)</string>
-    <!-- Directory -->
     <string name="directory_title">Directorio</string>
-    <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s estuvo intentando cargar un punto especifico en el historial de esta sala pero no lo pudo encontrar.</string>
-    <!-- encryption dialog -->
     <string name="encryption_information_title">Información de la cifración de Persona-a-Persona</string>
     <string name="encryption_information_device_info">Información de eventos</string>
     <string name="encryption_information_user_id">Identificación de usuario</string>
@@ -621,26 +551,23 @@
     <string name="encryption_information_verify_device_warning">Para verificar que este dispositivo es confiable, por favor contacte el dueño de este dispositivo por otro medio (e.g. cara-a-cara o por llamada) y verifique que la clave de este dispositivo que ellos ven en su página de configuraciones coincide con el de abajo:</string>
     <string name="encryption_information_verify_device_warning2">Si coinciden, seleccione Verificar. Si no, otro esta interceptando este dispositivo y vas a querer bloquearlo.\nEn el futuro, este procceso será mas sofisticado.</string>
     <string name="encryption_information_verify_key_match">Verifico que las claves coinciden</string>
-    <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Esta sala contiene dispositivos desconocidos</string>
     <string name="unknown_devices_alert_message">Esta sala contiene dispositivos desconocidos que no se han verificado.
 Esto significa que no se garantiza que los dispositivos pertenezcan a las personas que dicen de que son.
 Recomendamos que los verifiques todos antes de continuar. Sin embargo, puedes reenviar el mensaje sin verificarlos si prefieres.
 
 Dispositivos desconocidos:</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">Select a room directory</string>
     <string name="directory_server_fail_to_retrieve_server">The server may be unavailable or overloaded</string>
     <string name="directory_server_type_homeserver">Type a homeserver to list public rooms from</string>
     <string name="directory_server_placeholder">Homeserver URL</string>
     <string name="directory_server_all_rooms_on_server">All rooms on %s server</string>
     <string name="directory_server_native_rooms">All native %s rooms</string>
-    <!-- historical -->
     <string name="historical_placeholder">Search for historical</string>
     <string name="notification_sync_in_progress">Sincronizando…</string>
     <string name="loading">Cargando…</string>
-    <string name="download">Descargar</string>
-    <string name="speak">Hablar</string>
+    <string name="action_download">Descargar</string>
+    <string name="action_speak">Hablar</string>
     <string name="offline">Desconectado</string>
     <string name="action_exit">Salir</string>
     <string name="actions">Acciones</string>
@@ -705,7 +632,7 @@ Dispositivos desconocidos:</string>
     <string name="notification_listening_for_events">Detectar eventos</string>
     <string name="notification_noisy_notifications">Notificaciones ruidosas</string>
     <string name="notification_silent_notifications">Notificaciones silenciosas</string>
-    <string name="clear">Borrar</string>
+    <string name="action_clear">Borrar</string>
     <string name="missing_permissions_error">Debido a que faltan permisos, esta acción no es posible.</string>
     <string name="title_activity_bug_report">Informe de error</string>
     <string name="title_activity_group_details">Detalles sobre la comunidad</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index bf41e3c6d1..570d074a2d 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -39,24 +39,16 @@
     <string name="notice_room_third_party_invite">%1$s invitó a %2$s a unirse a la sala</string>
     <string name="notice_room_third_party_registered_invite">%1$s aceptó la invitación para %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** No es posible descifrar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositivo emisor no nos ha enviado las claves para este mensaje.</string>
-    <!-- Room Screen -->
+    <string name="notice_crypto_error_unknown_inbound_session_id">El dispositivo emisor no nos ha enviado las claves para este mensaje.</string>
     <string name="could_not_redact">No se pudo redactar</string>
     <string name="unable_to_send_message">No es posible enviar el mensaje</string>
     <string name="message_failed_to_upload">No se pudo cargar la imagen</string>
-    <!-- general errors -->
     <string name="network_error">Error de red</string>
     <string name="matrix_error">Error de Matrix</string>
-    <!-- Home Screen -->
-    <!-- Last seen time -->
-    <!-- call events -->
-    <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Actualmente no es posible volver a unirse a una sala vacía.</string>
-    <!-- medium friendly name -->
     <string name="medium_email">Dirección de correo electrónico</string>
     <string name="medium_phone_number">Número telefónico</string>
     <string name="summary_user_sent_sticker">%1$s envió una pegatina.</string>
-    <!-- Room display name -->
     <string name="room_displayname_invite_from">Invitación de %s</string>
     <string name="room_displayname_room_invite">Invitación a Sala</string>
     <string name="room_displayname_two_members">%1$s y %2$s</string>
@@ -270,29 +262,27 @@
     <string name="notice_widget_jitsi_removed">Videoconferencia terminada por %1$s</string>
     <string name="notice_widget_jitsi_added_by_you">Has empezado una videoconferencia</string>
     <string name="notice_widget_jitsi_added">Videoconferencia empezada por %1$s</string>
-    <!-- titles -->
     <string name="title_activity_home">Mensajes</string>
     <string name="title_activity_room">Sala</string>
     <string name="title_activity_settings">Ajustes</string>
     <string name="title_activity_member_details">Detalles de Miembro</string>
     <string name="title_activity_historical">Histórico</string>
-    <!-- button names -->
     <string name="ok">Correcto</string>
-    <string name="cancel">Cancelar</string>
-    <string name="save">Guardar</string>
-    <string name="leave">Salir</string>
-    <string name="send">Enviar</string>
-    <string name="resend">Reenviar</string>
-    <string name="redact">Eliminar</string>
-    <string name="quote">Citar</string>
-    <string name="share">Compartir</string>
+    <string name="action_cancel">Cancelar</string>
+    <string name="action_save">Guardar</string>
+    <string name="action_leave">Salir</string>
+    <string name="action_send">Enviar</string>
+    <string name="action_resend">Reenviar</string>
+    <string name="action_redact">Eliminar</string>
+    <string name="action_quote">Citar</string>
+    <string name="action_share">Compartir</string>
     <string name="later">Más Tarde</string>
-    <string name="forward">Reenviar</string>
+    <string name="action_forward">Reenviar</string>
     <string name="permalink">Enlace Permanente</string>
     <string name="view_source">Ver Fuente</string>
     <string name="view_decrypted_source">Ver Fuente Descifrada</string>
-    <string name="delete">Eliminar</string>
-    <string name="rename">Renombrar</string>
+    <string name="action_delete">Eliminar</string>
+    <string name="action_rename">Renombrar</string>
     <string name="report_content">Reportar contenido</string>
     <string name="active_call">Llamada activa</string>
     <string name="ongoing_conference_call">Llamada de conferencia en curso. 
@@ -307,8 +297,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">No se admiten llamadas de conferencia en salas cifradas</string>
     <string name="send_anyway">Enviar de Todos Modos</string>
     <string name="or">o</string>
-    <string name="invite">Invitar</string>
-    <!-- actions -->
+    <string name="action_invite">Invitar</string>
     <string name="action_sign_out">Cerrar sesión</string>
     <string name="action_voice_call">Llamada de Voz</string>
     <string name="action_video_call">Llamada de Vídeo</string>
@@ -319,31 +308,25 @@
     <string name="action_open">Abrir</string>
     <string name="action_close">Cerrar</string>
     <string name="copied_to_clipboard">Copiado al portapapeles</string>
-    <string name="disable">Deshabilitar</string>
-    <!-- dialog titles -->
+    <string name="action_disable">Deshabilitar</string>
     <string name="dialog_title_confirmation">Confirmación</string>
     <string name="dialog_title_warning">Advertencia</string>
-    <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Inicio</string>
     <string name="bottom_action_favourites">Favoritos</string>
     <string name="bottom_action_people">Personas</string>
     <string name="bottom_action_rooms">Salas y Grupos</string>
-    <!-- Home screen -->
     <string name="home_filter_placeholder_home">Filtrar salas</string>
     <string name="home_filter_placeholder_favorites">Filtrar favoritos</string>
     <string name="home_filter_placeholder_people">Filtrar personas</string>
     <string name="home_filter_placeholder_rooms">Filtrar salas</string>
-    <!-- Home fragment -->
     <string name="invitations_header">Invitaciones</string>
     <string name="low_priority_header">Prioridad baja</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">Conversaciones</string>
     <string name="local_address_book_header">Agenda de contactos local</string>
     <string name="matrix_only_filter">Solo contactos de Matrix</string>
     <string name="no_conversation_placeholder">No hay conversaciones</string>
     <string name="template_no_contact_access_placeholder">No permitiste que ${app_name} acceda a tus contactos locales</string>
     <string name="no_result_placeholder">No hay resultados</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">Salas</string>
     <string name="rooms_directory_header">Directorio de salas</string>
     <string name="no_room_placeholder">No hay salas</string>
@@ -379,7 +362,6 @@
     <string name="start_video_call">Iniciar Llamada de Vídeo</string>
     <string name="option_send_files">Enviar archivos</string>
     <string name="option_take_photo_video">Tomar foto o vídeo</string>
-    <!-- Authentication -->
     <string name="auth_login">Iniciar sesión</string>
     <string name="auth_register">Crear cuenta</string>
     <string name="auth_submit">Enviar</string>
@@ -427,7 +409,6 @@
     <string name="auth_reset_password_success_message">Tu contraseña fue restablecida.
 \n
 \nSe ha cerrado sesión en todas tus sesiones y ya no recibirás notificaciones push. Para volver a habilitar las notificaciones, vuelve a iniciar sesión en cada dispositivo.</string>
-    <!-- Login Screen -->
     <string name="login_error_must_start_http">La URL debe comenzar con http[s]://</string>
     <string name="login_error_network_error">No es posible iniciar sesión: Error de red</string>
     <string name="login_error_unable_login">No es posible iniciar sesión</string>
@@ -442,28 +423,20 @@
     <string name="login_error_limit_exceeded">Se enviaron demasiadas solicitudes</string>
     <string name="login_error_user_in_use">Este nombre de usuario ya está en uso</string>
     <string name="login_error_login_email_not_yet">El enlace del correo electrónico que aún no se ha seguido</string>
-    <!-- crypto warnings -->
-    <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lista de Recibos de Lectura</string>
-    <!-- accounts list Screen -->
-    <!-- image size selection -->
     <string name="compression_options">Enviar como </string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Grande</string>
     <string name="compression_opt_list_medium">Mediano</string>
     <string name="compression_opt_list_small">Pequeño</string>
-    <!-- media upload / download messages -->
     <string name="attachment_cancel_download">"¿Cancelar la descarga?</string>
     <string name="attachment_cancel_upload">¿Cancelar la subida?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dmin %2$dseg</string>
-    <!-- room creation dialog Screen -->
     <string name="yesterday">Ayer</string>
     <string name="today">Hoy</string>
-    <!-- room info dialog Screen -->
     <string name="room_info_room_name">Nombre de la sala</string>
     <string name="room_info_room_topic">Tema de la sala</string>
-    <!-- call string -->
     <string name="call_connected">Llamada conectada</string>
     <string name="call_connecting">Conectando llamada…</string>
     <string name="call_ended">Llamada finalizada</string>
@@ -476,10 +449,8 @@
     <string name="call_error_ice_failed">Falló la Conexión de Medios</string>
     <string name="call_error_camera_init_failed">No se puede iniciar la cámara</string>
     <string name="call_error_answered_elsewhere">llamada contestada en otra parte</string>
-    <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Tomar una foto o un vídeo</string>
     <string name="media_picker_cannot_record_video">No se puede grabar vídeo</string>
-    <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Información</string>
     <string name="template_permissions_rationale_msg_storage">${app_name} necesita permiso para acceder a tu biblioteca de fotos y vídeos para enviar y guardar archivos adjuntos.
 \n
@@ -502,31 +473,25 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
 \n
 \n¿Permitir que ${app_name} acceda a tus contactos \?</string>
     <string name="permissions_action_not_performed_missing_permissions">Lo sentimos. Acción no realizada, debido a que faltan permisos</string>
-    <!-- medias slider string -->
     <string name="media_slider_saved">Guardado</string>
     <string name="media_slider_saved_message">¿Guardar en descargas?</string>
     <string name="yes">SÍ</string>
     <string name="no">NO</string>
     <string name="_continue">Continuar</string>
-    <!-- Actions -->
-    <string name="remove">Eliminar</string>
-    <string name="join">Unirse</string>
-    <string name="preview">Vista Previa</string>
-    <string name="reject">Rechazar</string>
-    <!-- Room -->
+    <string name="action_remove">Eliminar</string>
+    <string name="action_join">Unirse</string>
+    <string name="action_preview">Vista Previa</string>
+    <string name="action_reject">Rechazar</string>
     <string name="room_jump_to_first_unread">Mensajes no leídos.</string>
-    <!-- Room Preview -->
     <string name="room_preview_invitation_format">Has sido invitado por %s a unirte a esta sala</string>
     <string name="room_preview_unlinked_email_warning">Esta invitación fue enviada a %s, que no esta asociado a esta cuenta.
 \nQuizás quieras iniciar sesión con otra cuenta, o añadir este correo electrónico a esta cuenta.</string>
     <string name="room_preview_try_join_an_unknown_room">Estás intentando acceder a %s. ¿Quieres unirte para participar en la discusión?</string>
     <string name="room_preview_try_join_an_unknown_room_default">una sala</string>
     <string name="room_preview_room_interactions_disabled">Esta es una vista previa de esta sala. Las interacciones dentro de la sala se han deshabilitado.</string>
-    <!-- Chat creation -->
     <string name="room_creation_title">Nueva Conversación</string>
     <string name="room_creation_add_member">Añadir miembro</string>
     <string name="room_title_one_member">1 miembro</string>
-    <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Salir de la sala</string>
     <string name="room_participants_leave_prompt_msg">¿Seguro que quieres salir de la sala?</string>
     <string name="room_participants_remove_prompt_msg">¿Seguro que quieres eliminar a %s de esta conversación?</string>
@@ -554,14 +519,12 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_participants_power_level_prompt">No podrás deshacer este cambio porque estás ascendiendo al usuario al mismo nivel de autoridad que tú.
 \n¿Estás seguro\?</string>
     <string name="room_participants_invite_prompt_msg">¿Seguro que quieres invitar a %s a esta conversación?</string>
-    <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Invitar por ID</u></string>
     <string name="people_search_local_contacts">CONTACTOS LOCALES (%d)</string>
     <string name="people_search_filter_text">Solo usuarios de Matrix</string>
     <string name="people_search_invite_by_id_dialog_title">Invitar usuario por ID</string>
     <string name="people_search_invite_by_id_dialog_description">Por favor, ingresa una o más direcciones de correo electrónico o ID de Matrix</string>
     <string name="people_search_invite_by_id_dialog_hint">Correo electrónico o ID de Matrix</string>
-    <!--  Chat -->
     <string name="room_menu_search">Buscar</string>
     <string name="room_one_user_is_typing">%s está escribiendo…</string>
     <string name="room_two_users_are_typing">%1$s y %2$s están escribiendo…</string>
@@ -577,7 +540,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_delete_unsent_messages">Eliminar mensajes no enviados</string>
     <string name="room_message_file_not_found">Archivo no encontrado</string>
     <string name="room_do_not_have_permission_to_post">No tienes permiso para publicar en esta sala</string>
-    <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Confiar</string>
     <string name="ssl_do_not_trust">No confiar</string>
     <string name="ssl_logout_account">Cerrar Sesión</string>
@@ -589,7 +551,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="ssl_unexpected_existing_expl">El certificado cambió de uno que era confiable para tu teléfono. Esto es MUY INUSUAL. Se recomienda NO ACEPTAR este nuevo certificado.</string>
     <string name="ssl_expected_existing_expl">El certificado cambió de uno que era confiable a uno que no es confiable. El servidor puede haber renovado su certificado. Contacta al administrador del servidor para obtener la huella digital.</string>
     <string name="ssl_only_accept">Solo acepta el certificado si el administrador del servidor ha publicado una huella digital que coincide con la anterior.</string>
-    <!-- Room Details -->
     <string name="room_details_title">Detalles de Sala</string>
     <string name="room_details_people">Personas</string>
     <string name="room_details_files">Archivos</string>
@@ -597,14 +558,12 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="malformed_id">ID mal formada. Debería ser una dirección de correo electrónico o una ID de Matrix como \'@partelocal:dominio\'</string>
     <string name="room_details_people_invited_group_name">INVITADOS</string>
     <string name="room_details_people_present_group_name">SE UNIERON</string>
-    <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Motivo para reportar este contenido</string>
     <string name="room_event_action_report_prompt_ignore_user">¿Quieres ocultar todos los mensajes de este usuario\?
 \n
 \nTen en cuenta que esta acción reiniciará la aplicación y puede tardar algo de tiempo.</string>
     <string name="room_event_action_cancel_upload">Cancelar Subida</string>
     <string name="room_event_action_cancel_download">Cancelar Descarga</string>
-    <!-- Search -->
     <string name="search_hint">Buscar</string>
     <string name="search_members_hint">Filtrar miembros de la sala</string>
     <string name="search_no_results">No hay resultados</string>
@@ -612,28 +571,13 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="tab_title_search_messages">MENSAJES</string>
     <string name="tab_title_search_people">PERSONAS</string>
     <string name="tab_title_search_files">ARCHIVOS</string>
-    <!-- Room recents -->
-    <string name="room_recents_join">UNIRSE</string>
-    <string name="room_recents_directory">DIRECTORIO</string>
-    <string name="room_recents_favourites">FAVORITOS</string>
-    <string name="room_recents_conversations">SALAS</string>
-    <string name="room_recents_low_priority">PRIORIDAD BAJA</string>
-    <string name="room_recents_invites">INVITACIONES</string>
-    <string name="room_recents_start_chat">Iniciar conversación</string>
-    <string name="room_recents_create_room">Crear sala</string>
-    <string name="room_recents_join_room">Unirse a la sala</string>
-    <string name="room_recents_join_room_title">Unirse a una sala</string>
-    <string name="room_recents_join_room_prompt">Escribe una ID o alias de sala</string>
-    <!-- Directory -->
     <string name="directory_search_results_title">Explorar directorio</string>
     <string name="directory_searching_title">Buscando directorio…</string>
-    <!-- home room settings -->
     <string name="room_settings_favourite">Agregar a Favoritos</string>
     <string name="room_settings_de_prioritize">Dejar de priorizar</string>
     <string name="room_settings_direct_chat">Conversación Directa</string>
     <string name="room_settings_leave_conversation">Salir de la Conversación</string>
     <string name="room_settings_forget">Olvidar</string>
-    <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Mensajes</string>
     <string name="room_sliding_menu_settings">Ajustes</string>
     <string name="room_sliding_menu_version">Versión</string>
@@ -641,7 +585,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_sliding_menu_third_party_notices">Avisos de terceros</string>
     <string name="room_sliding_menu_copyright">Derechos de autor</string>
     <string name="room_sliding_menu_privacy_policy">Política de privacidad</string>
-    <!-- Vector Settings -->
     <string name="settings_profile_picture">Imagen de Perfil</string>
     <string name="settings_display_name">Nombre Público</string>
     <string name="settings_email_address">Correo Electrónico</string>
@@ -669,7 +612,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_copyright">Derechos de autor</string>
     <string name="settings_privacy_policy">Política de privacidad</string>
     <string name="settings_clear_cache">Borrar caché</string>
-    <!--string name="settings_room_privacy_label">Privacy</string-->
     <string name="settings_user_settings">Ajustes de usuario</string>
     <string name="settings_notifications">Notificaciones</string>
     <string name="settings_ignored_users">Usuarios ignorados</string>
@@ -725,37 +667,29 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_phone_number_verification_error_empty_code">Ingresa un código de activación</string>
     <string name="settings_phone_number_verification_error">Error en la validación de tu número telefónico</string>
     <string name="settings_phone_number_code">Código</string>
-    <!-- Room Settings -->
-    <!-- room global settings-->
     <string name="room_settings_room_photo">Imagen de Sala</string>
     <string name="room_settings_room_name">Nombre de Sala</string>
     <string name="room_settings_topic">Tema</string>
     <string name="room_settings_room_tag">Etiqueta de Sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetado como:</string>
-    <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Agregar a Favoritos</string>
     <string name="room_settings_tag_pref_entry_low_priority">Prioridad baja</string>
     <string name="room_settings_tag_pref_entry_none">Ninguno</string>
-    <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Acceso y visibilidad</string>
     <string name="room_settings_directory_visibility">Listar esta sala en el directorio de salas</string>
     <string name="room_settings_room_access_rules_pref_title">Acceso a Sala</string>
     <string name="room_settings_room_read_history_rules_pref_title">Legibilidad del Historial de la Sala</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">¿Quién puede leer el historial?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">¿Quién puede acceder a esta sala?</string>
-    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Todos</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Solo miembros (desde el momento en que se selecciona esta opción)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Solo miembros (desde que fueron invitados)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Solo miembros (desde que se unieron)</string>
-    <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Para crear un enlace a una sala, debe tener una dirección.</string>
     <string name="room_settings_room_access_entry_only_invited">Solo personas que han sido invitadas</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Cualquier persona que conozca el enlace a esta sala, excepto invitados</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Cualquier persona que conozca el enlace a esta sala, incluyendo invitados</string>
-    <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Usuarios vetados</string>
-    <!-- advanced -->
     <string name="room_settings_category_advanced_title">Avanzado</string>
     <string name="room_settings_room_internal_id">La ID interna de esta sala</string>
     <string name="room_settings_addresses_pref_title">Direcciones</string>
@@ -766,7 +700,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_settings_labs_end_to_end_warnings">Necesitas cerrar sesión para poder habilitar el cifrado.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Cifrar solo a sesiones verificadas</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Nunca enviar mensajes cifrados a sesiones sin verificar en esta sala desde esta sesión.</string>
-    <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Esta sala no tiene direcciones locales</string>
     <string name="room_settings_addresses_add_new_address">Dirección nueva (ej. #foo:matrix.org)</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Formato de alias inválido</string>
@@ -781,11 +714,8 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_settings_addresses_e2e_disabled">El cifrado está deshabilitado en esta sala.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Habilitar cifrado
 \n(advertencia: ¡no se puede volver a deshabilitar!)</string>
-    <!-- Directory -->
     <string name="directory_title">Directorio</string>
-    <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s estaba intentando cargar un momento específico en la línea de tiempo de esta sala pero no pudo encontrarlo.</string>
-    <!-- encryption dialog -->
     <string name="encryption_information_title">Información de cifrado Extremo-a-Extremo</string>
     <string name="encryption_information_device_info">Información de eventos</string>
     <string name="encryption_information_user_id">ID de Usuario</string>
@@ -829,21 +759,18 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="encryption_information_verify_device_warning">Para verificar que esta sesión es confiable, por favor contacta a su dueño por algún otro medio (ej. cara a cara o por teléfono) y pregúntale si la clave que ve en sus Ajustes de Usuario para esta sesión coincide con la clave a continuación:</string>
     <string name="encryption_information_verify_device_warning2">Si coincide, presione el botón de verificar a continuación. Si no coincide, entonces alguien está interceptando esta sesión y probablemente debería prohibirlo. En el futuro, este proceso de verificación será más sofisticado.</string>
     <string name="encryption_information_verify_key_match">Verifico que las claves coinciden</string>
-    <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">La sala contiene sesiones desconocidas</string>
     <string name="unknown_devices_alert_message">Esta sala contiene sesiones desconocidas que no han sido verificadas.
 \nEsto significa que no hay garantía de que las sesiones pertenezcan a los usuarios a los que dicen pertenecer.
 \nRecomendamos que hagas el proceso de verificación por cada sesión antes de continuar. Pero puedes reenviar el mensaje sin verificarlas si prefieres.
 \n
 \nSesiones desconocidas:</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">Selecciona un directorio de salas</string>
     <string name="directory_server_fail_to_retrieve_server">El servidor puede estar no disponible o sobrecargado</string>
     <string name="directory_server_type_homeserver">Escribe un servidor doméstico desde donde listar las salas públicas</string>
     <string name="directory_server_placeholder">Nombre del servidor</string>
     <string name="directory_server_all_rooms_on_server">Todas las salas en el servidor %s</string>
     <string name="directory_server_native_rooms">Todas las salas nativas de %s</string>
-    <!-- historical -->
     <string name="historical_placeholder">Buscar en el historial</string>
     <string name="settings_user_interface">Interfaz de usuario</string>
     <string name="settings_interface_language">Idioma</string>
@@ -889,7 +816,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="widget_creation_failure">La creación del componente falló</string>
     <string name="settings_labs_create_conference_with_jitsi">Crear llamadas de conferencia con jitsi</string>
     <string name="widget_delete_message_confirmation">¿Seguro que quieres eliminar el widget de esta sala\?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">No es posible crear el componente.</string>
     <string name="widget_integration_failed_to_send_request">El envío de la solicitud falló.</string>
     <string name="widget_integration_positive_power_level">El nivel de autoridad debe ser un número entero positivo.</string>
@@ -900,19 +826,15 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="widget_integration_room_not_visible">La sala %s no está visible.</string>
     <string name="room_add_matrix_apps">Añadir aplicaciones de Matrix</string>
     <string name="settings_labs_native_camera">Utilizar cámara nativa</string>
-    <!-- share keys -->
     <string name="you_added_a_new_device">Has añadido una nueva sesión \'%s\', que está solicitando claves de cifrado.</string>
     <string name="your_unverified_device_requesting">Tu sesión sin verificar \'%s\' está solicitando claves de cifrado.</string>
     <string name="start_verification">Iniciar verificación</string>
     <string name="share_without_verifying">Compartir sin verificar</string>
     <string name="ignore_request">Ignorar solicitud</string>
-    <!-- conference call -->
     <string name="conference_call_warning_title">¡Advertencia!</string>
     <string name="conference_call_warning_message">Las llamadas de conferencia están en desarrollo y pueden no ser confiables.</string>
-    <!-- slash commands -->
     <string name="command_error">Error de comando</string>
     <string name="unrecognized_command">Comando no reconocido: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Desactivado</string>
     <string name="notification_noisy">Ruidoso</string>
     <string name="encrypted_message">Mensaje cifrado</string>
@@ -950,7 +872,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="community_name_hint">Ejemplo</string>
     <string name="community_id">ID de Comunidad</string>
     <string name="community_id_hint">ejemplo</string>
-    <!-- group details -->
     <string name="group_details_home">Inicio</string>
     <string name="group_details_people">Personas</string>
     <string name="group_details_rooms">Salas</string>
@@ -1010,7 +931,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
         <item quantity="one">%d componente activo</item>
         <item quantity="other">%d componentes activos</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="title_activity_choose_sticker">Enviar una pegatina</string>
     <string name="no_sticker_application_dialog_content">Actualmente no tienes ningún paquete de stickers habilitado.
 \n
@@ -1040,7 +960,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_notification_privacy_message_content_not_shown">• Las notificaciones <b>no mostrarán el contenido del mensaje</b></string>
     <string name="settings_deactivate_account_section">Desactivar cuenta</string>
     <string name="settings_deactivate_my_account">Desactivar mi cuenta</string>
-    <string name="download">Descargar</string>
+    <string name="action_download">Descargar</string>
     <string name="settings_opt_in_of_analytics_ok">Sí, ¡quiero ayudar!</string>
     <string name="startup_notification_privacy_button_grant">Conceder permiso</string>
     <string name="option_send_voice">Enviar audio</string>
@@ -1051,10 +971,10 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="startup_notification_privacy_button_other">Elige otra opción</string>
     <string name="widget_integration_missing_parameter">Falta un parámetro requerido.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Solicitud enviada</string>
-    <string name="speak">Conversar</string>
+    <string name="action_speak">Conversar</string>
     <string name="template_e2e_re_request_encryption_key_dialog_content">Por favor, inicia ${app_name} en otro dispositivo que pueda descifrar el mensaje para que pueda enviar las claves a esta sesión.</string>
     <string name="dialog_title_third_party_licences">Licencias de terceros</string>
-    <string name="clear">Borrar</string>
+    <string name="action_clear">Borrar</string>
     <string name="go_on_with">continuar con…</string>
     <string name="error_no_external_application_found">Lo sentimos, no se encontró ninguna aplicación externa para completar esta acción.</string>
     <string name="e2e_re_request_encryption_key">Volver a solicitar las claves de cifrado de tus otras sesiones.</string>
@@ -1144,7 +1064,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="merged_events_expand">expandir</string>
     <string name="merged_events_collapse">colapsar</string>
     <string name="call_anyway">Llamar de todos modos</string>
-    <string name="accept">Aceptar</string>
+    <string name="action_accept">Aceptar</string>
     <string name="auth_accept_policies">Por favor revisa y acepta las reglas de este servidor doméstico:</string>
     <string name="settings_call_category">Llamadas</string>
     <string name="template_settings_call_ringtone_use_app_ringtone">Usar el tono de llamada normal de ${app_name} para llamadas entrantes</string>
@@ -1167,11 +1087,11 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="are_you_sure">¿Estás seguro\?</string>
     <string name="backup">Copia de seguridad</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Perderá el acceso a sus mensajes cifrados si cierra sesión sin hacer una copia de seguridad de sus claves.</string>
-    <string name="stay">Quedarse</string>
-    <string name="skip">Saltar</string>
+    <string name="action_stay">Quedarse</string>
+    <string name="action_skip">Saltar</string>
     <string name="done">Hecho</string>
-    <string name="abort">Cancelar</string>
-    <string name="ignore">Ignorar</string>
+    <string name="action_abort">Cancelar</string>
+    <string name="action_ignore">Ignorar</string>
     <string name="action_mark_room_read">Marcar como leído</string>
     <string name="auth_login_sso">Iniciar sesión con un solo registro</string>
     <string name="login_error_ssl_handshake">Tu dispositivo usa una versión anticuada e insegura del protocolo de seguridad TLS. Por tu seguridad no puedes conectarte</string>
@@ -1492,8 +1412,8 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_list_rooms_empty_title">Salas</string>
     <string name="room_list_rooms_empty_body">Tus salas se mostrarán aquí. Pulsa el botón + abajo a la derecha para buscar o crear salas propias.</string>
     <string name="title_activity_emoji_reaction_picker">Reacciones</string>
-    <string name="reactions_agree">De acuerdo</string>
-    <string name="reactions_like">Me gusta</string>
+    <string name="action_agree">De acuerdo</string>
+    <string name="action_like">Me gusta</string>
     <string name="message_add_reaction">Añadir reacción</string>
     <string name="message_view_reaction">Ver reacciones</string>
     <string name="reactions">Reacciones</string>
@@ -1528,10 +1448,10 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="send_suggestion_content">Por favor escriba su sugerencia a continuación.</string>
     <string name="send_suggestion_report_placeholder">Describa su sugerencia aquí</string>
     <string name="none">Ninguno</string>
-    <string name="revoke">Revocar</string>
-    <string name="disconnect">Desconectar</string>
-    <string name="review">Revisar</string>
-    <string name="decline">Declinar</string>
+    <string name="action_revoke">Revocar</string>
+    <string name="action_disconnect">Desconectar</string>
+    <string name="action_review">Revisar</string>
+    <string name="action_decline">Declinar</string>
     <string name="people_no_identity_server">No se ha configurado un servidor de identidad.</string>
     <string name="call_failed_no_ice_title">La llamada ha fallado por un servidor mal configurado</string>
     <string name="call_failed_no_ice_use_alt">Intente usar %s</string>
@@ -1777,9 +1697,9 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="login_login_with_email_error">La dirección de coreo electrónico no está asociada a ninguna cuenta.</string>
     <string name="login_reset_password_on">Reiniciar contraseña en %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">¡Las claves ya están al día!</string>
-    <string name="play_video">Reproducir</string>
-    <string name="pause_video">Pausar</string>
-    <string name="dismiss">Descartar</string>
+    <string name="action_play">Reproducir</string>
+    <string name="action_pause">Pausar</string>
+    <string name="action_dismiss">Descartar</string>
     <string name="action_copy">Copiar</string>
     <string name="dialog_title_success">Correcto</string>
     <string name="bottom_action_notification">Notificaciones</string>
@@ -1966,7 +1886,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="no_connectivity_to_the_server_indicator_airplane">Modo Avión Activado</string>
     <string name="settings_dev_tools">Herramientas de desarrollo</string>
     <string name="settings_account_data">Datos de cuenta</string>
-    <string name="poll_item_selected_aria">Seleccionar Opcion</string>
     <string name="new_signin">Nuevo inicio de sesión</string>
     <string name="enter_secret_storage_passphrase_warning">Advertencia:</string>
     <string name="message_action_item_redact">Eliminar…</string>
@@ -2226,14 +2145,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="verification_profile_device_new_signing">%1$s (%2$s) iniciado sesión con una nueva sesión:</string>
     <string name="verification_profile_device_untrust_info">Hasta que este usuario confíe en esta sesión, los mensajes enviados hacia y desde ella se etiquetan con advertencias. Alternativamente, puede verificarlo manualmente.</string>
     <string name="qr_code_scanned_by_other_notice">¡Casi ahí! ¿Es %s muestra el mismo escudo\?</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d voto</item>
-        <item quantity="other">%d votos</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d voto - Resultados finales</item>
-        <item quantity="other">%d votos - Resultados finales</item>
-    </plurals>
     <string name="command_description_poll">Crea una encuesta simple</string>
     <string name="verification_cannot_access_other_session">Use una contraseña o clave de recuperación</string>
     <string name="verification_use_passphrase">Si no puede acceder a una sesión existente</string>
@@ -2342,7 +2253,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
 \n${app_name} de escritorio</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">u otro cliente Matrix con capacidad de firma cruzada</string>
+    <string name="or_other_mx_capable_client">u otro cliente Matrix con capacidad de firma cruzada</string>
     <string name="template_use_latest_app">Utilice la última versión de ${app_name} en sus otros dispositivos:</string>
     <string name="command_description_discard_session">Obliga a descartar la sesión de grupo saliente actual en una sala cifrada</string>
     <string name="command_description_discard_session_not_handled">Solo se admite en salas cifradas</string>
@@ -2438,7 +2349,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
 \n
 \nTus mensajes están asegurados con un candado. Solo tú y tú destinatario tenéis las llaves especiales para descifrarlos.</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Los mensajes aquí no están cifrados Extremo-a-Extremo.</string>
-    <string name="sent_a_bot_buttons">Botones de Bot</string>
     <string name="sent_a_poll">Encuesta</string>
     <string name="room_list_quick_actions_low_priority_remove">Eliminar de baja prioridad</string>
     <string name="room_list_quick_actions_low_priority_add">Añadir a Baja prioridad</string>
@@ -2461,7 +2371,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">No posee permisos para iniciar una llamada</string>
     <string name="no_permissions_to_start_webrtc_call">No posee permisos para iniciar una llamada en esta sala</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">No posee permisos para iniciar una conferencia</string>
-    <string name="reset">Resetear</string>
+    <string name="action_reset">Resetear</string>
     <string name="warning_unsaved_change_discard">Descartar cambios</string>
     <string name="warning_unsaved_change">Hay cambios sin salvar. ¿Descartar los cambios\?</string>
     <string name="warning_room_not_created_yet">La sala todavía no ha sido creada. ¿Cancelar la creación\?</string>
@@ -2626,7 +2536,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="invite_just_to_this_room">Sólo a esta sala</string>
     <string name="invite_to_space_with_name">Invitar a %s</string>
     <string name="invite_by_link">Compartir enlace</string>
-    <string name="invite_by_mxid">Invitar por nombre de usuario</string>
+    <string name="invite_by_username">Invitar por nombre de usuario</string>
     <string name="invite_by_email">Invitar por correo electrónico</string>
     <string name="invite_to_space">Invitar a %s</string>
     <string name="invite_people_to_your_space">Invitar gente a tu espacio</string>
@@ -2930,7 +2840,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="discovery_invite">Invitar por correo electrónico, buscar contactos y más…</string>
     <string name="finish_setting_up_discovery">Terminé de configurar el descubrimiento.</string>
     <string name="create_space_identity_server_info_none">Actualmente no está utilizando un servidor de identidad. Para invitar a compañeros de equipo y ser detectado por ellos, configure uno a continuación.</string>
-    <string name="invite_by_mxid_or_mail">Invitar por nombre de usuario o correo</string>
+    <string name="invite_by_username_or_mail">Invitar por nombre de usuario o correo</string>
     <string name="create_spaces_invite_public_header_desc">Asegúrate que las personas adecuadas tengan acceso a %s. Puede invitar a más persona más tarde.</string>
     <string name="create_spaces_invite_public_header">¿Quiénes son tus compañeros de equipo\?</string>
     <string name="command_description_add_to_space">Agregar al espacio dado</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 3e55a23cc8..43a98881f2 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -44,7 +44,7 @@
     <string name="notice_room_third_party_revoked_invite">%1$s võttis tagasi jututoaga liitumise kutse kasutajalt %2$s</string>
     <string name="notice_room_third_party_registered_invite">%1$s võttis vastu kutse %2$s nimel</string>
     <string name="notice_crypto_unable_to_decrypt">** Ei õnnestu dekrüptida: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Sõnumi saatja seade ei ole selle sõnumi jaoks saatnud dekrüptimisvõtmeid.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Sõnumi saatja seade ei ole selle sõnumi jaoks saatnud dekrüptimisvõtmeid.</string>
     <string name="could_not_redact">Ei saanud muuta sõnumit</string>
     <string name="unable_to_send_message">Sõnumi saatmine ei õnnestunud</string>
     <string name="message_failed_to_upload">Pildi üleslaadimine ei õnnestunud</string>
@@ -296,28 +296,28 @@
     <string name="dialog_title_third_party_licences">Kolmandate osapoolte litsentsid</string>
     <string name="loading">Laeme…</string>
     <string name="ok">Sobib</string>
-    <string name="cancel">Tühista</string>
-    <string name="save">Salvesta</string>
-    <string name="leave">Lahku</string>
-    <string name="stay">Jää</string>
-    <string name="send">Saada</string>
-    <string name="resend">Saada uuesti</string>
-    <string name="redact">Eemalda</string>
-    <string name="quote">Tsiteeri</string>
-    <string name="download">Laadi alla</string>
-    <string name="share">Jaga</string>
-    <string name="speak">Räägi</string>
-    <string name="clear">Eemalda</string>
+    <string name="action_cancel">Tühista</string>
+    <string name="action_save">Salvesta</string>
+    <string name="action_leave">Lahku</string>
+    <string name="action_stay">Jää</string>
+    <string name="action_send">Saada</string>
+    <string name="action_resend">Saada uuesti</string>
+    <string name="action_redact">Eemalda</string>
+    <string name="action_quote">Tsiteeri</string>
+    <string name="action_download">Laadi alla</string>
+    <string name="action_share">Jaga</string>
+    <string name="action_speak">Räägi</string>
+    <string name="action_clear">Eemalda</string>
     <string name="later">Hiljem</string>
-    <string name="forward">Edasta</string>
+    <string name="action_forward">Edasta</string>
     <string name="permalink">Püsiviide</string>
     <string name="view_source">Lähtekood</string>
     <string name="view_decrypted_source">Näita dekrüptitud lähtekoodi</string>
-    <string name="delete">Kustuta</string>
-    <string name="rename">Muuda nime</string>
+    <string name="action_delete">Kustuta</string>
+    <string name="action_rename">Muuda nime</string>
     <string name="none">Ei midagi</string>
-    <string name="revoke">Tunnista kehtetuks</string>
-    <string name="disconnect">Katkesta ühendus</string>
+    <string name="action_revoke">Tunnista kehtetuks</string>
+    <string name="action_disconnect">Katkesta ühendus</string>
     <string name="report_content">Teata kahtlasest sisust</string>
     <string name="active_call">Kõne on käsil</string>
     <string name="ongoing_conference_call">Konverentsikõne on käsil.
@@ -334,15 +334,15 @@
     <string name="call_anyway">Helista siiski</string>
     <string name="send_anyway">Saada ikkagi</string>
     <string name="or">või</string>
-    <string name="invite">Kutsu</string>
+    <string name="action_invite">Kutsu</string>
     <string name="offline">Võrgust väljas</string>
-    <string name="accept">Võta vastu</string>
-    <string name="skip">Jäta vahele</string>
+    <string name="action_accept">Võta vastu</string>
+    <string name="action_skip">Jäta vahele</string>
     <string name="done">Valmis</string>
-    <string name="abort">Katkesta</string>
-    <string name="ignore">Eira</string>
-    <string name="review">Vaata üle</string>
-    <string name="decline">Keeldu</string>
+    <string name="action_abort">Katkesta</string>
+    <string name="action_ignore">Eira</string>
+    <string name="action_review">Vaata üle</string>
+    <string name="action_decline">Keeldu</string>
     <string name="action_exit">Välju</string>
     <string name="actions">Tegevused</string>
     <string name="action_sign_out">Logi välja</string>
@@ -357,7 +357,7 @@
     <string name="action_open">Ava</string>
     <string name="action_close">Sulge</string>
     <string name="copied_to_clipboard">Kopeeritud lõikelauale</string>
-    <string name="disable">Lülita välja</string>
+    <string name="action_disable">Lülita välja</string>
     <string name="dialog_title_confirmation">Kinnitus</string>
     <string name="dialog_title_warning">Hoiatus</string>
     <string name="dialog_title_error">Viga</string>
@@ -508,9 +508,9 @@
     <string name="login_error_not_json">Ei sisaldanud korrektset JSON\'it</string>
     <string name="login_error_limit_exceeded">Liiga palju samaaegseid sisselogimispäringuid</string>
     <string name="login_error_user_in_use">See kasutajanimi on juba kasutusel</string>
-    <string name="play_video">Esita</string>
-    <string name="pause_video">Peata</string>
-    <string name="dismiss">Loobu</string>
+    <string name="action_play">Esita</string>
+    <string name="action_pause">Peata</string>
+    <string name="action_dismiss">Loobu</string>
     <string name="action_copy">Kopeeri</string>
     <string name="dialog_title_success">Õnnestus</string>
     <string name="bottom_action_notification">Teavitused</string>
@@ -597,10 +597,10 @@
     <string name="yes">JAH</string>
     <string name="no">EI</string>
     <string name="_continue">Jätka</string>
-    <string name="remove">Eemalda</string>
-    <string name="join">Liitu</string>
-    <string name="preview">Eelvaade</string>
-    <string name="reject">Hülga</string>
+    <string name="action_remove">Eemalda</string>
+    <string name="action_join">Liitu</string>
+    <string name="action_preview">Eelvaade</string>
+    <string name="action_reject">Hülga</string>
     <string name="room_sync_in_progress">Sünkroniseerin…</string>
     <string name="room_jump_to_first_unread">Mine lugemata sõnumite juurde</string>
     <string name="room_preview_invitation_format">Sa oled kutsutud siia jututuppa %s poolt</string>
@@ -636,16 +636,6 @@
     <string name="tab_title_search_messages">SÕNUMID</string>
     <string name="tab_title_search_people">INIMESED</string>
     <string name="tab_title_search_files">FAILID</string>
-    <string name="room_recents_join">LIITU</string>
-    <string name="room_recents_favourites">LEMMIKUD</string>
-    <string name="room_recents_conversations">JUTUTOAD</string>
-    <string name="room_recents_low_priority">VÄHETÄHTIS</string>
-    <string name="room_recents_invites">KUTSED</string>
-    <string name="room_recents_start_chat">Alusta vestlust</string>
-    <string name="room_recents_create_room">Loo jututuba</string>
-    <string name="room_recents_join_room">Liitu jututoaga</string>
-    <string name="room_recents_join_room_title">Liitu jututoaga</string>
-    <string name="room_recents_join_room_prompt">Sisesta jututoa tunnus, nimi või alias</string>
     <string name="directory_search_results_title">Sirvi kataloogi</string>
     <string name="room_settings_direct_chat">Otsevestlus</string>
     <string name="active_widget_view_action">VAATA</string>
@@ -787,8 +777,8 @@
     <string name="sas_error_m_timeout">Verifitseerimisprotsess aegus</string>
     <string name="room_list_rooms_empty_body">Sinu jututoad kuvatakse siin. Olemasolevate jututubade leidmiseks või uute tegemiseks klõpsi all paremal nurgas asuvat + nuppu.</string>
     <string name="title_activity_emoji_reaction_picker">Reageerimised</string>
-    <string name="reactions_agree">Nõus</string>
-    <string name="reactions_like">Meeldib</string>
+    <string name="action_agree">Nõus</string>
+    <string name="action_like">Meeldib</string>
     <string name="message_add_reaction">Lisa reaktsioon</string>
     <string name="reactions">Reageerimised</string>
     <string name="event_redacted">Sõnum on kustutatud</string>
@@ -1209,7 +1199,6 @@
     <string name="ssl_remain_offline">Eira</string>
     <string name="ssl_fingerprint_hash">Sõrmejälg (%s):</string>
     <string name="ssl_could_not_verify">Serveri õigsust ei olnud võimalik kontrollida.</string>
-    <string name="room_recents_directory">LOEND</string>
     <string name="settings_notification_troubleshoot">Lahenda teavitustega seotud vigu</string>
     <string name="settings_troubleshoot_diagnostic">Vigade tuvastamine</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Käivita testid</string>
@@ -2243,15 +2232,6 @@
     <string name="no_connectivity_to_the_server_indicator_airplane">Lennurežiim on kasutusel</string>
     <string name="settings_dev_tools">Arendaja töövahendid</string>
     <string name="settings_account_data">Kasutajakonto andmed</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d hääl</item>
-        <item quantity="other">%d häält</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d hääl - lõplikud tulemused</item>
-        <item quantity="other">%d häält - lõplikud tulemused</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Tehtud valik</string>
     <string name="command_description_poll">Loob lihtsa hääletuse</string>
     <string name="verification_cannot_access_other_session">Kasuta taastamiseks mõeldud paroolifraasi või võtit</string>
     <string name="verification_use_passphrase">Kui sa ei pääse ligi olemasolevale sessioonile</string>
@@ -2336,7 +2316,7 @@
 \n${app_name} Desktop</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">või mõnda teist Matrix\'i klienti, mis oskab risttunnustamist</string>
+    <string name="or_other_mx_capable_client">või mõnda teist Matrix\'i klienti, mis oskab risttunnustamist</string>
     <string name="template_use_latest_app">Kasuta oma muus seadmes kõige uuemat ${app_name}\'i versiooni:</string>
     <string name="command_description_discard_session">Sunnib loobuma praeguse krüptitud jututoa rühmavestluse seansist</string>
     <string name="command_description_discard_session_not_handled">Funktsionaalsus on toetatud ainult krüptitud jututubades</string>
@@ -2371,7 +2351,6 @@
     <string name="settings_show_room_member_state_events">Näita jututoa liikmete olekusündmusi</string>
     <string name="settings_show_room_member_state_events_summary">Sealhulgas kutsumisi, liitumisi, lahkumisi, müksamisi, keelamisi ning tunnuspildi ja kuvatava nime muutusi.</string>
     <string name="sent_a_poll">Küsitlus</string>
-    <string name="sent_a_bot_buttons">Robotinupud</string>
     <string name="sent_a_reaction">Reageeris: %s</string>
     <string name="sent_verification_conclusion">Verifitseerimise tulemus</string>
     <string name="universal_link_malformed">Link oli vigane</string>
@@ -2431,7 +2410,7 @@
     <string name="search_banned_user_hint">Otsi suhtluskeelu saanud kasutajaid</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Sul ei ole õigusi siin jututoas helistamiseks</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Sul ei ole piisavalt õigusi, et selles jututoas alustada konverentsikõnet</string>
-    <string name="reset">Taasta algolek</string>
+    <string name="action_reset">Taasta algolek</string>
     <string name="warning_unsaved_change_discard">Loobu muudatustest</string>
     <string name="warning_unsaved_change">Sa oled teinud muudatusi, mis on veel salvestamata. Kas soovid muudatustest loobuda\?</string>
     <string name="warning_room_not_created_yet">See jututuba on veel loomata. Kas katkestame selle tegevuse\?</string>
@@ -2700,7 +2679,7 @@
     <string name="invite_to_space_with_name_desc">Nad saavad tutvuda %s kogukonnakeskusega</string>
     <string name="invite_to_space_with_name">Kutse kasutajale %s</string>
     <string name="invite_by_link">Jaga linki</string>
-    <string name="invite_by_mxid">Kutsu kasutajanime alusel</string>
+    <string name="invite_by_username">Kutsu kasutajanime alusel</string>
     <string name="invite_by_email">Saada kutse e-kirjaga</string>
     <string name="invite_people_to_your_space_desc">Hetkel oled siin vaid sina. Aga %s läheb aina paremaks, kui teised liituvad.</string>
     <string name="invite_people_menu">Kutsu teisi kasutajaid</string>
@@ -2959,7 +2938,7 @@
     <string name="discovery_invite">Kutsu e-posti aadressi alusel, leia tuttavaid, jne…</string>
     <string name="finish_setting_up_discovery">Lõpeta leitavuse seadistamine.</string>
     <string name="create_space_identity_server_info_none">Hetkel sa ei kasuta isikutuvastusserverit. Kaaslastele kutse saatmiseks ning end teistele leitavaks tegemiseks palun seadista ta alljärgnevalt.</string>
-    <string name="invite_by_mxid_or_mail">Kutsu kasutajanime või e-posti aadressi alusel</string>
+    <string name="invite_by_username_or_mail">Kutsu kasutajanime või e-posti aadressi alusel</string>
     <string name="create_spaces_invite_public_header_desc">Kontrolli, et vajalikel inimestel oleks ligipääs %s kogukonda. Teistele võid kutse saata ka hiljem.</string>
     <string name="create_spaces_invite_public_header">Kes on su kaasteelised\?</string>
     <string name="command_description_add_to_space">Lisa näidatud kogukonnakeskusesse</string>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 8963d3e40c..21777ffe6c 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -43,7 +43,7 @@
     <string name="notice_room_third_party_registered_invite">%1$s erabiltzaileak %2$s gelarako gonbidapena onartu du</string>
 
     <string name="notice_crypto_unable_to_decrypt">** Ezin izan da deszifratu: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Igorlearen gailuak ez dizkigu mezu honetarako gakoak bidali.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Igorlearen gailuak ez dizkigu mezu honetarako gakoak bidali.</string>
 
     <string name="could_not_redact">Ezin izan da kendu</string>
     <string name="unable_to_send_message">Ezin izan da mezua bidali</string>
@@ -142,21 +142,21 @@
     <string name="title_activity_historical">Historiala</string>
 
     <string name="ok">Ados</string>
-    <string name="cancel">Utzi</string>
-    <string name="save">Gorde</string>
-    <string name="leave">Atera</string>
-    <string name="send">Bidali</string>
-    <string name="resend">Birbidali</string>
-    <string name="redact">Kendu</string>
-    <string name="quote">Aipua</string>
-    <string name="share">Partekatu</string>
+    <string name="action_cancel">Utzi</string>
+    <string name="action_save">Gorde</string>
+    <string name="action_leave">Atera</string>
+    <string name="action_send">Bidali</string>
+    <string name="action_resend">Birbidali</string>
+    <string name="action_redact">Kendu</string>
+    <string name="action_quote">Aipua</string>
+    <string name="action_share">Partekatu</string>
     <string name="later">Geroago</string>
-    <string name="forward">Birbidali</string>
+    <string name="action_forward">Birbidali</string>
     <string name="permalink">Esteka iraunkorra</string>
     <string name="view_source">Ikusi iturburua</string>
     <string name="view_decrypted_source">Ikusi deszifratutako iturburua</string>
-    <string name="delete">Ezabatu</string>
-    <string name="rename">Aldatu izena</string>
+    <string name="action_delete">Ezabatu</string>
+    <string name="action_rename">Aldatu izena</string>
     <string name="report_content">Salatu edukia</string>
     <string name="active_call">Dei aktiboa</string>
     <string name="ongoing_conference_call">Konferentzia deia abian.
@@ -171,7 +171,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Konferentzia deiak ez daude onartuta zifratutako geletan</string>
     <string name="send_anyway">Bidali hala ere</string>
     <string name="or">edo</string>
-    <string name="invite">Gonbidatu</string>
+    <string name="action_invite">Gonbidatu</string>
 
     <string name="action_sign_out">Amaitu saioa</string>
     <string name="action_voice_call">Ahots deia</string>
@@ -183,7 +183,7 @@
     <string name="action_open">Ireki</string>
     <string name="action_close">Itxi</string>
     <string name="copied_to_clipboard">Arbelera kopiatuta</string>
-    <string name="disable">Desgaitu</string>
+    <string name="action_disable">Desgaitu</string>
 
     <string name="dialog_title_confirmation">Berrespena</string>
     <string name="dialog_title_warning">Abisua</string>
@@ -368,10 +368,10 @@ Baimendu sarbidea hurrengo laster-leihoan deia egin ahal izateko.</string>
     <string name="no">EZ</string>
     <string name="_continue">Jarraitu</string>
 
-    <string name="remove">Kendu</string>
-    <string name="join">Elkartu</string>
-    <string name="preview">Aurreikusi</string>
-    <string name="reject">Baztertu</string>
+    <string name="action_remove">Kendu</string>
+    <string name="action_join">Elkartu</string>
+    <string name="action_preview">Aurreikusi</string>
+    <string name="action_reject">Baztertu</string>
 
     <string name="room_jump_to_first_unread">Jauzi irakurri gabeko lehen mezura.</string>
 
@@ -489,18 +489,6 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
     <string name="tab_title_search_people">JENDEA</string>
     <string name="tab_title_search_files">FITXATEGIAK</string>
 
-    <string name="room_recents_join">ELKARTU</string>
-    <string name="room_recents_directory">DIREKTORIOA</string>
-    <string name="room_recents_favourites">GOGOKOAK</string>
-    <string name="room_recents_conversations">GELAK</string>
-    <string name="room_recents_low_priority">LEHENTASUN BAXUA</string>
-    <string name="room_recents_invites">GONBIDAPENAK</string>
-    <string name="room_recents_start_chat">Hasi txata</string>
-    <string name="room_recents_create_room">Sortu gela</string>
-    <string name="room_recents_join_room">Elkartu gelara</string>
-    <string name="room_recents_join_room_title">Elkartu gela batetara</string>
-    <string name="room_recents_join_room_prompt">Idatzi gelaren IDa edo ezizena</string>
-
     <string name="directory_search_results_title">Arakatu direktorioa</string>
     <string name="directory_searching_title">Direktorioa bilatzen…</string>
 
@@ -784,7 +772,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="settings_labs_create_conference_with_jitsi">Sortu konferentzia deiak Jitsi bidez</string>
     <string name="widget_delete_message_confirmation">Ziur trepeta ezabatu nahi duzula gela honetatik?</string>
 
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Ezin izan da trepeta sortu.</string>
     <string name="widget_integration_failed_to_send_request">Eskariaren bidalketak huts egin du.</string>
     <string name="widget_integration_positive_power_level">Botere maila osoko zenbaki positibo bat izan behar da.</string>
@@ -803,22 +790,18 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="settings_labs_native_camera">Erabili kamera natiboa</string>
 
-    <!-- share keys -->
     <string name="you_added_a_new_device">\'%s\' saio berria gehitu duzu, eta zifratze-gakoak eskatzen ari da.</string>
     <string name="your_unverified_device_requesting">Egiaztatu gabeko zure \'%s\' saioa zifratze-gakoak eskatzen ari da.</string>
     <string name="start_verification">Hasi egiaztaketa</string>
     <string name="share_without_verifying">Partekatu egiaztatu gabe</string>
     <string name="ignore_request">Ezikusi eskaria</string>
 
-    <!-- conference call -->
     <string name="conference_call_warning_title">Abisua!</string>
     <string name="conference_call_warning_message">Konferentzia deiak garapenean daude eta agian ez dabiltza behar bezala.</string>
 
-    <!-- slash commands -->
     <string name="command_error">Komandoaren errorea</string>
     <string name="unrecognized_command">Komando ezezaguna: %s</string>
 
-    <!-- notification statuses -->
     <string name="notification_off">Ez</string>
     <string name="notification_noisy">Zaratatsua</string>
 
@@ -873,7 +856,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="community_id">Komunitatearen IDa</string>
     <string name="community_id_hint">adibidea</string>
 
-    <!-- group details -->
     <string name="group_details_home">Hasiera</string>
     <string name="group_details_people">Jendea</string>
     <string name="group_details_rooms">Gelak</string>
@@ -946,7 +928,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
         <item quantity="other">%d trepeta aktibo</item>
     </plurals>
 
-    <!-- Widget Integration Manager -->
     <string name="receipt_avatar">Hartzailearen abatarra</string>
     <string name="notice_avatar">Jakinarazpen abatarra</string>
     <string name="avatar">Abatarra</string>
@@ -998,9 +979,9 @@ Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ah
     <string name="deactivate_account_prompt_password">Jarraitzeko, sartu zure pasahitza:</string>
     <string name="dialog_title_third_party_licences">Hirugarrengoen lizentziak</string>
 
-    <string name="download">Deskargatu</string>
-    <string name="speak">Hitz egin</string>
-    <string name="clear">Garbitu</string>
+    <string name="action_download">Deskargatu</string>
+    <string name="action_speak">Hitz egin</string>
+    <string name="action_clear">Garbitu</string>
     <string name="e2e_re_request_encryption_key">Eskatu berriro zifratze-gakoak zure beste saioetatik.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Gako eskaria bidalita.</string>
@@ -1153,7 +1134,7 @@ Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ah
     <string name="markdown_has_been_enabled">Markdown aktibatu da.</string>
     <string name="markdown_has_been_disabled">Markdown desaktibatu da.</string>
 
-    <string name="accept">Onartu</string>
+    <string name="action_accept">Onartu</string>
 
     <string name="auth_accept_policies">Irakurri eta onartu hasiera-zerbitzari honen baldintzak:</string>
 
@@ -1246,7 +1227,7 @@ Hurrengo pantailan ${app_name}-i bigarren planoan aritzeko baimena eskatuko zaiz
     <string name="title_activity_keys_backup_restore">Erabili gakoen babes-kopia</string>
     <string name="keys_backup_is_not_finished_please_wait">Gakoen babes-kopia ez da amaitu, itxaron mesedez…</string>
 
-    <string name="skip">Saltatu</string>
+    <string name="action_skip">Saltatu</string>
     <string name="done">Egina</string>
 
     <string name="settings_notification_advanced">Jakinarazpenen ezarpen aurreratuak</string>
@@ -1373,9 +1354,9 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="notification_sync_init">Zerbitzua hasieratzen</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Zure mezu zifratuetara sarbidea galduko duzu ez baduzu gakoen babes-kopia egiten saioa amaitu aurretik.</string>
 
-    <string name="stay">Geratu</string>
-    <string name="abort">Abortatu</string>
-    <string name="ignore">Ezikusi</string>
+    <string name="action_stay">Geratu</string>
+    <string name="action_abort">Abortatu</string>
+    <string name="action_ignore">Ezikusi</string>
 
     <string name="action_sign_out_confirmation_simple">Ziur saioa amaitu nahi duzula\?</string>
     <string name="auth_login_sso">Hasi saioa Single sign-on bidez</string>
@@ -1560,8 +1541,8 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="room_list_rooms_empty_body">Zure gelak hemen bistaratuko dira</string>
 
     <string name="title_activity_emoji_reaction_picker">Erreakzioak</string>
-    <string name="reactions_agree">Ados</string>
-    <string name="reactions_like">Gogokoa</string>
+    <string name="action_agree">Ados</string>
+    <string name="action_like">Gogokoa</string>
     <string name="message_add_reaction">Gehitu erreakzioa</string>
     <string name="message_view_reaction">Ikusi errekzioak</string>
     <string name="reactions">Erreakzioak</string>
@@ -1676,10 +1657,10 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="message_view_edit_history">Ikusi edizioen historiala</string>
 
     <string name="none">Bat ere ez</string>
-    <string name="revoke">Indargabetu</string>
-    <string name="disconnect">Deskonektatu</string>
-    <string name="review">Berrikusi</string>
-    <string name="decline">Ukatu</string>
+    <string name="action_revoke">Indargabetu</string>
+    <string name="action_disconnect">Deskonektatu</string>
+    <string name="action_review">Berrikusi</string>
+    <string name="action_decline">Ukatu</string>
 
     <string name="people_no_identity_server">Ez da identitate-zerbitzaririk konfiguratu.</string>
 
@@ -2233,15 +2214,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="login_signup_username_hint">Erabiltzaile-izena</string>
     <string name="settings_dev_tools">Garapen tresnak</string>
     <string name="settings_account_data">Kontuaren datuak</string>
-    <plurals name="poll_info">
-        <item quantity="one">boto %d</item>
-        <item quantity="other">%d boto</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">boto %d - Azken emaitza</item>
-        <item quantity="other">%d boto - Azken emaitza</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Hautatutako aukera</string>
     <string name="command_description_poll">Inkesta sinplea sortzen du</string>
     <string name="verification_cannot_access_other_session">Erabili berreskuratze metodo bat</string>
     <string name="verification_use_passphrase">Ezin baduzu badagoen saio bat erabili</string>
@@ -2417,7 +2389,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 \n${app_name} Desktop</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">edo zeharka sinatzeko gaitasuna duen beste Matrix bezero bat</string>
+    <string name="or_other_mx_capable_client">edo zeharka sinatzeko gaitasuna duen beste Matrix bezero bat</string>
     <string name="template_use_latest_app">Erabili azken ${app_name} bertsioa zure beste gailuetan:</string>
     <string name="command_description_discard_session">Uneko irteerako talde saioa zifratutako gela batean baztertzera behartzen du</string>
     <string name="command_description_discard_session_not_handled">Zifratutako gelatan onartzen da soilik</string>
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 92b79280fd..99573339e8 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -45,7 +45,7 @@
     <string name="notice_room_third_party_revoked_invite">%1$s دعوت پیوستن به اتاق %2$s را باطل کرد</string>
     <string name="notice_room_third_party_registered_invite">%1$s دعوت برای %2$s را پذیرفت</string>
     <string name="notice_crypto_unable_to_decrypt">** ناتوان در رمزگشایی: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">دستگاه فرستنده، کلیدهای این پیام را برایمان نفرستاده است.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">دستگاه فرستنده، کلیدهای این پیام را برایمان نفرستاده است.</string>
     <string name="unable_to_send_message">ناتوان در فرستادن پیام</string>
     <string name="message_failed_to_upload">شکست در بارگذاری تصویر</string>
     <string name="network_error">خطای شبکه</string>
@@ -229,17 +229,17 @@
     <string name="title_activity_bug_report">گزارش اشکال</string>
     <string name="loading">در حال بارگذاری…</string>
     <string name="ok">باشه</string>
-    <string name="cancel">لغو</string>
-    <string name="save">ذخیره</string>
-    <string name="leave">ترک کردن</string>
-    <string name="send">ارسال</string>
-    <string name="resend">ارسال دوباره</string>
-    <string name="quote">نقل قول</string>
-    <string name="share">هم‌رسانی</string>
+    <string name="action_cancel">لغو</string>
+    <string name="action_save">ذخیره</string>
+    <string name="action_leave">ترک کردن</string>
+    <string name="action_send">ارسال</string>
+    <string name="action_resend">ارسال دوباره</string>
+    <string name="action_quote">نقل قول</string>
+    <string name="action_share">هم‌رسانی</string>
     <string name="later">بعداً</string>
     <string name="view_source">مشاهده منبع</string>
-    <string name="delete">حذف</string>
-    <string name="rename">تغییر نام</string>
+    <string name="action_delete">حذف</string>
+    <string name="action_rename">تغییر نام</string>
     <string name="report_content">گزارش محتوا</string>
     <string name="active_call">تماس فعال</string>
     <string name="ongoing_conference_call_voice">صوتی</string>
@@ -247,7 +247,7 @@
     <string name="device_information">اطّلاعات نشست</string>
     <string name="send_anyway">به هر حال ارسال کن</string>
     <string name="or">یا</string>
-    <string name="invite">دعوت</string>
+    <string name="action_invite">دعوت</string>
     <string name="offline">آفلاین</string>
     <string name="action_exit">خروج</string>
     <string name="action_sign_out">خروج از حساب</string>
@@ -259,7 +259,7 @@
     <string name="action_open">گشودن</string>
     <string name="action_close">بستن</string>
     <string name="copied_to_clipboard">در کلیپ‌بورد کپی شد</string>
-    <string name="disable">غیرفعال</string>
+    <string name="action_disable">غیرفعال</string>
     <string name="dialog_title_warning">هشدار</string>
     <string name="bottom_action_home">خانه</string>
     <string name="bottom_action_rooms">اتاق‌ها</string>
@@ -330,7 +330,7 @@
     <string name="call_anyway">به هر حال تماس بگیر</string>
     <string name="missing_permissions_title_to_start_conf_call">نمی‌توان تماس را آغاز کرد</string>
     <string name="cannot_start_call">نمی‌توان تماس را شروع کرد، لطفاً بعداً تلاش نمایید</string>
-    <string name="accept">پذیرفتن</string>
+    <string name="action_accept">پذیرفتن</string>
     <string name="actions">کنش‌ها</string>
     <string name="dialog_title_confirmation">تایید</string>
     <string name="dialog_title_error">خطا</string>
@@ -399,10 +399,10 @@
     <string name="no">نه</string>
     <string name="media_slider_saved_message">در دانلودها ذخیره شود؟</string>
     <string name="_continue">ادامه</string>
-    <string name="remove">برداشتن</string>
-    <string name="join">پیوستن</string>
-    <string name="preview">پیش‌نمایش</string>
-    <string name="reject">رد کردن</string>
+    <string name="action_remove">برداشتن</string>
+    <string name="action_join">پیوستن</string>
+    <string name="action_preview">پیش‌نمایش</string>
+    <string name="action_reject">رد کردن</string>
     <string name="list_members">فهرست اعضا</string>
     <string name="call_connected">تماس برقرار شد</string>
     <string name="call_connecting">در حال برقراری تماس…</string>
@@ -454,19 +454,19 @@
     <string name="room_participants_action_invite">دعوت</string>
     <string name="room_participants_action_leave">ترک این اتاق</string>
     <string name="room_participants_action_remove">حذف از این اتاق</string>
-    <string name="stay">ماندن</string>
-    <string name="redact">برداشتن</string>
-    <string name="download">بارگیری</string>
+    <string name="action_stay">ماندن</string>
+    <string name="action_redact">برداشتن</string>
+    <string name="action_download">بارگیری</string>
     <string name="ongoing_conference_call">کنفرانس در حال برگذاری است.
 \nبه صورت %1$s یا %2$s به آن بپیوندید</string>
     <string name="missing_permissions_warning">به خاطر نداشتن مجوز دسترسی، برخی امکانات ممکن است در دسترس نباشند…</string>
     <string name="missing_permissions_error">به خاطر نداشتن مجوز دسترسی، این اقدام ممکن نیست.</string>
     <string name="missing_permissions_to_start_conf_call">برای آغاز کنفرانس نیاز به دسترسی دعوت اعضا دارید</string>
     <string name="room_no_conference_call_in_encrypted_rooms">تماس گروهی در اتاق‌های رمزنگاری شده پشتیبانی نمی‌شود</string>
-    <string name="skip">رد شدن</string>
+    <string name="action_skip">رد شدن</string>
     <string name="done">انجام شد</string>
-    <string name="abort">انصراف</string>
-    <string name="ignore">نادیده‌گرفتن</string>
+    <string name="action_abort">انصراف</string>
+    <string name="action_ignore">نادیده‌گرفتن</string>
     <string name="action_sign_out_confirmation_simple">مطمئنید که می‌خواهید از حسابتان خارج شوید؟</string>
     <string name="action_mark_room_read">علامت‌گذاری به عنوان خوانده شده</string>
     <string name="auth_login_sso">ورود با سامانه‌های احراز هویت مرکزی</string>
@@ -489,9 +489,9 @@
     <string name="backup">پشتیبان‌گیری</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">در صورت عدم پشتیبان‌گیری از کلیدهای خود پیش از خروج، دسترسی شما به پیام‌های رمزنگاری شده از بین می‌رود.</string>
     <string name="dialog_title_third_party_licences">گواهی‌نامه‌های شخص ثالث</string>
-    <string name="speak">صحبت</string>
-    <string name="clear">پاک کردن</string>
-    <string name="forward">هدایت</string>
+    <string name="action_speak">صحبت</string>
+    <string name="action_clear">پاک کردن</string>
+    <string name="action_forward">هدایت</string>
     <string name="permalink">پیوند دائمی</string>
     <string name="view_decrypted_source">مشاهده منبع رمزگشایی شده</string>
     <string name="action_historical">تاریخی</string>
@@ -507,9 +507,9 @@
     <string name="template_e2e_re_request_encryption_key_dialog_content">لطفاً المنت را روی افزاره‌ای دیگر که می‌تواند پیام را رمزگشایی کند، اجرا کنید تا بتواند کلیدها را به این نشست بفرستد.</string>
     <string name="read_receipts_list">فهرست رسیدهای خواندن</string>
     <string name="keys_backup_setup_skip_title">آیا مطمئن هستید؟</string>
-    <string name="disconnect">قطع اتصال</string>
-    <string name="review">بررسی</string>
-    <string name="decline">نپذیرفتن</string>
+    <string name="action_disconnect">قطع اتصال</string>
+    <string name="action_review">بررسی</string>
+    <string name="action_decline">نپذیرفتن</string>
     <string name="call_failed_dont_ask_again">دوباره از من نپرس</string>
     <string name="auth_add_email_message_2">رایانامه‌ای برای بازیابی تنظیم کرده تا بتوانید در صورت نیاز، از طریقش به دست افرادی که می‌شناسید، قابل کشف باشید.</string>
     <string name="auth_add_phone_message_2">ثبت شماره تلفن (بعدا در صورت دلخواه می توانید از آن برای شناسایی دوستان خود استفاده کنید).</string>
@@ -519,7 +519,6 @@
     <string name="room_message_placeholder_reply_to_not_encrypted">فرستادن یک پاسخ (رمزنشده)…</string>
     <string name="search_members_hint">پالایش اعضای اتاق</string>
     <string name="tab_title_search_rooms">اتاق‌ها</string>
-    <string name="room_recents_conversations">اتاق‌ها</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d اتاق</item>
         <item quantity="other">%d اتاق</item>
@@ -674,8 +673,8 @@
     <string name="room_list_rooms_empty_title">اتاق‌ها</string>
     <string name="room_list_rooms_empty_body">اتاق‌هایتان این‌جا نشان داده خواهند شد. برای یافتن موارد موجود یا ایجاد خودتان روی + در پایین سمت راست بزنید.</string>
     <string name="title_activity_emoji_reaction_picker">بازخودها</string>
-    <string name="reactions_agree">موافقت</string>
-    <string name="reactions_like">پسند</string>
+    <string name="action_agree">موافقت</string>
+    <string name="action_like">پسند</string>
     <string name="message_add_reaction">افزودن بازخورد</string>
     <string name="message_view_reaction">دیدن بازخوردها</string>
     <string name="reactions">بازخوردها</string>
@@ -766,7 +765,7 @@
     <string name="settings_dev_tools">ابزارهای توسعه</string>
     <string name="title_activity_verify_device">تأیید نشست</string>
     <string name="none">هیچ</string>
-    <string name="revoke">ابطال</string>
+    <string name="action_revoke">ابطال</string>
     <string name="people_no_identity_server">هیچ کارساز هویتی پیکربندی نشده.</string>
     <string name="call_failed_no_ice_title">تماس به دلیل پیکربندی بد کارساز، شکست خورد</string>
     <string name="call_failed_no_ice_use_alt">از %s استفاده کنید</string>
@@ -849,12 +848,12 @@
     <string name="soft_logout_signin_password_hint">گذرواژه</string>
     <string name="settings">تنظیمات</string>
     <string name="account_password">گذرواژهٔ حساب</string>
-    <string name="play_video">پخش</string>
-    <string name="pause_video">توقف</string>
+    <string name="action_play">پخش</string>
+    <string name="action_pause">توقف</string>
     <string name="action_copy">رونوشت</string>
     <string name="dialog_title_success">موفقیت</string>
     <string name="bottom_action_notification">آگاهی‌ها</string>
-    <string name="dismiss">خاتمه</string>
+    <string name="action_dismiss">خاتمه</string>
     <string name="no_permissions_to_start_conf_call">اجازهٔ شروع تماس کنفرانسی در این اتاق را ندارید</string>
     <string name="no_permissions_to_start_webrtc_call">اجازهٔ شروع تماس در این اتاق را ندارید</string>
     <string name="conference_call_in_progress">کنفرانسی در حال اجراست!</string>
@@ -940,16 +939,6 @@
     <string name="search_hint">جست‌وجو</string>
     <string name="tab_title_search_people">افراد</string>
     <string name="tab_title_search_files">پرونده‌ها</string>
-    <string name="room_recents_join">پیوستن</string>
-    <string name="room_recents_directory">شاخه</string>
-    <string name="room_recents_favourites">محبوب‌ها</string>
-    <string name="room_recents_low_priority">کم‌اهمیت</string>
-    <string name="room_recents_invites">دعوت‌ها</string>
-    <string name="room_recents_start_chat">شروع گپ</string>
-    <string name="room_recents_create_room">ایجاد اتاق</string>
-    <string name="room_recents_join_room">پیوستن به اتاق</string>
-    <string name="room_recents_join_room_title">پیوستن به یک اتاق</string>
-    <string name="room_recents_join_room_prompt">شناسهٔ اتاق یا نام مستعارش را بنویسید</string>
     <string name="directory_search_results_title">مرور شاخه</string>
     <string name="directory_searching_title">جست‌وجو کردن شاخه…</string>
     <string name="room_settings_all_messages_noisy">تمام پیام‌ها (پرصدا)</string>
@@ -1367,7 +1356,6 @@
     <string name="sent_a_file">پرونده</string>
     <string name="send_a_sticker">برچسب</string>
     <string name="sent_a_poll">نظرسنجی</string>
-    <string name="sent_a_bot_buttons">دکمه‌های بات</string>
     <string name="sent_a_reaction">واکنش داده با: %s</string>
     <string name="sent_verification_conclusion">نتیجه‌گیری تأیید</string>
     <string name="verification_request_waiting">در حال انتظار…</string>
@@ -1448,15 +1436,6 @@
     <string name="no_connectivity_to_the_server_indicator">اتّصال به کارساز از دست رفت</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">حالت هواپیما روشن است</string>
     <string name="settings_account_data">داده‌های حساب</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d رأی</item>
-        <item quantity="other">%d رأی</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d رأی - نتایج نهایی</item>
-        <item quantity="other">%d رأی - نتایج نهایی</item>
-    </plurals>
-    <string name="poll_item_selected_aria">انتخاب گزیده</string>
     <string name="command_description_poll">ایجاد نظرسنجی‌ای ساده</string>
     <string name="verification_cannot_access_other_session">استفاده از یک کلید یا عبارت بازیابی</string>
     <string name="verification_use_passphrase">اگر به نشست‌های موجود دسترسی ندارید</string>
@@ -1606,7 +1585,7 @@
     <string name="enter_secret_storage_passphrase_or_key">برای ادامه از %1$s یا %2$sتان استفاده کنید.</string>
     <string name="command_description_discard_session_not_handled">پشتیبانی‌شده فقط در اتاق‌های رمزشده</string>
     <string name="template_use_latest_app">از آخرین نگارش المنت روی دیگر افزاره‌تان استفاده کنید:</string>
-    <string name="or_other_mx_capabale_client">یا دیگر کاره‌های ماتریکس دادای قابلیت ورود چندگانه</string>
+    <string name="or_other_mx_capable_client">یا دیگر کاره‌های ماتریکس دادای قابلیت ورود چندگانه</string>
     <string name="cross_signing_verify_by_text">تأیید دستی با متن</string>
     <string name="verify_this_session">تأیید ورود جدیدی که به حسابتان دسترسی دارد: %1$s</string>
     <string name="verify_other_sessions">تأیید همهٔ نشست‌هایتان برای اطمینان از این که حساب و پیام‌هایتان امنند</string>
@@ -1690,7 +1669,7 @@
     <string name="settings_notification_configuration">پیکربندی آگاهی‌ها</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">اجازهٔ آغاز یک تماس را ندارید</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">اجازهٔ آغاز یک تماس کنفرانسی را ندارید</string>
-    <string name="reset">بازنشانی</string>
+    <string name="action_reset">بازنشانی</string>
     <string name="startup_notification_privacy_button_other">انتخاب گزینه‌ی دیگر</string>
     <string name="startup_notification_privacy_button_grant">مجوز دادن</string>
     <string name="template_startup_notification_privacy_message">المنت می تواند در پس‌زمینه اجرا شده تا آگاهی‌هایتان را به صورت ایمن و محرمانه مدیریت کند. ممکن است بر مصرف باتری تأثیر بگذارد.</string>
@@ -2700,7 +2679,7 @@
     <string name="invite_to_space_with_name_desc">آنها قادر به کاوش در %s خواهند بود</string>
     <string name="invite_to_space_with_name">دعوت به %s</string>
     <string name="invite_by_link">به اشتراک‌گذاری لینک</string>
-    <string name="invite_by_mxid">دعوت با شناسه‌کاربری</string>
+    <string name="invite_by_username">دعوت با شناسه‌کاربری</string>
     <string name="invite_by_email">دعوت با ایمیل</string>
     <string name="invite_people_to_your_space_desc">در حال حاضر فقط شما هستید. %s با دیگران حتی بهتر خواهد بود.</string>
     <string name="invite_people_menu">دعوت افراد</string>
@@ -2960,7 +2939,7 @@
     <string name="finish_setting_up_discovery">پایان برپا سازی کشف.</string>
     <string name="create_spaces_invite_public_header">همگروهی‌هایتان کیند؟</string>
     <string name="create_space_identity_server_info_none">در حال حاضر از کارساز هویتی استفاده نمی‌کنید. برای دعوت همگروهی‌ها و قابل کشف بودن به دستشان، در پایین یکی پیکربندی کنید.</string>
-    <string name="invite_by_mxid_or_mail">دعوت با نام کاربری یا نامه</string>
+    <string name="invite_by_username_or_mail">دعوت با نام کاربری یا نامه</string>
     <string name="create_spaces_invite_public_header_desc">مطمئن شوید افراد درستی به %s دسترسی دارند. بعداً می‌توانید تفراد بیش‌تری را دعوت‌کنید.</string>
     <string name="command_description_add_to_space">افزودن به فضای داده شده</string>
     <string name="create_space_in_progress">ایجاد کردن فضا…</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 2137cfff60..127287167b 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -38,7 +38,7 @@
     <string name="notice_room_third_party_invite">%1$s lähetti liittymiskutsun huoneeseen käyttäjälle %2$s</string>
     <string name="notice_room_third_party_registered_invite">%1$s hyväksyi kutsun käyttäjän %2$s puolesta</string>
     <string name="notice_crypto_unable_to_decrypt">** Salauksen purku epäonnistui: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Lähettäjän laite ei ole lähettänyt avaimia tähän viestiin.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Lähettäjän laite ei ole lähettänyt avaimia tähän viestiin.</string>
     <string name="unable_to_send_message">Viestin lähetys epäonnistui</string>
     <string name="message_failed_to_upload">Kuvan lataaminen epäonnistui</string>
     <string name="network_error">Verkkovirhe</string>
@@ -48,9 +48,7 @@
     <string name="medium_phone_number">Puhelinnumero</string>
     <string name="could_not_redact">Takaisinveto epäonnistui</string>
     <string name="summary_message">%1$s: %2$s</string>
-    <!-- Room display name -->
     <string name="room_displayname_invite_from">Kutsu käyttäjältä %s</string>
-    <!-- Grammar problem -->
     <string name="room_displayname_room_invite">Huonekutsu</string>
     <string name="room_displayname_two_members">%1$s ja %2$s</string>
     <string name="room_displayname_empty_room">Tyhjä huone</string>
@@ -208,32 +206,27 @@
     <string name="notice_room_created">%1$s loi huoneen</string>
     <string name="summary_you_sent_sticker">Lähetit tarran.</string>
     <string name="summary_you_sent_image">Lähetit kuvan.</string>
-    <!-- titles -->
     <string name="title_activity_home">Viestit</string>
     <string name="title_activity_room">Huone</string>
     <string name="title_activity_settings">Asetukset</string>
     <string name="title_activity_member_details">Jäsenen tiedot</string>
     <string name="title_activity_historical">Historiallinen</string>
-    <!-- button names -->
     <string name="ok">OK</string>
-    <string name="cancel">Peruuta</string>
-    <string name="save">Tallenna</string>
-    <string name="leave">Poistu</string>
-    <string name="send">Lähetä</string>
-    <string name="resend">Lähetä uudelleen</string>
-    <string name="redact">Poista</string>
-    <!-- ??? -->
-    <string name="quote">Lainaa</string>
-    <string name="share">Jaa</string>
+    <string name="action_cancel">Peruuta</string>
+    <string name="action_save">Tallenna</string>
+    <string name="action_leave">Poistu</string>
+    <string name="action_send">Lähetä</string>
+    <string name="action_resend">Lähetä uudelleen</string>
+    <string name="action_redact">Poista</string>
+    <string name="action_quote">Lainaa</string>
+    <string name="action_share">Jaa</string>
     <string name="later">Myöhemmin</string>
-    <string name="forward">Lähetä edelleen</string>
+    <string name="action_forward">Lähetä edelleen</string>
     <string name="permalink">Pysyvä linkki</string>
     <string name="view_source">Lähdekoodi</string>
     <string name="view_decrypted_source">Näytä salaamaton lähde</string>
-    <!-- verb or noun? -->
-    <!-- uh oh -->
-    <string name="delete">Poista</string>
-    <string name="rename">Nimeä uudelleen</string>
+    <string name="action_delete">Poista</string>
+    <string name="action_rename">Nimeä uudelleen</string>
     <string name="report_content">Ilmoita epäilyttävästä sisällöstä</string>
     <string name="active_call">Puhelu meneillään</string>
     <string name="ongoing_conference_call">Ryhmäpuhelu meneillään.
@@ -248,8 +241,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Ryhmäpuhelut eivät ole tuettuja salatuissa huoneissa</string>
     <string name="send_anyway">Lähetä silti</string>
     <string name="or">tai</string>
-    <string name="invite">Kutsu</string>
-    <!-- actions -->
+    <string name="action_invite">Kutsu</string>
     <string name="action_sign_out">Kirjaudu ulos</string>
     <string name="action_voice_call">Äänipuhelu</string>
     <string name="action_video_call">Videopuhelu</string>
@@ -260,31 +252,25 @@
     <string name="action_open">Avaa</string>
     <string name="action_close">Sulje</string>
     <string name="copied_to_clipboard">Kopioitu leikepöydälle</string>
-    <string name="disable">Poista käytöstä</string>
-    <!-- dialog titles -->
+    <string name="action_disable">Poista käytöstä</string>
     <string name="dialog_title_confirmation">Vahvistus</string>
     <string name="dialog_title_warning">Varoitus</string>
-    <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Koti</string>
     <string name="bottom_action_favourites">Suosikit</string>
     <string name="bottom_action_people">Ihmiset</string>
     <string name="bottom_action_rooms">Huoneet</string>
-    <!-- Home screen -->
     <string name="home_filter_placeholder_home">Suodata huoneista</string>
     <string name="home_filter_placeholder_favorites">Suodata suosikeista</string>
     <string name="home_filter_placeholder_people">Suodata henkilöistä</string>
     <string name="home_filter_placeholder_rooms">Suodata huoneista</string>
-    <!-- Home fragment -->
     <string name="invitations_header">Kutsut</string>
     <string name="low_priority_header">Matala prioriteetti</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">Keskustelut</string>
     <string name="local_address_book_header">Paikalliset yhteystiedot</string>
     <string name="matrix_only_filter">Ainoastaan Matrix-yhteyshenkilöt</string>
     <string name="no_conversation_placeholder">Ei keskusteluita</string>
     <string name="template_no_contact_access_placeholder">Et ole sallinut ${app_name}ille pääsyä paikallisiin yhteystietoihisi</string>
     <string name="no_result_placeholder">Ei tuloksia</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">Huoneet</string>
     <string name="rooms_directory_header">Huoneluettelo</string>
     <string name="no_room_placeholder">Ei huoneita</string>
@@ -314,17 +300,12 @@
     <string name="logout">Kirjaudu ulos</string>
     <string name="hs_url">Kotipalvelimen URL-osoite</string>
     <string name="identity_url">Identiteettipalvelimen URL-osoite</string>
-    <!-- ??? -->
     <string name="search">Etsi</string>
-    <!-- ??? -->
-    <!-- what is the typical chat lingo in Finnish? -->
     <string name="start_new_chat">Aloita uusi keskustelu</string>
     <string name="start_voice_call">Aloita puhelu</string>
     <string name="start_video_call">Aloita videopuhelu</string>
-    <!-- same as above -->
     <string name="option_send_files">Lähetä tiedostoja</string>
     <string name="option_take_photo_video">Ota kuva tai video</string>
-    <!-- Authentication -->
     <string name="auth_login">Kirjaudu sisään</string>
     <string name="auth_register">Luo tili</string>
     <string name="auth_submit">Lähetä</string>
@@ -361,23 +342,19 @@
     <string name="auth_username_in_use">Käyttäjätunnus on jo käytössä</string>
     <string name="auth_home_server">Kotipalvelin:</string>
     <string name="auth_identity_server">Identiteettipalvelin:</string>
-    <!-- ??? -->
     <string name="auth_reset_password_next_step_button">Olen varmistanut sähköpostiosoitteeni</string>
     <string name="auth_reset_password_message">Palauttaaksesi salasanasi, anna tiliisi liitetty sähköpostiosoite:</string>
     <string name="auth_reset_password_missing_email">Anna tiliisi liitetty sähköpostiosoite.</string>
     <string name="auth_reset_password_missing_password">Anna uusi salasana.</string>
     <string name="auth_reset_password_email_validation_message">Osoitteeseen %s on lähetetty sähköposti. Kun olet avannut siinä olevan linkin, paina alla olevaa nappia.</string>
-    <!-- ???? -->
     <string name="auth_reset_password_error_unauthorized">Sähköpostiosoitteesi vahvistaminen epäonnistui. Varmista, että klikkasit sähköpostissa olevaa linkkiä</string>
     <string name="auth_reset_password_success_message">Salasanasi on vaihdettu.\n\nSinut on kirjauduttu ulos kaikista laitteistasi, etkä enää saa viesti-ilmoituksia. Ottaaksesi käyttöön ilmoitukset uudelleen, kirjaudu sisään uudelleen kaikilla laitteillasi.</string>
-    <!-- Login Screen -->
     <string name="login_error_must_start_http">URL-osoitteen on alettava seuraavasti: http[s]://</string>
     <string name="login_error_network_error">Kirjautuminen epäonnistui: Verkkovirhe</string>
     <string name="login_error_unable_login">Kirjautuminen epäonnistui</string>
     <string name="login_error_registration_network_error">Rekisteröityminen epäonnistui: Verkkovirhe</string>
     <string name="login_error_unable_register">Rekisteröityminen epäonnistui</string>
     <string name="login_error_unable_register_mail_ownership">Rekisteröityminen epäonnistui: sähköpostin varmistaminen epäonnistui</string>
-    <!-- ??? -->
     <string name="login_error_invalid_home_server">Syötäthän toimivan osoitteen</string>
     <string name="login_error_forbidden">Väärä käyttäjätunnus tai salasana</string>
     <string name="login_error_unknown_token">Annettua tunnistetta ei hyväksytty</string>
@@ -386,29 +363,20 @@
     <string name="login_error_limit_exceeded">Liian monta pyyntöä</string>
     <string name="login_error_user_in_use">Käyttäjänimi on jo käytössä</string>
     <string name="login_error_login_email_not_yet">Sähköpostiisi lähetetty linkki, jota ei ole vielä klikattu</string>
-    <!-- ??? -->
-    <!-- crypto warnings -->
-    <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lukukuittaukset</string>
-    <!-- accounts list Screen -->
-    <!-- image size selection -->
     <string name="compression_options">Valitse koko</string>
     <string name="compression_opt_list_original">Alkuperäinen</string>
     <string name="compression_opt_list_large">Iso</string>
     <string name="compression_opt_list_medium">Keskikokoinen</string>
     <string name="compression_opt_list_small">Pieni</string>
-    <!-- media upload / download messages -->
     <string name="attachment_cancel_download">Peru lataus?</string>
     <string name="attachment_cancel_upload">Peru lähetys?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$d min %2$d s</string>
-    <!-- room creation dialog Screen -->
     <string name="yesterday">Eilen</string>
     <string name="today">Tänään</string>
-    <!-- room info dialog Screen -->
     <string name="room_info_room_name">Huoneen nimi</string>
     <string name="room_info_room_topic">Huoneen aihe</string>
-    <!-- call string -->
     <string name="call_connected">Yhdistetty</string>
     <string name="call_connecting">Yhdistetään…</string>
     <string name="call_ended">Puhelu loppui</string>
@@ -418,17 +386,11 @@
     <string name="incoming_voice_call">Saapuva puhelu</string>
     <string name="call_in_progress">Puhelu käynnissä…</string>
     <string name="call_error_user_not_responding">Toinen puoli ei vastannut.</string>
-    <!-- ??? -->
     <string name="call_error_ice_failed">Mediayhteys epäonnistui</string>
     <string name="call_error_camera_init_failed">Kameran alustus epäonnistui</string>
     <string name="call_error_answered_elsewhere">puheluun vastattiin muualta</string>
-    <!-- ??? this entire section -->
-    <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Ota kuva tai video"</string>
-    <!-- ??? -->
     <string name="media_picker_cannot_record_video">Videointi epäonnistui</string>
-    <!-- ??? -->
-    <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Huomio</string>
     <string name="template_permissions_rationale_msg_storage">${app_name} tarvitsee käyttöluvan mediagalleriaasi lähettäkseen liitteitä.\n\nSalli tiedostojen käyttö seuraavalla näytöllä liittääksesi kuvia ja muita tiedostoja viesteihin.</string>
     <string name="template_permissions_rationale_msg_camera">${app_name} tarvitsee käyttöluvan kameraan ottaakseen kuvia ja suorittakseen videopuheluita.</string>
@@ -447,32 +409,25 @@
 \n
 \nSaako ${app_name} käyttää yhteystietojasi tätä varten\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Toimenpide epäonnistui puuttuvien käyttölupien takia</string>
-    <!-- medias slider string -->
     <string name="media_slider_saved">Tallennettu</string>
     <string name="media_slider_saved_message">Tallenna latauskansioon\?</string>
     <string name="yes">KYLLÄ</string>
     <string name="no">EI</string>
     <string name="_continue">Jatka</string>
-    <!-- Actions -->
-    <string name="remove">Poista</string>
-    <string name="join">Liity</string>
-    <string name="preview">Esikatsele</string>
-    <string name="reject">Hylkää</string>
-    <!-- Room -->
+    <string name="action_remove">Poista</string>
+    <string name="action_join">Liity</string>
+    <string name="action_preview">Esikatsele</string>
+    <string name="action_reject">Hylkää</string>
     <string name="room_jump_to_first_unread">Siirry ensimmäiseen lukemattomaan viestiin.</string>
-    <!-- Room Preview -->
     <string name="room_preview_invitation_format">%s on kutsunut sinut huoneeseen</string>
     <string name="room_preview_unlinked_email_warning">Tämä kutsu lähetettiin osoitteeseen %s, jota ei ole liitetty tiliisi. 
 \nVoit kirjautua sisään toisella tilillä tai lisätä tämän sähköpostiosoitteen tiliisi.</string>
     <string name="room_preview_try_join_an_unknown_room">Olet avaamassa huonetta %s. Haluatko liittyä huoneeseen osallistuaksesi keskusteluun?</string>
     <string name="room_preview_try_join_an_unknown_room_default">huone</string>
-    <!-- ??? what is this meant to be, I suspect grammar shenanigans -->
     <string name="room_preview_room_interactions_disabled">Tämä on huoneen esikatselu. Liity huoneeseen osallistuaksesi keskusteluun.</string>
-    <!-- Chat creation -->
     <string name="room_creation_title">Uusi keskustelu</string>
     <string name="room_creation_add_member">Lisää jäsen</string>
     <string name="room_title_one_member">yksi jäsen</string>
-    <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Poistu huoneesta</string>
     <string name="room_participants_leave_prompt_msg">Haluatko varmasti poistua huoneesta?</string>
     <string name="room_participants_remove_prompt_msg">Haluatko varmasti poistaa käyttäjän %s tästä keskustelusta\?</string>
@@ -499,19 +454,16 @@
     <string name="room_participants_action_devices_list">Näytä istuntolista</string>
     <string name="room_participants_power_level_prompt">Olet ylentämässä käyttäjää samalle tasolle kuin oma käyttäjätasosi. Et voi perua tätä toimintoa.\nOletko varma?</string>
     <string name="room_participants_invite_prompt_msg">Haluatko kutsua käyttäjän %s tähän keskusteluun\?</string>
-    <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Kutsu tunnisteella</u></string>
     <string name="people_search_local_contacts">PAIKALLISET YHTEYSTIEDOT (%d)</string>
     <string name="people_search_filter_text">Vain Matrix-käyttäjät</string>
     <string name="people_search_invite_by_id_dialog_title">Kutsu käyttäjä tunnisteella</string>
     <string name="people_search_invite_by_id_dialog_description">Syötä yksi tai useampi sähköpostiosoite tai Matrix-tunniste</string>
     <string name="people_search_invite_by_id_dialog_hint">Sähköposti tai Matrix-tunniste</string>
-    <!--  Chat -->
     <string name="room_menu_search">Etsi</string>
     <string name="room_one_user_is_typing">%s kirjoittaa…</string>
     <string name="room_two_users_are_typing">%1$s ja %2$s kirjoittavat…</string>
     <string name="room_many_users_are_typing">%1$s, %2$s ja muita kirjoittaa…</string>
-    <!-- ??? this ain't right -->
     <string name="room_message_placeholder_encrypted">Lähetä salattu viesti…</string>
     <string name="room_message_placeholder_not_encrypted">Lähetä viesti (salaamaton)…</string>
     <string name="room_offline_notification">Yhteys palvelimeen katkesi.</string>
@@ -523,21 +475,17 @@
     <string name="room_delete_unsent_messages">Poista lähettämättömät viestit</string>
     <string name="room_message_file_not_found">Tiedostoa ei löydy</string>
     <string name="room_do_not_have_permission_to_post">Sinulla ei ole oikeutta lähettää viestejä tähän huoneeseen.</string>
-    <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Luota</string>
     <string name="ssl_do_not_trust">Älä luota</string>
     <string name="ssl_logout_account">Kirjaudu ulos</string>
     <string name="ssl_remain_offline">Jätä huomiotta</string>
-    <!-- ??? -->
     <string name="ssl_fingerprint_hash">Sormenjälki (%s):</string>
     <string name="ssl_could_not_verify">Palvelimen identiteettiä ei voitu vahvistaa.</string>
-    <!-- ??? -->
     <string name="ssl_cert_not_trust">Tämä voi tarkoittaa että joku yrittää kaapata sinun viestintääsi tai että laitteesi ei luota palvelimen varmenteeseen.</string>
     <string name="ssl_cert_new_account_expl">Jos palvelimen ylläpitäjä on ilmoittanut, että tämä on odotettua, varmista että alla oleva sormenjälki on sama kuin hänen antamansa.</string>
     <string name="ssl_unexpected_existing_expl">Sertifikaatti johon laitteesi luotti aikaisemmin on vaihtunut. Tämä on HYVIN EPÄTAVALLISTA. On suositeltavaa, että ET hyväksy tätä uutta sertifikaattia.</string>
     <string name="ssl_expected_existing_expl">Sertifikaatti on vaihtunut ennestään luotetusta ei-luotettuun. Palvelin on voinut uusia sertifikaattinsa. Kysy palvelimen ylläpitäjältä, mikä sormenjäljen pitäisi olla.</string>
     <string name="ssl_only_accept">Hyväksy sertifikaatti vain, jos palvelimen ylläpitäjä on julkaissut sormenjäljen, joka täsmää yllä olevan kanssa.</string>
-    <!-- Room Details -->
     <string name="room_details_title">Huoneen tiedot</string>
     <string name="room_details_people">Henkilöt</string>
     <string name="room_details_files">Tiedostot</string>
@@ -545,14 +493,12 @@
     <string name="malformed_id">Epämuotoinen tunnus. Anna sähköpostiosoite tai Matrix-tunnus (esim. \'@tunnus:verkkotunnus\')</string>
     <string name="room_details_people_invited_group_name">KUTSUTUT</string>
     <string name="room_details_people_present_group_name">JÄSENET</string>
-    <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Syy sisällön ilmoittamiseen</string>
     <string name="room_event_action_report_prompt_ignore_user">Haluatko piilottaa kaikki tämän käyttäjän viestit\?
 \n
 \nHuomaa, että tämä toiminto käynnistää sovelluksen uudelleen ja siinä saattaa kestää jonkin aikaa.</string>
     <string name="room_event_action_cancel_upload">Peru lähetys</string>
     <string name="room_event_action_cancel_download">Peru lataus</string>
-    <!-- Search -->
     <string name="search_hint">Etsi</string>
     <string name="search_members_hint">Etsi huoneen jäsenistä</string>
     <string name="search_no_results">Ei tuloksia</string>
@@ -560,29 +506,13 @@
     <string name="tab_title_search_messages">VIESTIT</string>
     <string name="tab_title_search_people">HENKILÖT</string>
     <string name="tab_title_search_files">TIEDOSTOT</string>
-    <!-- Room recents -->
-    <string name="room_recents_join">LIITY</string>
-    <string name="room_recents_directory">LUETTELO</string>
-    <string name="room_recents_favourites">SUOSIKIT</string>
-    <string name="room_recents_conversations">HUONEET</string>
-    <string name="room_recents_low_priority">MATALA TÄRKEYS</string>
-    <!-- ??? doesn't sound quite right, but -->
-    <string name="room_recents_invites">KUTSUT</string>
-    <string name="room_recents_start_chat">Aloita keskustelu</string>
-    <string name="room_recents_create_room">Luo huone</string>
-    <string name="room_recents_join_room">Liity huoneeseen</string>
-    <string name="room_recents_join_room_title">Liity huoneeseen</string>
-    <string name="room_recents_join_room_prompt">Syötä huonetunniste tai -alias</string>
-    <!-- Directory -->
     <string name="directory_search_results_title">Selaa luetteloa</string>
     <string name="directory_searching_title">Haetaan luettelosta…</string>
-    <!-- home room settings -->
     <string name="room_settings_favourite">Suosikki</string>
     <string name="room_settings_de_prioritize">Matala tärkeys</string>
     <string name="room_settings_direct_chat">Yksityiskeskustelu</string>
     <string name="room_settings_leave_conversation">Poistu keskustelusta</string>
     <string name="room_settings_forget">Unohda</string>
-    <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Viestit</string>
     <string name="room_sliding_menu_settings">Asetukset</string>
     <string name="room_sliding_menu_version">Versio</string>
@@ -590,7 +520,6 @@
     <string name="room_sliding_menu_third_party_notices">Kolmannen osapuolen tiedot</string>
     <string name="room_sliding_menu_copyright">Tekijänoikeustiedot</string>
     <string name="room_sliding_menu_privacy_policy">Tietosuojakäytäntö</string>
-    <!-- Vector Settings -->
     <string name="settings_profile_picture">Profiilikuva</string>
     <string name="settings_display_name">Nimi</string>
     <string name="settings_email_address">Sähköposti</string>
@@ -618,7 +547,6 @@
     <string name="settings_copyright">Tekijänoikeus</string>
     <string name="settings_privacy_policy">Tietosuojakäytäntö</string>
     <string name="settings_clear_cache">Tyhjennä välimuisti</string>
-    <!--string name="settings_room_privacy_label">Privacy</string-->
     <string name="settings_user_settings">Käyttäjäasetukset</string>
     <string name="settings_notifications">Ilmoitukset</string>
     <string name="settings_ignored_users">Piilotetut henkilöt</string>
@@ -647,7 +575,6 @@
     <string name="settings_logged_in">Kirjautuneena nimellä</string>
     <string name="settings_home_server">Kotipalvelin</string>
     <string name="settings_identity_server">Identiteettipalvelin</string>
-    <!-- ??? -->
     <string name="account_email_validation_title">Odotetaan vahvistusta</string>
     <string name="account_email_validation_message">Tarkista sähköpostisi ja klikkaa sinne saamaasi linkkiä. Kun olet tehnyt tämän, paina jatka.</string>
     <string name="account_email_validation_error">Sähköpostin vahvistaminen epäonnistui. Tarkista sähköpostisi ja avaa lähettämässämme viestissä oleva linkki. Tämän jälkeen paina painiketta ”jatka”.</string>
@@ -665,7 +592,6 @@
 \nHuomaa, että tämä toiminto käynnistää sovelluksen uudelleen ja siinä saattaa kestää jonkin aikaa.</string>
     <string name="settings_delete_notification_targets_confirmation">Haluatko poistaa tämän ilmoituskohteen?</string>
     <string name="settings_delete_threepid_confirmation">Haluatko varmasti poistaa kohteen %1$s %2$s\?</string>
-    <!-- ??? what even is this -->
     <string name="settings_select_country">Valitse maa</string>
     <string name="settings_phone_number_country_label">Maa</string>
     <string name="settings_phone_number_country_error">Valitse maa</string>
@@ -676,37 +602,29 @@
     <string name="settings_phone_number_verification_error_empty_code">Anna aktivointikoodi</string>
     <string name="settings_phone_number_verification_error">Puhelinnumeron validointi epäonnistui</string>
     <string name="settings_phone_number_code">Aktivointikoodi</string>
-    <!-- Room Settings -->
-    <!-- room global settings-->
     <string name="room_settings_room_photo">Huoneen kuva</string>
     <string name="room_settings_room_name">Huoneen nimi</string>
     <string name="room_settings_topic">Aihe</string>
     <string name="room_settings_room_tag">Huoneen luokittelu</string>
     <string name="room_settings_tag_pref_dialog_title">Luokiteltu:</string>
-    <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Suosikki</string>
     <string name="room_settings_tag_pref_entry_low_priority">Matala tärkeys</string>
     <string name="room_settings_tag_pref_entry_none">Ei mikään</string>
-    <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Näkyvyys ja pääsy</string>
     <string name="room_settings_directory_visibility">Listaa tämä huone huoneluettelossa</string>
     <string name="room_settings_room_access_rules_pref_title">Huoneen pääsy</string>
     <string name="room_settings_room_read_history_rules_pref_title">Huoneen historian näkyvyys</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Ketkä saavat nähdä huoneen historian\?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Ketkä pääsevät tähän huoneeseen\?</string>
-    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Kuka tahansa</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Vain jäsenet (tämän asetuksen valitsemisesta alkaen)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Vain jäsenet (heidän kutsumisestaan alkaen)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Vain jäsenet (heidän liittymisestään alkaen)</string>
-    <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Linkittääksesi huoneeseen, sillä pitää olla osoite.</string>
     <string name="room_settings_room_access_entry_only_invited">Vain kutsutut</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Kaikki, jotka tietävät huoneen osoitteen (paitsi vieraat)</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Kaikki jotka tietävät huoneen osoitteen, mukaanlukien vieraat</string>
-    <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Porttikiellon saaneet käyttäjät</string>
-    <!-- advanced -->
     <string name="room_settings_category_advanced_title">Lisäasetukset</string>
     <string name="room_settings_room_internal_id">Tämän huoneen sisäinen ID</string>
     <string name="room_settings_addresses_pref_title">Osoitteet</string>
@@ -717,7 +635,6 @@
     <string name="room_settings_labs_end_to_end_warnings">Kirjaudu ulos salauksen aktivoimiseksi.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Lähetä salatut viestit vain vahvistetuille laitteille</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Älä lähetä tältä laitteelta salattuja viestejä tämän huoneen vahvistamattomille laitteille.</string>
-    <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Huoneella ei ole paikallisia osoitteita</string>
     <string name="room_settings_addresses_add_new_address">Uusi osoite (esim. #foo:matrix.org")</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Virheellinen aliaksen muoto</string>
@@ -732,14 +649,9 @@
     <string name="room_settings_addresses_e2e_disabled">Tämä huone ei käytä salausta.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Ota salaus käyttöön 
 \n(varoitus: salausta ei voi poistaa käytöstä!)</string>
-    <!-- Directory -->
     <string name="directory_title">Luettelo</string>
-    <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s yritti ladata tietyn kohdan huoneen historiassa, mutta sitä ei löytynyt.</string>
-    <!-- ??? -->
-    <!-- encryption dialog -->
     <string name="encryption_information_title">Päästä päähän -salauksen lisätiedot</string>
-    <!-- ??? all of this encryption stuff here translated to Finnish sounds sort of dubious -->
     <string name="encryption_information_device_info">Tapahtuman tiedot</string>
     <string name="encryption_information_user_id">Käyttäjän Matrix-ID</string>
     <string name="encryption_information_curve25519_identity_key">Curve25519-ID-avain</string>
@@ -780,20 +692,16 @@
     <string name="encryption_information_unblock">Poista kielto</string>
     <string name="encryption_information_verify_device">Vahvista laite</string>
     <string name="encryption_information_verify_device_warning">Vahvistaaksesi, että tähän laitteeseen voi luottaa, ota yhteyttä sen omistajaan jollain muulla tavalla (esimerkiksi soittamalla tai tapaamalla) ja varmista että hänen laitteensa avain on sama kuin alla oleva:</string>
-    <!-- ??? -->
     <string name="encryption_information_verify_device_warning2">Jos avaimet eivät täsmää, keskustelusi eivät luultavasti ole turvassa.</string>
     <string name="encryption_information_verify_key_match">Vahvistan, että avaimet täsmäävät</string>
-    <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Huoneessa on tuntemattomia istuntoja</string>
     <string name="unknown_devices_alert_message">Huoneessa on tuntemattomia laitteita joita ei ole vahvistettu.\nLaitteet eivät välttämättä kuulu väitetyille omistajilleen.\nJokainen uusi laite kannattaa vahvistaa ennen kuin jatkat, mutta voit myös lähettää viestit vahvistamattomille laitteille.\n\nTuntemattomat laitteet:</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">Valitse huoneluettelo</string>
     <string name="directory_server_fail_to_retrieve_server">Palvelin saattaa olla tavoittamattomissa tai ylikuormitettu</string>
     <string name="directory_server_type_homeserver">Syötä kotipalvelin, jolta julkiset huoneet listataan</string>
     <string name="directory_server_placeholder">Palvelimen nimi</string>
     <string name="directory_server_all_rooms_on_server">Kaikki huoneet palvelimella %s</string>
     <string name="directory_server_native_rooms">Kaikki alkuperäiset %s huoneet</string>
-    <!-- historical -->
     <string name="historical_placeholder">Etsi historiasta</string>
     <string name="user_directory_header">Käyttäjäluettelo</string>
     <string name="people_search_user_directory">KÄYTTÄJÄHAKEMISTO (%s)</string>
@@ -839,7 +747,6 @@
     <string name="widget_creation_failure">Pienoissovelluksen luonti epäonnistui</string>
     <string name="settings_labs_create_conference_with_jitsi">Luo konferenssipuheluita jitsin avulla</string>
     <string name="widget_delete_message_confirmation">Haluatko varmasti poistaa pienoissovelluksen tästä huoneesta\?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Sovelmaa ei voitu luoda.</string>
     <string name="widget_integration_failed_to_send_request">Pyynnön lähetys epäonnistui.</string>
     <string name="widget_integration_positive_power_level">Oikeustason täytyy olla positiivinen luku.</string>
@@ -850,19 +757,15 @@
     <string name="widget_integration_room_not_visible">Huone %s ei ole näkyvillä.</string>
     <string name="room_add_matrix_apps">Lisää integraatioita</string>
     <string name="settings_labs_native_camera">Käytä järjestelmän kamerasovellusta</string>
-    <!-- share keys -->
     <string name="you_added_a_new_device">Lisäsit uuden istunnon \'%s\', joka pyytää salausavaimia.</string>
     <string name="your_unverified_device_requesting">Vahvistamaton laitteesi \'%s\' pyytää salausavaimia.</string>
     <string name="start_verification">Aloita varmennus</string>
     <string name="share_without_verifying">Jaa ilman varmennusta</string>
     <string name="ignore_request">Hylkää pyyntö</string>
-    <!-- conference call -->
     <string name="conference_call_warning_title">Varoitus!</string>
     <string name="conference_call_warning_message">Konferenssipuhelut ovat kehitysvaiheessa eivätkä välttämättä luotettavia.</string>
-    <!-- slash commands -->
     <string name="command_error">Komentovirhe</string>
     <string name="unrecognized_command">Tuntematon komento: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Pois</string>
     <string name="notification_noisy">Äänekäs</string>
     <string name="encrypted_message">Salattu viesti</string>
@@ -897,7 +800,6 @@
     <string name="community_name_hint">Esimerkki</string>
     <string name="community_id">Yhteisön ID</string>
     <string name="community_id_hint">esimerkki</string>
-    <!-- group details -->
     <string name="group_details_home">Koti</string>
     <string name="group_details_people">Ihmiset</string>
     <string name="group_details_rooms">Huoneet</string>
@@ -938,9 +840,9 @@
     <string name="title_activity_choose_sticker">Lähetä tarra</string>
     <string name="are_you_sure">Oletko varma?</string>
     <string name="dialog_title_third_party_licences">Kolmannen osapuolen lisenssit</string>
-    <string name="download">Lataa</string>
-    <string name="accept">Hyväksy</string>
-    <string name="skip">Ohita</string>
+    <string name="action_download">Lataa</string>
+    <string name="action_accept">Hyväksy</string>
+    <string name="action_skip">Ohita</string>
     <string name="action_sign_out_confirmation_simple">Oletko varma, että haluat kirjautua ulos?</string>
     <string name="dialog_title_error">Virhe</string>
     <string name="send_bug_report_description_in_english">Jos mahdollista, kirjoita kuvaus englanniksi.</string>
@@ -960,13 +862,13 @@
     <string name="keys_backup_activate">Käytä avainten varmuuskopiointia</string>
     <string name="backup">Varmuuskopioi</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Menetät pääsyn salattuihin viesteihisi, ellet varmuuskopioi avaimiasi ennen uloskirjautumista.</string>
-    <string name="stay">Pysy</string>
-    <string name="speak">Puhu</string>
-    <string name="clear">Tyhjennä</string>
+    <string name="action_stay">Pysy</string>
+    <string name="action_speak">Puhu</string>
+    <string name="action_clear">Tyhjennä</string>
     <string name="missing_permissions_error">Tätä toimintoa ei voi tehdä puuttuvien oikeuksien takia.</string>
     <string name="call_anyway">Soita silti</string>
     <string name="done">Valmis</string>
-    <string name="abort">Keskeytä</string>
+    <string name="action_abort">Keskeytä</string>
     <string name="actions">Toiminnot</string>
     <string name="system_alerts_header">Järjestelmähälytykset</string>
     <string name="option_send_voice">Lähetä ääntä</string>
@@ -1337,7 +1239,7 @@
     <string name="keys_backup_info_title_version">Versio</string>
     <string name="keys_backup_info_title_algorithm">Algoritmi</string>
     <string name="keys_backup_info_title_signature">Allekirjoitus</string>
-    <string name="ignore">Jätä huomiotta</string>
+    <string name="action_ignore">Jätä huomiotta</string>
     <string name="auth_login_sso">Kirjaudu sisään kertakirjautumisella</string>
     <string name="login_error_unknown_host">Tämä osoite ei ole saavutettavissa. Tarkistathan osoitteen</string>
     <string name="login_error_ssl_handshake">Laitteesi käyttää vanhentunutta, haavoittuvaista TLS-protokollan versiota. Turvallisuutesi tähden et voi muodostaa yhteyttä</string>
@@ -1416,8 +1318,8 @@
     <string name="room_list_rooms_empty_title">Huoneet</string>
     <string name="room_list_rooms_empty_body">Huoneesi näytetään tässä. Napsauta + oikeasta alakulmasta aloittaaksesi.</string>
     <string name="title_activity_emoji_reaction_picker">Reaktiot</string>
-    <string name="reactions_agree">Samaa mieltä</string>
-    <string name="reactions_like">Tykkää</string>
+    <string name="action_agree">Samaa mieltä</string>
+    <string name="action_like">Tykkää</string>
     <string name="message_add_reaction">Lisää reaktio</string>
     <string name="message_view_reaction">Näytä reaktiot</string>
     <string name="reactions">Reaktiot</string>
@@ -1500,8 +1402,8 @@
     <string name="create_room_directory_title">Huoneluettelo</string>
     <string name="create_room_directory_description">Julkaise tämä huone huoneluettelossa</string>
     <string name="settings_push_rules">Viesti-ilmoitusten säännöt</string>
-    <string name="disconnect">Katkaise yhteys</string>
-    <string name="decline">Kieltäydy</string>
+    <string name="action_disconnect">Katkaise yhteys</string>
+    <string name="action_decline">Kieltäydy</string>
     <string name="people_no_identity_server">Identiteettipalvelinta ei ole määritetty.</string>
     <string name="call_failed_no_ice_title">Puhelu epäonnistui väärin määritetyn palvelimen takia</string>
     <string name="call_failed_dont_ask_again">Älä kysy uudestaan</string>
@@ -1584,8 +1486,8 @@
     <string name="settings_text_message_sent">Tekstiviesti on lähetetty numeroon %s. Syötä sen sisältämä varmistuskoodi.</string>
     <string name="settings_push_rules_no_rules">Viesti-ilmoitusten sääntöjä ei ole määritetty</string>
     <string name="a11y_create_direct_message">Luo uusi yksityiskeskustelu</string>
-    <string name="revoke">Kumoa</string>
-    <string name="review">Tarkasta</string>
+    <string name="action_revoke">Kumoa</string>
+    <string name="action_review">Tarkasta</string>
     <string name="auth_add_phone_message_2">Aseta puhelinnumerosi, ja voit myöhemmin antaa muiden löytää sinut puhelinnumerosi perusteella.</string>
     <string name="auth_add_email_phone_message_2">Aseta sähköpostisi tunnuksen palautusta varten. Myöhemmin voit asettaa sähköpostisi tai puhelinnumerosi löydettäviksi, jotta sinut voi löytää näillä tiedoilla.</string>
     <string name="auth_add_email_and_phone_message_2">Aseta sähköpostisi tunnuksen palautusta varten. Myöhemmin voit asettaa sähköpostisi tai puhelinnumerosi löydettäviksi, jotta sinut voi löytää näillä tiedoilla.</string>
@@ -1954,14 +1856,6 @@
     <string name="qr_code_scanned_by_other_no">Ei</string>
     <string name="no_connectivity_to_the_server_indicator">Yhteys kotipalvelimeen on poikki</string>
     <string name="settings_dev_tools">Kehittäjätyökalut</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d ääni</item>
-        <item quantity="other">%d ääntä</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d ääni - lopulliset tulokset</item>
-        <item quantity="other">%d ääntä - lopulliset tulokset</item>
-    </plurals>
     <string name="command_description_poll">Luo yksinkertaisen äänestyksen</string>
     <string name="verification_use_passphrase">Jos et pääse käsiksi olemassaolevaan istuntoon</string>
     <string name="new_signin">Uusi sisäänkirjautuminen</string>
@@ -2030,10 +1924,10 @@
     <string name="no_permissions_to_start_webrtc_call">Sinulla ei ole oikeuksia puhelun aloittamiseen tässä huoneessa</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Sinulla ei ole oikeuksia ryhmäpuhelun aloittamiseen</string>
     <string name="no_permissions_to_start_conf_call">Sinulla ei ole oikeuksia ryhmäpuhelun aloittamiseen tässä huoneessa</string>
-    <string name="reset">Nollaa</string>
-    <string name="dismiss">Jätä huomiotta</string>
-    <string name="pause_video">Tauko</string>
-    <string name="play_video">Toista</string>
+    <string name="action_reset">Nollaa</string>
+    <string name="action_dismiss">Jätä huomiotta</string>
+    <string name="action_pause">Tauko</string>
+    <string name="action_play">Toista</string>
     <string name="room_participants_action_ignore_prompt_msg">Käyttäjän huomiotta jättäminen piilottaa kyseisen käyttäjän viestit sinulta.
 \n
 \nVoit perua tämän milloin tahansa yleisissä asetuksissa.</string>
@@ -2326,8 +2220,8 @@
     <string name="invite_to_space_with_name_desc">He voivat selata avaruutta %s</string>
     <string name="invite_to_space_with_name">Kutsu avaruuteen %s</string>
     <string name="invite_by_link">Jaa linkki</string>
-    <string name="invite_by_mxid_or_mail">Kutsu käyttäjänimellä tai sähköpostilla</string>
-    <string name="invite_by_mxid">Kutsu käyttäjänimellä</string>
+    <string name="invite_by_username_or_mail">Kutsu käyttäjänimellä tai sähköpostilla</string>
+    <string name="invite_by_username">Kutsu käyttäjänimellä</string>
     <string name="invite_by_email">Kutsu sähköpostitse</string>
     <string name="invite_to_space">Kutsu avaruuteen %s</string>
     <string name="invite_people_menu">Kutsu ihmisiä</string>
diff --git a/vector/src/main/res/values-fr-rCA/strings.xml b/vector/src/main/res/values-fr-rCA/strings.xml
index cf9c07efb6..29ff6cf9bf 100644
--- a/vector/src/main/res/values-fr-rCA/strings.xml
+++ b/vector/src/main/res/values-fr-rCA/strings.xml
@@ -62,7 +62,6 @@
     <string name="verification_use_passphrase">Si vous n’avez pas accès à une session existante</string>
     <string name="verification_cannot_access_other_session">Utiliser une phrase secrète ou une clé de récupération</string>
     <string name="command_description_poll">Crée un sondage simple</string>
-    <string name="poll_item_selected_aria">Option sélectionnée</string>
     <string name="delete_account_data_warning">Supprimer les données du compte de type %1$s \?
 \n
 \nÀ utiliser avec précaution, ceci peut entraîner des comportements inattendus.</string>
@@ -190,7 +189,6 @@
     <string name="verification_request_waiting">En attente…</string>
     <string name="sent_verification_conclusion">Conclusion de la vérification</string>
     <string name="sent_a_reaction">A réagi avec : %s</string>
-    <string name="sent_a_bot_buttons">Boutons de robot</string>
     <string name="sent_a_poll">Sondage</string>
     <string name="send_a_sticker">Autocollants</string>
     <string name="sent_a_file">Fichier</string>
@@ -427,8 +425,8 @@
     <string name="reactions">Réactions</string>
     <string name="message_view_reaction">Voir les réactions</string>
     <string name="message_add_reaction">Ajouter une réaction</string>
-    <string name="reactions_like">J’aime</string>
-    <string name="reactions_agree">D’accord</string>
+    <string name="action_like">J’aime</string>
+    <string name="action_agree">D’accord</string>
     <string name="title_activity_emoji_reaction_picker">Réactions</string>
     <string name="room_list_rooms_empty_body">Vos salons seront affichés ici. Appuyez sur le « + » en bas à droite pour trouver ceux existant ou en créer de nouveaux.</string>
     <string name="room_list_rooms_empty_title">Salons</string>
@@ -518,14 +516,6 @@
         <item quantity="one">Envoyer l’image en taille originale</item>
         <item quantity="other">Envoyer les images en taille originale</item>
     </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d vote − Résultats finaux</item>
-        <item quantity="other">%d votes − Résultats finaux</item>
-    </plurals>
-    <plurals name="poll_info">
-        <item quantity="one">%d vote</item>
-        <item quantity="other">%d votes</item>
-    </plurals>
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d session active</item>
         <item quantity="other">%d sessions actives</item>
@@ -818,7 +808,7 @@
     <string name="command_description_discard_session_not_handled">Seulement pris en charge dans les salons chiffrés</string>
     <string name="command_description_discard_session">Force la session de groupe sortante actuelle dans un salon chiffré à être abandonnée</string>
     <string name="template_use_latest_app">Utilisez la dernière version de ${app_name} sur vos autres appareils :</string>
-    <string name="or_other_mx_capabale_client">ou un autre client Matrix qui prend en charge la signature croisée</string>
+    <string name="or_other_mx_capable_client">ou un autre client Matrix qui prend en charge la signature croisée</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
     <string name="template_app_desktop_web">${app_name} Web
@@ -1458,17 +1448,6 @@
     <string name="room_settings_all_messages_noisy">Notification sonore pour chaque message</string>
     <string name="directory_searching_title">Recherche dans le répertoire…</string>
     <string name="directory_search_results_title">Parcourir le répertoire</string>
-    <string name="room_recents_join_room_prompt">Saisissez un identifiant ou un alias de salon</string>
-    <string name="room_recents_join_room_title">Rejoindre un salon</string>
-    <string name="room_recents_join_room">Rejoindre le salon</string>
-    <string name="room_recents_create_room">Créer un salon</string>
-    <string name="room_recents_start_chat">Nouvelle discussion</string>
-    <string name="room_recents_invites">INVITATIONS</string>
-    <string name="room_recents_low_priority">PRIORITÉ BASSE</string>
-    <string name="room_recents_conversations">SALONS</string>
-    <string name="room_recents_favourites">FAVORIS</string>
-    <string name="room_recents_directory">RÉPERTOIRE</string>
-    <string name="room_recents_join">REJOINDRE</string>
     <string name="search_is_not_supported_in_e2e_room">La recherche dans les salons chiffrés n\'est pas encore prise en charge.</string>
     <string name="tab_title_search_files">FICHIERS</string>
     <string name="tab_title_search_people">PARTICIPANTS</string>
@@ -2004,7 +1983,7 @@
     <string name="dialog_title_warning">Attention</string>
     <string name="dialog_title_confirmation">Confirmation</string>
     <string name="action_return">Revenir</string>
-    <string name="disable">Désactiver</string>
+    <string name="action_disable">Désactiver</string>
     <string name="copied_to_clipboard">Copié dans le presse-papiers</string>
     <string name="action_unpublish">Dé-publier</string>
     <string name="action_switch">Changer</string>
@@ -2025,15 +2004,15 @@
     <string name="call_notification_hangup">Raccrocher</string>
     <string name="call_notification_reject">Refuser</string>
     <string name="call_notification_answer">Accepter</string>
-    <string name="decline">Refuser</string>
-    <string name="review">Examiner</string>
-    <string name="ignore">Ignorer</string>
-    <string name="abort">Annuler</string>
+    <string name="action_decline">Refuser</string>
+    <string name="action_review">Examiner</string>
+    <string name="action_ignore">Ignorer</string>
+    <string name="action_abort">Annuler</string>
     <string name="done">Terminé</string>
-    <string name="skip">Passer</string>
-    <string name="accept">Accepter</string>
+    <string name="action_skip">Passer</string>
+    <string name="action_accept">Accepter</string>
     <string name="offline">Hors ligne</string>
-    <string name="invite">Inviter</string>
+    <string name="action_invite">Inviter</string>
     <string name="or">ou</string>
     <string name="send_anyway">Envoyer quand même</string>
     <string name="call_anyway">Appeler quand même</string>
@@ -2058,34 +2037,34 @@
     <string name="ongoing_conference_call">Téléconférence en cours.
 \nLa rejoindre en %1$s ou en %2$s</string>
     <string name="start_chatting">Commencer une conversation</string>
-    <string name="reset">Réinitialiser</string>
-    <string name="dismiss">Ignorer</string>
-    <string name="pause_video">Pause</string>
-    <string name="play_video">Lancer</string>
+    <string name="action_reset">Réinitialiser</string>
+    <string name="action_dismiss">Ignorer</string>
+    <string name="action_pause">Pause</string>
+    <string name="action_play">Lancer</string>
     <string name="active_call">Appel en cours</string>
     <string name="report_content">Signaler le contenu</string>
-    <string name="disconnect">Déconnecter</string>
-    <string name="revoke">Révoquer</string>
+    <string name="action_disconnect">Déconnecter</string>
+    <string name="action_revoke">Révoquer</string>
     <string name="none">Aucun</string>
-    <string name="rename">Renommer</string>
-    <string name="delete">Supprimer</string>
+    <string name="action_rename">Renommer</string>
+    <string name="action_delete">Supprimer</string>
     <string name="view_decrypted_source">Afficher la source déchiffrée</string>
     <string name="view_source">Afficher la source</string>
     <string name="permalink">Permalien</string>
-    <string name="forward">Transférer</string>
+    <string name="action_forward">Transférer</string>
     <string name="later">Plus tard</string>
-    <string name="clear">Effacer</string>
-    <string name="speak">Parler</string>
-    <string name="share">Partager</string>
-    <string name="download">Télécharger</string>
-    <string name="quote">Citer</string>
-    <string name="redact">Effacer</string>
-    <string name="resend">Renvoyer</string>
-    <string name="send">Envoyer</string>
-    <string name="stay">Rester</string>
-    <string name="leave">Quitter</string>
-    <string name="save">Enregistrer</string>
-    <string name="cancel">Annuler</string>
+    <string name="action_clear">Effacer</string>
+    <string name="action_speak">Parler</string>
+    <string name="action_share">Partager</string>
+    <string name="action_download">Télécharger</string>
+    <string name="action_quote">Citer</string>
+    <string name="action_redact">Effacer</string>
+    <string name="action_resend">Renvoyer</string>
+    <string name="action_send">Envoyer</string>
+    <string name="action_stay">Rester</string>
+    <string name="action_leave">Quitter</string>
+    <string name="action_save">Enregistrer</string>
+    <string name="action_cancel">Annuler</string>
     <string name="ok">OK</string>
     <string name="loading">Chargement…</string>
     <string name="dialog_title_third_party_licences">Licences tierces</string>
@@ -2375,7 +2354,7 @@
     <string name="network_error">Erreur de réseau</string>
     <string name="unable_to_send_message">Envoi du message impossible</string>
     <string name="could_not_redact">Effacement impossible</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">L’appareil de l’expéditeur ne nous a pas envoyé les clés pour ce message.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">L’appareil de l’expéditeur ne nous a pas envoyé les clés pour ce message.</string>
     <string name="notice_crypto_unable_to_decrypt">** Déchiffrement impossible : %s **</string>
     <string name="notice_power_level_diff">%1$s de %2$s à %3$s</string>
     <string name="notice_power_level_changed">%1$s a modifié le rang de %2$s.</string>
@@ -2524,10 +2503,10 @@
     <string name="room_sync_in_progress">Synchronisation…</string>
     <string name="open_chat_header">Développer l’entête</string>
     <string name="list_members">Liste les membres</string>
-    <string name="reject">Rejeter</string>
-    <string name="preview">Aperçu</string>
-    <string name="join">Rejoindre</string>
-    <string name="remove">Supprimer</string>
+    <string name="action_reject">Rejeter</string>
+    <string name="action_preview">Aperçu</string>
+    <string name="action_join">Rejoindre</string>
+    <string name="action_remove">Supprimer</string>
     <string name="_continue">Continuer</string>
     <string name="no">NON</string>
     <string name="yes">OUI</string>
@@ -2768,7 +2747,7 @@
     <string name="invite_to_space_with_name_desc">Permettra de parcourir les salons de %s</string>
     <string name="invite_to_space_with_name">Inviter dans %s</string>
     <string name="invite_by_link">Partager le lien</string>
-    <string name="invite_by_mxid">Inviter par nom d’utilisateur</string>
+    <string name="invite_by_username">Inviter par nom d’utilisateur</string>
     <string name="invite_by_email">Inviter par courriel</string>
     <string name="invite_people_to_your_space_desc">Vous êtes seul·e pour l’instant. %s sera plus agréable avec de la compagnie.</string>
     <string name="invite_to_space">Inviter à %s</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index bd22736952..4abe66dc6e 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -39,7 +39,7 @@
     <string name="notice_room_third_party_invite">%1$s a envoyé une invitation à %2$s pour rejoindre le salon</string>
     <string name="notice_room_third_party_registered_invite">%1$s a accepté l’invitation de %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Déchiffrement impossible : %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">L’appareil de l’expéditeur ne nous a pas envoyé les clés pour ce message.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">L’appareil de l’expéditeur ne nous a pas envoyé les clés pour ce message.</string>
     <string name="could_not_redact">Effacement impossible</string>
     <string name="unable_to_send_message">Envoi du message impossible</string>
     <string name="message_failed_to_upload">L’envoi de l’image a échoué</string>
@@ -240,18 +240,18 @@
     <string name="title_activity_member_details">Informations sur ce participant</string>
     <string name="title_activity_historical">Historique</string>
     <string name="ok">OK</string>
-    <string name="cancel">Annuler</string>
-    <string name="save">Enregistrer</string>
-    <string name="send">Envoyer</string>
-    <string name="resend">Renvoyer</string>
-    <string name="share">Partager</string>
+    <string name="action_cancel">Annuler</string>
+    <string name="action_save">Enregistrer</string>
+    <string name="action_send">Envoyer</string>
+    <string name="action_resend">Renvoyer</string>
+    <string name="action_share">Partager</string>
     <string name="later">Plus tard</string>
-    <string name="forward">Transférer</string>
+    <string name="action_forward">Transférer</string>
     <string name="permalink">Permalien</string>
     <string name="view_source">Afficher la source</string>
     <string name="view_decrypted_source">Afficher la source déchiffrée</string>
-    <string name="delete">Supprimer</string>
-    <string name="rename">Renommer</string>
+    <string name="action_delete">Supprimer</string>
+    <string name="action_rename">Renommer</string>
     <string name="report_content">Signaler le contenu</string>
     <string name="active_call">Appel en cours</string>
     <string name="ongoing_conference_call">Téléconférence en cours.
@@ -265,7 +265,7 @@
     <string name="device_information">Informations sur la session</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Les téléconférences ne sont pas prises en charge dans les salons chiffrés</string>
     <string name="or">ou</string>
-    <string name="invite">Inviter</string>
+    <string name="action_invite">Inviter</string>
     <string name="action_sign_out">Se déconnecter</string>
     <string name="action_voice_call">Appel audio</string>
     <string name="action_video_call">Appel vidéo</string>
@@ -276,7 +276,7 @@
     <string name="action_open">Ouvrir</string>
     <string name="action_close">Fermer</string>
     <string name="copied_to_clipboard">Copié dans le presse-papiers</string>
-    <string name="disable">Désactiver</string>
+    <string name="action_disable">Désactiver</string>
     <string name="dialog_title_confirmation">Confirmation</string>
     <string name="dialog_title_warning">Attention</string>
     <string name="bottom_action_home">Accueil</string>
@@ -300,7 +300,7 @@
     <string name="no_room_placeholder">Aucun salon</string>
     <string name="no_public_room_placeholder">Aucun salon public disponible</string>
     <string name="title_activity_room">Salon</string>
-    <string name="redact">Effacer</string>
+    <string name="action_redact">Effacer</string>
     <string name="send_anyway">Envoyer quand même</string>
     <string name="send_bug_report_include_logs">Envoyer les journaux</string>
     <string name="send_bug_report_include_crash_logs">Envoyer les journaux d’erreur</string>
@@ -386,10 +386,10 @@
     <string name="yes">OUI</string>
     <string name="no">NON</string>
     <string name="_continue">Continuer</string>
-    <string name="remove">Supprimer</string>
-    <string name="join">Rejoindre</string>
-    <string name="preview">Aperçu</string>
-    <string name="reject">Rejeter</string>
+    <string name="action_remove">Supprimer</string>
+    <string name="action_join">Rejoindre</string>
+    <string name="action_preview">Aperçu</string>
+    <string name="action_reject">Rejeter</string>
     <string name="room_preview_try_join_an_unknown_room_default">un salon</string>
     <string name="room_creation_title">Nouvelle discussion</string>
     <string name="room_creation_add_member">Ajouter un membre</string>
@@ -444,16 +444,6 @@
     <string name="tab_title_search_messages">MESSAGES</string>
     <string name="tab_title_search_people">PARTICIPANTS</string>
     <string name="tab_title_search_files">FICHIERS</string>
-    <string name="room_recents_join">REJOINDRE</string>
-    <string name="room_recents_directory">RÉPERTOIRE</string>
-    <string name="room_recents_favourites">FAVORIS</string>
-    <string name="room_recents_conversations">SALONS</string>
-    <string name="room_recents_low_priority">PRIORITÉ BASSE</string>
-    <string name="room_recents_invites">INVITATIONS</string>
-    <string name="room_recents_start_chat">Nouvelle discussion</string>
-    <string name="room_recents_create_room">Créer un salon</string>
-    <string name="room_recents_join_room">Rejoindre le salon</string>
-    <string name="room_recents_join_room_title">Rejoindre un salon</string>
     <string name="directory_search_results_title">Parcourir le répertoire</string>
     <string name="directory_searching_title">Recherche dans le répertoire…</string>
     <string name="room_settings_favourite">Favori</string>
@@ -635,8 +625,8 @@
     <string name="attachment_cancel_upload">Annuler l’envoi \?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$d min %2$d s</string>
-    <string name="leave">Quitter</string>
-    <string name="quote">Citer</string>
+    <string name="action_leave">Quitter</string>
+    <string name="action_quote">Citer</string>
     <string name="call_error_user_not_responding">Le correspondant n’a pas décroché.</string>
     <string name="media_picker_both_capture_title">Prendre une photo ou une vidéo</string>
     <string name="permissions_rationale_popup_title">Information</string>
@@ -694,7 +684,6 @@
     <string name="room_event_action_report_prompt_ignore_user">Voulez-vous cacher tous les messages de cet utilisateur \?
 \n
 \nVeuillez noter que cette action redémarrera l’application et pourra prendre un certain temps.</string>
-    <string name="room_recents_join_room_prompt">Saisissez un identifiant ou un alias de salon</string>
     <string name="settings_turn_screen_on">Allumer l’écran pendant 3 secondes</string>
     <string name="settings_invited_to_room">Quand je suis invité sur un salon</string>
     <string name="settings_user_settings">Paramètres utilisateur</string>
@@ -789,7 +778,6 @@
     <string name="widget_creation_failure">La création du widget a échoué</string>
     <string name="settings_labs_create_conference_with_jitsi">Créer des appels en téléconférence avec jitsi</string>
     <string name="widget_delete_message_confirmation">Voulez-vous vraiment supprimer le widget de ce salon ?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Impossible de créer le widget.</string>
     <string name="widget_integration_failed_to_send_request">Échec de l’envoi de la requête.</string>
     <string name="widget_integration_positive_power_level">Le rang doit être un entier positif.</string>
@@ -813,14 +801,11 @@
     <string name="option_take_video">Prendre une vidéo</string>
     <string name="settings_analytics">Statistiques d’utilisation</string>
     <string name="settings_labs_native_camera">Utiliser la caméra de l’appareil</string>
-    <!-- share keys -->
     <string name="title_activity_bug_report">Rapport d’anomalie</string>
     <string name="conference_call_warning_title">Attention !</string>
     <string name="conference_call_warning_message">L’appel en téléconférence est en cours de développement et peut ne pas être fiable.</string>
-    <!-- slash commands -->
     <string name="command_error">Erreur de commande</string>
     <string name="unrecognized_command">Commande non reconnue : %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Désactivé</string>
     <string name="notification_noisy">Notification sonore</string>
     <string name="encrypted_message">Message chiffré</string>
@@ -855,7 +840,6 @@
     <string name="community_name_hint">Exemple</string>
     <string name="community_id">Identifiant de communauté</string>
     <string name="community_id_hint">Exemple</string>
-    <!-- group details -->
     <string name="group_details_home">Accueil</string>
     <string name="group_details_people">Personnes</string>
     <string name="group_details_rooms">Salons</string>
@@ -913,7 +897,6 @@
         <item quantity="one">%d widgets actif</item>
         <item quantity="other">%d widgets actifs</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="avatar">Avatar</string>
     <plurals name="membership_changes">
         <item quantity="one">%d changement de statut</item>
@@ -960,9 +943,9 @@
     <string name="deactivate_account_prompt_password">Pour poursuivre, veuillez renseigner votre mot de passe :</string>
     <string name="deactivate_account_submit">Désactiver le compte</string>
     <string name="dialog_title_third_party_licences">Licences tierces</string>
-    <string name="download">Télécharger</string>
-    <string name="speak">Parler</string>
-    <string name="clear">Effacer</string>
+    <string name="action_download">Télécharger</string>
+    <string name="action_speak">Parler</string>
+    <string name="action_clear">Effacer</string>
     <string name="e2e_re_request_encryption_key">Redemander les clés de chiffrement à vos autres sessions.</string>
     <string name="e2e_re_request_encryption_key_sent">Demande de clé envoyée.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Demande envoyée</string>
@@ -1083,7 +1066,7 @@
     <string name="template_settings_call_ringtone_use_app_ringtone">Utiliser la sonnerie par défaut de ${app_name} pour les appels entrants</string>
     <string name="settings_call_ringtone_title">Sonnerie d’appel entrant</string>
     <string name="settings_call_ringtone_dialog_title">Sélectionner la sonnerie pour les appels :</string>
-    <string name="accept">Accepter</string>
+    <string name="action_accept">Accepter</string>
     <string name="auth_accept_policies">Veuillez lire et accepter les politiques de ce serveur d’accueil :</string>
     <string name="settings_notification_troubleshoot">Résoudre les problèmes de notification</string>
     <string name="settings_troubleshoot_diagnostic">Diagnostics de résolution de problème</string>
@@ -1156,7 +1139,7 @@
     <string name="title_activity_keys_backup_setup">Sauvegarde de clé</string>
     <string name="title_activity_keys_backup_restore">Utiliser la sauvegarde de clé</string>
     <string name="keys_backup_is_not_finished_please_wait">La sauvegarde des clés n’est pas terminée, veuillez patienter…</string>
-    <string name="skip">Passer</string>
+    <string name="action_skip">Passer</string>
     <string name="done">Terminé</string>
     <string name="settings_notification_advanced">Paramètres de notification avancés</string>
     <string name="settings_notification_by_event">Importance des notifications par évènement</string>
@@ -1253,8 +1236,8 @@
     <string name="are_you_sure">En êtes-vous sûr \?</string>
     <string name="backup">Sauvegarder</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Vous n’aurez plus accès à vos messages chiffrés, sauf si vous sauvegardez vos clés avant de vous déconnecter.</string>
-    <string name="stay">Rester</string>
-    <string name="abort">Annuler</string>
+    <string name="action_stay">Rester</string>
+    <string name="action_abort">Annuler</string>
     <string name="action_sign_out_confirmation_simple">Voulez-vous vraiment vous déconnecter ?</string>
     <string name="settings_data_save_mode_summary">Le mode d’économie de données utilise un filtre spécifique qui ignore les notifications de présence et de saisie.</string>
     <string name="encryption_message_recovery">Récupération des messages chiffrés</string>
@@ -1300,7 +1283,7 @@
     <string name="keys_backup_restoring_computing_key_waiting_message">Traitement de la clé de récupération…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Téléchargement des clés…</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Importation des clés…</string>
-    <string name="ignore">Ignorer</string>
+    <string name="action_ignore">Ignorer</string>
     <string name="auth_login_sso">Se connecter avec l’authentification unique</string>
     <string name="login_error_unknown_host">Cette URL est injoignable, veuillez la vérifier</string>
     <string name="login_error_ssl_handshake">Votre appareil utilise une version obsolète du protocole de sécurité TLS, vulnérable aux attaques. Pour votre sécurité vous ne pourrez pas vous connecter</string>
@@ -1412,8 +1395,8 @@
     <string name="room_list_rooms_empty_title">Salons</string>
     <string name="room_list_rooms_empty_body">Vos salons seront affichés ici. Appuyez sur le « + » en bas à droite pour trouver ceux existant ou en créer de nouveaux.</string>
     <string name="title_activity_emoji_reaction_picker">Réactions</string>
-    <string name="reactions_agree">D’accord</string>
-    <string name="reactions_like">J’aime</string>
+    <string name="action_agree">D’accord</string>
+    <string name="action_like">J’aime</string>
     <string name="message_add_reaction">Ajouter une réaction</string>
     <string name="message_view_reaction">Voir les réactions</string>
     <string name="reactions">Réactions</string>
@@ -1493,8 +1476,8 @@
     <string name="direct_room_filter_hint">Filtrer par nom d’utilisateur ou identifiant…</string>
     <string name="joining_room">En train de rejoindre le salon…</string>
     <string name="message_view_edit_history">Voir l’historique des éditions</string>
-    <string name="review">Examiner</string>
-    <string name="decline">Refuser</string>
+    <string name="action_review">Examiner</string>
+    <string name="action_decline">Refuser</string>
     <string name="widget_integration_review_terms">Pour continuer, vous devez accepter les conditions de ce service.</string>
     <string name="terms_of_service">Conditions de service</string>
     <string name="review_terms">Examiner les conditions</string>
@@ -1502,8 +1485,8 @@
     <string name="terms_description_for_integration_manager">Utiliser des robots, passerelles, widgets et jeux d’autocollants</string>
     <string name="read_at">Lu à</string>
     <string name="none">Aucun</string>
-    <string name="revoke">Révoquer</string>
-    <string name="disconnect">Déconnecter</string>
+    <string name="action_revoke">Révoquer</string>
+    <string name="action_disconnect">Déconnecter</string>
     <string name="people_no_identity_server">Aucun serveur d’identité configuré.</string>
     <string name="call_failed_no_ice_title">L’appel a échoué en raison d’un serveur mal configuré</string>
     <string name="call_failed_no_ice_description">Demandez à l’administrateur de votre serveur d’accueil (%1$s) de configurer un serveur TURN afin que les appels fonctionnent de manière fiable.
@@ -1937,15 +1920,6 @@
     <string name="login_signup_username_hint">Nom d’utilisateur</string>
     <string name="settings_dev_tools">Outils de développement</string>
     <string name="settings_account_data">Données du compte</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d vote</item>
-        <item quantity="other">%d votes</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d vote − Résultats finaux</item>
-        <item quantity="other">%d votes − Résultats finaux</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Option sélectionnée</string>
     <string name="command_description_poll">Crée un sondage simple</string>
     <string name="verification_cannot_access_other_session">Utiliser une phrase secrète ou une clé de récupération</string>
     <string name="verification_use_passphrase">Si vous n’avez pas accès à une session existante</string>
@@ -2073,7 +2047,7 @@
 \n${app_name} pour Bureau</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">ou un autre client Matrix qui prend en charge la signature croisée</string>
+    <string name="or_other_mx_capable_client">ou un autre client Matrix qui prend en charge la signature croisée</string>
     <string name="template_use_latest_app">Utilisez la dernière version de ${app_name} sur vos autres appareils :</string>
     <string name="command_description_discard_session">Force la session de groupe sortante actuelle dans un salon chiffré à être abandonnée</string>
     <string name="command_description_discard_session_not_handled">Seulement pris en charge dans les salons chiffrés</string>
@@ -2147,9 +2121,9 @@
     <string name="identity_server_set_alternative_notice">Sinon, vous pouvez renseigner n’importe quelle autre URL de serveur d’identité</string>
     <string name="identity_server_set_alternative_notice_no_default">Renseignez l’URL d’un serveur d’identité</string>
     <string name="identity_server_set_alternative_submit">Valider</string>
-    <string name="play_video">Lancer</string>
-    <string name="pause_video">Pause</string>
-    <string name="dismiss">Ignorer</string>
+    <string name="action_play">Lancer</string>
+    <string name="action_pause">Pause</string>
+    <string name="action_dismiss">Ignorer</string>
     <string name="no_permissions_to_start_conf_call">Vous n’avez pas la permission de lancer une téléconférence dans ce salon</string>
     <string name="no_permissions_to_start_webrtc_call">Vous n\'avez pas la permission de lancer un appel dans ce salon</string>
     <string name="conference_call_in_progress">Une téléconférence est déjà en cours !</string>
@@ -2252,7 +2226,6 @@
     <string name="direct_room_profile_encrypted_subtitle">Les messages ici sont chiffrés de bout en bout.
 \n
 \nVos messages sont sécurisés avec des verrous et seuls vous et le destinataire en possédez la clé unique pour les déverrouiller.</string>
-    <string name="sent_a_bot_buttons">Boutons de robot</string>
     <string name="send_a_sticker">Autocollants</string>
     <string name="login_error_outdated_homeserver_warning_content">Ce serveur d\'accueil utilise une version obsolète. Demandez à l’administrateur de votre serveur d\'accueil de le mettre à jour. Vous pouvez continuer, mais certaines fonctionnalités peuvent ne pas fonctionner correctement.</string>
     <string name="login_server_url_form_common_notice">Entrez l’adresse du serveur que vous voulez utiliser</string>
@@ -2388,7 +2361,7 @@
     <string name="call_camera_front">Frontale</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Vous n’avez pas la permission de lancer un appel</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Vous n’avez pas la permission de lancer une téléconférence</string>
-    <string name="reset">Réinitialiser</string>
+    <string name="action_reset">Réinitialiser</string>
     <string name="failed_to_unban">Échec de la révocation du bannissement de l’utilisateur</string>
     <string name="alert_push_are_disabled_description">Vérifiez vos paramètres pour activer les notifications push</string>
     <string name="save_your_security_key_notice">Stockez votre clé de sécurité en lieu sûr comme un gestionnaire de mots de passe ou un coffre-fort.</string>
@@ -2729,7 +2702,7 @@
     <string name="invite_to_space_with_name_desc">Permettra de parcourir les salons de %s</string>
     <string name="invite_to_space_with_name">Inviter dans %s</string>
     <string name="invite_by_link">Partager le lien</string>
-    <string name="invite_by_mxid">Inviter par nom d’utilisateur</string>
+    <string name="invite_by_username">Inviter par nom d’utilisateur</string>
     <string name="invite_by_email">Inviter par e-mail</string>
     <string name="invite_people_to_your_space_desc">Vous êtes seul pour l’instant. %s sera plus agréable avec de la compagnie.</string>
     <string name="invite_people_to_your_space">Invitez des personnes dans votre espace</string>
@@ -2968,7 +2941,7 @@
     <string name="finish_setting_up_discovery">Terminer le réglage de la découverte.</string>
     <string name="create_space_identity_server_info_none">Vous n’utilisez actuellement pas de serveur d’identité. Pour inviter des proches et qu’ils puissent vous trouver, configurez-en un ci-dessous.</string>
     <string name="create_spaces_invite_public_header">Qui sont vos proches \?</string>
-    <string name="invite_by_mxid_or_mail">Inviter par nom d’utilisateur ou courriel</string>
+    <string name="invite_by_username_or_mail">Inviter par nom d’utilisateur ou courriel</string>
     <string name="create_spaces_invite_public_header_desc">Assurez-vous que l’accès à la société %s est accordé aux bonnes personnes. Vous pourrez en inviter d’autres plus tard.</string>
     <string name="command_description_add_to_space">Ajouter à l’espace mentionné</string>
     <string name="create_space_in_progress">Création de l’espace…</string>
diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index e2817c87d1..6c476689a8 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -32,28 +32,28 @@
     <string name="dialog_title_third_party_licences">Lisinsjes fan tredde partijen</string>
     <string name="loading">Lade…</string>
     <string name="ok">OK</string>
-    <string name="cancel">Annulearje</string>
-    <string name="save">Bewarje</string>
-    <string name="leave">Ferlitte</string>
-    <string name="stay">Bliuwe</string>
-    <string name="send">Ferstjoere</string>
-    <string name="resend">Opnij ferstjoere</string>
-    <string name="redact">Fuortsmite</string>
-    <string name="quote">Sitearje</string>
-    <string name="download">Downloade</string>
-    <string name="share">Diele</string>
-    <string name="speak">Ynsprekke</string>
-    <string name="clear">Wiskje</string>
+    <string name="action_cancel">Annulearje</string>
+    <string name="action_save">Bewarje</string>
+    <string name="action_leave">Ferlitte</string>
+    <string name="action_stay">Bliuwe</string>
+    <string name="action_send">Ferstjoere</string>
+    <string name="action_resend">Opnij ferstjoere</string>
+    <string name="action_redact">Fuortsmite</string>
+    <string name="action_quote">Sitearje</string>
+    <string name="action_download">Downloade</string>
+    <string name="action_share">Diele</string>
+    <string name="action_speak">Ynsprekke</string>
+    <string name="action_clear">Wiskje</string>
     <string name="later">Letter</string>
-    <string name="forward">Trochstjoere</string>
+    <string name="action_forward">Trochstjoere</string>
     <string name="permalink">Permalink</string>
     <string name="view_source">Boarne werjaan</string>
     <string name="view_decrypted_source">Untskoattele boarne werjaan</string>
-    <string name="delete">Fuortsmite</string>
-    <string name="rename">Omneame</string>
+    <string name="action_delete">Fuortsmite</string>
+    <string name="action_rename">Omneame</string>
     <string name="none">Gjin</string>
-    <string name="revoke">Ynlûke</string>
-    <string name="disconnect">Ferbining ferbrekke</string>
+    <string name="action_revoke">Ynlûke</string>
+    <string name="action_disconnect">Ferbining ferbrekke</string>
     <string name="report_content">Ynhâld melde</string>
     <string name="active_call">Aktive oprop</string>
     <string name="ongoing_conference_call">Rinnend gearkomstpetear.
@@ -70,15 +70,15 @@
     <string name="call_anyway">Dochs belje</string>
     <string name="send_anyway">Dochs ferstjoere</string>
     <string name="or">of</string>
-    <string name="invite">Utnûgje</string>
+    <string name="action_invite">Utnûgje</string>
     <string name="offline">Offline</string>
-    <string name="accept">Akseptearje</string>
-    <string name="skip">Oerslaan</string>
+    <string name="action_accept">Akseptearje</string>
+    <string name="action_skip">Oerslaan</string>
     <string name="done">Klear</string>
-    <string name="abort">Ofbrekke</string>
-    <string name="ignore">Negearje</string>
-    <string name="review">Beoardielje</string>
-    <string name="decline">Wegerje</string>
+    <string name="action_abort">Ofbrekke</string>
+    <string name="action_ignore">Negearje</string>
+    <string name="action_review">Beoardielje</string>
+    <string name="action_decline">Wegerje</string>
     <string name="action_exit">Ofslute</string>
     <string name="actions">Aksjes</string>
     <string name="action_sign_out">Ofmelde</string>
@@ -93,7 +93,7 @@
     <string name="action_open">Iepenje</string>
     <string name="action_close">Slute</string>
     <string name="copied_to_clipboard">Nei klamboerd kopiearre</string>
-    <string name="disable">Utskeakelje</string>
+    <string name="action_disable">Utskeakelje</string>
     <string name="dialog_title_confirmation">Befêstiging</string>
     <string name="dialog_title_warning">Warskôging</string>
     <string name="dialog_title_error">Flater</string>
@@ -295,9 +295,9 @@
     <string name="send_suggestion">Suggestje dwaan</string>
     <string name="room_preview_try_join_an_unknown_room_default">in keamer</string>
     <string name="room_creation_title">Nije chat</string>
-    <string name="preview">Ynsjen</string>
-    <string name="join">Meidwaan</string>
-    <string name="remove">Fuortsmite</string>
+    <string name="action_preview">Ynsjen</string>
+    <string name="action_join">Meidwaan</string>
+    <string name="action_remove">Fuortsmite</string>
     <string name="_continue">Trochgean</string>
     <string name="no">NEE</string>
     <string name="yes">JA</string>
@@ -548,8 +548,8 @@
     <string name="settings_developer_mode">Untwikkelersmodus</string>
     <string name="resource_limit_contact_action">Kontakt opnimme mei behearder</string>
     <string name="report_content_inappropriate">Dit is ûnfoech</string>
-    <string name="pause_video">Skoftsje</string>
-    <string name="play_video">Ofspylje</string>
+    <string name="action_pause">Skoftsje</string>
+    <string name="action_play">Ofspylje</string>
     <string name="identity_server_set_alternative_submit">Ferstjoere</string>
     <string name="identity_server_not_defined">Jo brûke gjin identiteitsserver</string>
     <string name="sas_error_unknown">Unbekende flater</string>
@@ -859,11 +859,6 @@
     <string name="settings_profile_picture">Profylôfbylding</string>
     <string name="room_sliding_menu_version_x">Ferzje %s</string>
     <string name="room_sliding_menu_version">Ferzje</string>
-    <string name="room_recents_invites">ÚTNÛGINGEN</string>
-    <string name="room_recents_low_priority">LEGE PRIORITEIT</string>
-    <string name="room_recents_conversations">KEAMERS</string>
-    <string name="room_recents_favourites">FAVORITEN</string>
-    <string name="room_recents_directory">MAP</string>
     <string name="tab_title_search_rooms">KEAMERS</string>
     <string name="search_no_results">Gjin resultaten</string>
     <string name="room_event_action_cancel_download">Download annulearje</string>
@@ -1064,8 +1059,8 @@
     <string name="missing_permissions_title">Missende tastimmingen</string>
     <string name="spaces">Romten</string>
     <string name="learn_more">Mear ynfo</string>
-    <string name="reset">Opnij ynstelle</string>
-    <string name="dismiss">Slute</string>
+    <string name="action_reset">Opnij ynstelle</string>
+    <string name="action_dismiss">Slute</string>
     <string name="call_tile_in_call">Jo binne op dit stuit yn dit petear</string>
     <string name="settings_security_pin_code_change_pin_summary">Jo aktuele pinkoade wizigje</string>
     <string name="choose_locale_current_locale_title">Aktuele taal</string>
@@ -1163,7 +1158,7 @@
     <string name="notice_room_reject_with_reason">%1$s hat de útnûging wegere. Reden: %2$s</string>
     <string name="initial_sync_start_importing_account_crypto">Inisjele syngronisaasje:
 \nKryptografy ymportearje</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">It apparaat fan de ôfstjoerder hat gjin kaaien foar dit berjocht stjoerd.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">It apparaat fan de ôfstjoerder hat gjin kaaien foar dit berjocht stjoerd.</string>
     <string name="notice_power_level_diff">%1$s fan %2$s nei %3$s</string>
     <string name="notice_power_level_changed">%1$s hat it machtigingsnivo fan %2$s oanpast.</string>
     <string name="notice_power_level_changed_by_you">Jo hawwe it machtigingsnivo fan %1$s oanpast.</string>
@@ -1278,7 +1273,7 @@
     <string name="room_jump_to_first_unread">Gean nei net-lêzen</string>
     <string name="open_chat_header">Opskrift iepenje</string>
     <string name="list_members">Ledelist</string>
-    <string name="reject">Ofwize</string>
+    <string name="action_reject">Ofwize</string>
     <string name="permissions_denied_add_contact">Tagong jaan ta jo kontaktpersoanen.</string>
     <string name="permissions_denied_qr_code">Om de QR-koade te scannen moatte jo tagong ta de kamera jaan.</string>
     <string name="permissions_action_not_performed_missing_permissions">Sorry. De aksje is net tapast fanwegen ûntbrekkende rjochten</string>
@@ -1416,12 +1411,6 @@
         <item quantity="other">%d keamers</item>
     </plurals>
     <string name="directory_search_results_title">Katalogus trochblêdzje</string>
-    <string name="room_recents_join_room_prompt">Fier in petear(by)namme yn</string>
-    <string name="room_recents_join_room_title">In keamer yngean</string>
-    <string name="room_recents_join_room">De keamer yngean</string>
-    <string name="room_recents_create_room">Petear oanmeitsje</string>
-    <string name="room_recents_start_chat">Petear starte</string>
-    <string name="room_recents_join">LID WURDE</string>
     <string name="search_is_not_supported_in_e2e_room">Sykjen yn fersifere keamers wurdt op dit stuit net stipe.</string>
     <string name="tab_title_search_files">BESTANNEN</string>
     <string name="tab_title_search_people">PERSOANEN</string>
diff --git a/vector/src/main/res/values-ga/strings.xml b/vector/src/main/res/values-ga/strings.xml
index c5df827ee6..8638ebec5a 100644
--- a/vector/src/main/res/values-ga/strings.xml
+++ b/vector/src/main/res/values-ga/strings.xml
@@ -54,10 +54,10 @@
         <item quantity="other"></item>
     </plurals>
     <string name="room_sync_in_progress">Ag sioncronú…</string>
-    <string name="reject">Diúltaigh</string>
-    <string name="preview">Réamhamharc</string>
-    <string name="join">Téigh isteach</string>
-    <string name="remove">Bain</string>
+    <string name="action_reject">Diúltaigh</string>
+    <string name="action_preview">Réamhamharc</string>
+    <string name="action_join">Téigh isteach</string>
+    <string name="action_remove">Bain</string>
     <string name="_continue">Lean ar aghaidh</string>
     <string name="no">NÍL</string>
     <string name="yes">TÁ</string>
@@ -101,7 +101,7 @@
     <string name="dialog_title_warning">Rabhadh</string>
     <string name="dialog_title_confirmation">Deimhniú</string>
     <string name="action_return">Fill</string>
-    <string name="disable">Cuir as feidhm</string>
+    <string name="action_disable">Cuir as feidhm</string>
     <string name="action_unpublish">Neamhfoilsigh</string>
     <string name="action_switch">Athraigh</string>
     <string name="action_add">Cuir</string>
@@ -113,42 +113,42 @@
     <string name="action_exit">Fág</string>
     <string name="call_notification_reject">Diúltaigh</string>
     <string name="call_notification_answer">Glac</string>
-    <string name="decline">Diúltaigh</string>
-    <string name="review">Athbhreithnigh</string>
-    <string name="ignore">Déan neamhaird de</string>
-    <string name="abort">Tobscoir</string>
+    <string name="action_decline">Diúltaigh</string>
+    <string name="action_review">Athbhreithnigh</string>
+    <string name="action_ignore">Déan neamhaird de</string>
+    <string name="action_abort">Tobscoir</string>
     <string name="done">Críochnaithe</string>
-    <string name="skip">Léim</string>
-    <string name="accept">Glac</string>
+    <string name="action_skip">Léim</string>
+    <string name="action_accept">Glac</string>
     <string name="offline">As líne</string>
-    <string name="invite">Tabhair cuireadh</string>
+    <string name="action_invite">Tabhair cuireadh</string>
     <string name="or">nó</string>
     <string name="ongoing_conference_call_video">Fís</string>
     <string name="ongoing_conference_call_voice">Guth</string>
-    <string name="reset">Athshocraigh</string>
-    <string name="dismiss">Cuir uait</string>
-    <string name="pause_video">Cuir ar sos</string>
-    <string name="play_video">Cuir ar siúl</string>
-    <string name="disconnect">Dícheangail</string>
-    <string name="revoke">Cúlghair</string>
+    <string name="action_reset">Athshocraigh</string>
+    <string name="action_dismiss">Cuir uait</string>
+    <string name="action_pause">Cuir ar sos</string>
+    <string name="action_play">Cuir ar siúl</string>
+    <string name="action_disconnect">Dícheangail</string>
+    <string name="action_revoke">Cúlghair</string>
     <string name="none">Níl aon cheann</string>
-    <string name="rename">Athainmnigh</string>
-    <string name="delete">Bain amach</string>
+    <string name="action_rename">Athainmnigh</string>
+    <string name="action_delete">Bain amach</string>
     <string name="permalink">Nasc buan</string>
-    <string name="forward">Seol ar aghaidh</string>
+    <string name="action_forward">Seol ar aghaidh</string>
     <string name="later">Níos deireanaí</string>
-    <string name="clear">Glan</string>
-    <string name="speak">Labhair</string>
-    <string name="share">Roinn le</string>
-    <string name="download">Íoslódáil</string>
-    <string name="quote">Luaigh</string>
-    <string name="redact">Bain</string>
-    <string name="resend">Athsheol</string>
-    <string name="send">Seol</string>
-    <string name="stay">Fan</string>
-    <string name="leave">Fág</string>
-    <string name="save">Sábháil</string>
-    <string name="cancel">Cealaigh</string>
+    <string name="action_clear">Glan</string>
+    <string name="action_speak">Labhair</string>
+    <string name="action_share">Roinn le</string>
+    <string name="action_download">Íoslódáil</string>
+    <string name="action_quote">Luaigh</string>
+    <string name="action_redact">Bain</string>
+    <string name="action_resend">Athsheol</string>
+    <string name="action_send">Seol</string>
+    <string name="action_stay">Fan</string>
+    <string name="action_leave">Fág</string>
+    <string name="action_save">Sábháil</string>
+    <string name="action_cancel">Cealaigh</string>
     <string name="ok">Ceart go leor</string>
     <string name="loading">Ag lódáil…</string>
     <string name="title_activity_historical">Stairiúil</string>
diff --git a/vector/src/main/res/values-gl/strings.xml b/vector/src/main/res/values-gl/strings.xml
index 4af9956161..087871dba9 100644
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/vector/src/main/res/values-gl/strings.xml
@@ -42,7 +42,7 @@
     <string name="notice_room_third_party_invite">%1$s envioulle un convite a %2$s para que entre na sala</string>
     <string name="notice_room_third_party_registered_invite">%1$s aceptou o convite para %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Imposíbel descifrar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">O dispositivo do que envía non enviou as chaves desta mensaxe.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">O dispositivo do que envía non enviou as chaves desta mensaxe.</string>
     <string name="could_not_redact">Non se puido redactar</string>
     <string name="unable_to_send_message">Non foi posíbel enviar a mensaxe</string>
     <string name="network_error">Erro da conexión</string>
@@ -277,23 +277,23 @@
     <string name="title_activity_group_details">Detalles da comunidade</string>
     <string name="loading">Cargando…</string>
     <string name="ok">Aceptar</string>
-    <string name="cancel">Cancelar</string>
-    <string name="save">Gardar</string>
-    <string name="leave">Saír</string>
-    <string name="send">Enviar</string>
-    <string name="resend">Enviar de novo</string>
-    <string name="redact">Redactar</string>
-    <string name="quote">Citar</string>
-    <string name="share">Compartir</string>
+    <string name="action_cancel">Cancelar</string>
+    <string name="action_save">Gardar</string>
+    <string name="action_leave">Saír</string>
+    <string name="action_send">Enviar</string>
+    <string name="action_resend">Enviar de novo</string>
+    <string name="action_redact">Redactar</string>
+    <string name="action_quote">Citar</string>
+    <string name="action_share">Compartir</string>
     <string name="later">Despois</string>
     <string name="permalink">Ligazón permanente</string>
     <string name="view_source">Ver a fonte</string>
     <string name="view_decrypted_source">Ver a fonte descifrada</string>
-    <string name="delete">Borrar</string>
-    <string name="rename">Renomear</string>
+    <string name="action_delete">Borrar</string>
+    <string name="action_rename">Renomear</string>
     <string name="active_call">Chamada en curso</string>
     <string name="notification_listening_for_events">A escoita de eventos</string>
-    <string name="forward">Adiante</string>
+    <string name="action_forward">Adiante</string>
     <string name="report_content">Informar sobre contido</string>
     <string name="ongoing_conference_call">Conferencia en curso.
 \nÚnete con %1$s ou %2$s</string>
@@ -307,7 +307,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">As chamadas de conferencia non están soportadas en salas cifradas</string>
     <string name="send_anyway">Enviar igualmente</string>
     <string name="or">ou</string>
-    <string name="invite">Convidar</string>
+    <string name="action_invite">Convidar</string>
     <string name="offline">Fóra de liña</string>
     <string name="action_exit">Saír</string>
     <string name="actions">Accións</string>
@@ -321,7 +321,7 @@
     <string name="action_open">Abrir</string>
     <string name="action_close">Pechar</string>
     <string name="copied_to_clipboard">Copiado ao portaretallos</string>
-    <string name="disable">Desactivar</string>
+    <string name="action_disable">Desactivar</string>
     <string name="dialog_title_confirmation">Confirmación</string>
     <string name="dialog_title_warning">Aviso</string>
     <string name="bottom_action_home">Inicio</string>
@@ -349,9 +349,9 @@
     <string name="no_public_room_placeholder">Sen salas públicas accesibles</string>
     <string name="title_activity_choose_sticker">Enviar unha icona</string>
     <string name="dialog_title_third_party_licences">Licenzas de terceiras partes</string>
-    <string name="download">Descargar</string>
-    <string name="speak">Falar</string>
-    <string name="clear">Limpar</string>
+    <string name="action_download">Descargar</string>
+    <string name="action_speak">Falar</string>
+    <string name="action_clear">Limpar</string>
     <plurals name="public_room_nb_users">
         <item quantity="one">1 usuaria</item>
         <item quantity="other">%d usuarias</item>
@@ -443,8 +443,8 @@
     <string name="today">Hoxe</string>
     <string name="call">Chamar</string>
     <string name="_continue">Continuar</string>
-    <string name="remove">Eliminar</string>
-    <string name="reject">Rexeitar</string>
+    <string name="action_remove">Eliminar</string>
+    <string name="action_reject">Rexeitar</string>
     <string name="room_jump_to_first_unread">Ir á primeira mensaxe non lida.</string>
     <string name="room_participants_leave_prompt_title">Deixar a sala</string>
     <string name="room_participants_create">Crear</string>
@@ -482,11 +482,6 @@
     <string name="tab_title_search_messages">MENSAXES</string>
     <string name="tab_title_search_people">XENTE</string>
     <string name="tab_title_search_files">FICHEIROS</string>
-    <string name="room_recents_invites">Convites</string>
-    <string name="room_recents_start_chat">Iniciar conversa</string>
-    <string name="room_recents_create_room">Crear sala</string>
-    <string name="room_recents_join_room">Unirse á sala</string>
-    <string name="room_recents_join_room_title">Unirse á sala</string>
     <string name="directory_searching_title">Buscando cartafol…</string>
     <string name="room_settings_all_messages_noisy">Todas as mensaxes (alto)</string>
     <string name="room_settings_all_messages">Todas as mensaxes</string>
@@ -751,8 +746,8 @@
     <string name="media_slider_saved_message">Gardar nas descargas?</string>
     <string name="yes">SI</string>
     <string name="no">NON</string>
-    <string name="join">Unirse</string>
-    <string name="preview">Vista previa</string>
+    <string name="action_join">Unirse</string>
+    <string name="action_preview">Vista previa</string>
     <string name="room_preview_unlinked_email_warning">Este convite enviouse a %s, que non está asociada a esta conta.
 \nPodes conectarte cunha conta diferente, ou engadir este email á túa conta.</string>
     <string name="room_preview_try_join_an_unknown_room_default">unha sala</string>
@@ -779,11 +774,6 @@
     <string name="room_details_people_present_group_name">UNIUSE</string>
     <string name="room_event_action_cancel_upload">Cancelar a subida</string>
     <string name="room_event_action_cancel_download">Cancelar a descarga</string>
-    <string name="room_recents_join">UNIRSE</string>
-    <string name="room_recents_directory">DIRECTORIO</string>
-    <string name="room_recents_favourites">FAVORITOS</string>
-    <string name="room_recents_conversations">SALAS</string>
-    <string name="room_recents_low_priority">BAIXA PRIORIDADE</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">1 sala</item>
         <item quantity="other">%d salas</item>
@@ -832,14 +822,14 @@
     <string name="system_theme">Por defecto no sistema</string>
     <string name="missing_permissions_error">Debido á falta de permisos, esta acción non é posible.</string>
     <string name="start_chatting">Iniciar Chat</string>
-    <string name="reset">Restablecer</string>
-    <string name="dismiss">Desbotar</string>
-    <string name="pause_video">Deter</string>
-    <string name="play_video">Reproducir</string>
-    <string name="disconnect">Desconectar</string>
-    <string name="revoke">Revogar</string>
+    <string name="action_reset">Restablecer</string>
+    <string name="action_dismiss">Desbotar</string>
+    <string name="action_pause">Deter</string>
+    <string name="action_play">Reproducir</string>
+    <string name="action_disconnect">Desconectar</string>
+    <string name="action_revoke">Revogar</string>
     <string name="none">Nada</string>
-    <string name="stay">Permanecer</string>
+    <string name="action_stay">Permanecer</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Vas perder o acceso ás túas mensaxes cifradas a non ser que fagas unha copia de apoio das chaves antes de desconectar.</string>
     <string name="backup">Copiar</string>
     <string name="are_you_sure">Tes a certeza\?</string>
diff --git a/vector/src/main/res/values-hr/strings.xml b/vector/src/main/res/values-hr/strings.xml
index ae1e86433d..9a2c71a522 100644
--- a/vector/src/main/res/values-hr/strings.xml
+++ b/vector/src/main/res/values-hr/strings.xml
@@ -32,28 +32,28 @@
     <string name="dialog_title_third_party_licences">Licence trećih strana</string>
     <string name="loading">Učitavanje…</string>
     <string name="ok">U redu</string>
-    <string name="cancel">Odustani</string>
-    <string name="save">Spremi</string>
-    <string name="leave">Napusti</string>
-    <string name="stay">Ostani</string>
-    <string name="send">Pošalji</string>
-    <string name="resend">Pošalji ponovno</string>
-    <string name="redact">Ukloni</string>
-    <string name="quote">Citiraj</string>
-    <string name="download">Preuzmi</string>
-    <string name="share">Podijeli</string>
-    <string name="speak">Izgovori</string>
-    <string name="clear">Obriši</string>
+    <string name="action_cancel">Odustani</string>
+    <string name="action_save">Spremi</string>
+    <string name="action_leave">Napusti</string>
+    <string name="action_stay">Ostani</string>
+    <string name="action_send">Pošalji</string>
+    <string name="action_resend">Pošalji ponovno</string>
+    <string name="action_redact">Ukloni</string>
+    <string name="action_quote">Citiraj</string>
+    <string name="action_download">Preuzmi</string>
+    <string name="action_share">Podijeli</string>
+    <string name="action_speak">Izgovori</string>
+    <string name="action_clear">Obriši</string>
     <string name="later">Kasnije</string>
-    <string name="forward">Proslijedi</string>
+    <string name="action_forward">Proslijedi</string>
     <string name="permalink">Stalna poveznica</string>
     <string name="view_source">Vidi izvor</string>
     <string name="view_decrypted_source">Vidi dešifrirani izvor</string>
-    <string name="delete">Izbriši</string>
-    <string name="rename">Preimenuj</string>
+    <string name="action_delete">Izbriši</string>
+    <string name="action_rename">Preimenuj</string>
     <string name="none">Nije podešeno</string>
-    <string name="revoke">Opozovi</string>
-    <string name="disconnect">Odspoji se</string>
+    <string name="action_revoke">Opozovi</string>
+    <string name="action_disconnect">Odspoji se</string>
     <string name="report_content">Prijavi sadržaj</string>
     <string name="active_call">Aktivni poziv</string>
     <string name="ongoing_conference_call">Konferencijski poziv u tijeku.
@@ -70,15 +70,15 @@
     <string name="call_anyway">Svejedno zovi</string>
     <string name="send_anyway">Svejedno pošalji</string>
     <string name="or">ili</string>
-    <string name="invite">Pozovi</string>
+    <string name="action_invite">Pozovi</string>
     <string name="offline">Odspojen</string>
-    <string name="accept">Prihvati</string>
-    <string name="skip">Preskoči</string>
+    <string name="action_accept">Prihvati</string>
+    <string name="action_skip">Preskoči</string>
     <string name="done">Dovršeno</string>
-    <string name="abort">Obustavi</string>
-    <string name="ignore">Zanemari</string>
-    <string name="review">Pregledaj</string>
-    <string name="decline">Odbij</string>
+    <string name="action_abort">Obustavi</string>
+    <string name="action_ignore">Zanemari</string>
+    <string name="action_review">Pregledaj</string>
+    <string name="action_decline">Odbij</string>
     <string name="action_exit">Izađi</string>
     <string name="actions">Radnje</string>
     <string name="action_sign_out">Odjavi se</string>
@@ -93,7 +93,7 @@
     <string name="action_open">Otvori</string>
     <string name="action_close">Zatvori</string>
     <string name="copied_to_clipboard">Kopirano u spremnik</string>
-    <string name="disable">Onemogući</string>
+    <string name="action_disable">Onemogući</string>
     <string name="dialog_title_confirmation">Potvrda</string>
     <string name="dialog_title_warning">Upozorenje</string>
     <string name="dialog_title_error">Greška</string>
@@ -315,10 +315,10 @@
     <string name="yes">DA</string>
     <string name="no">NE</string>
     <string name="_continue">Nastavi</string>
-    <string name="remove">Ukloni</string>
-    <string name="join">Pridruži se</string>
-    <string name="preview">Pregledaj</string>
-    <string name="reject">Odbij</string>
+    <string name="action_remove">Ukloni</string>
+    <string name="action_join">Pridruži se</string>
+    <string name="action_preview">Pregledaj</string>
+    <string name="action_reject">Odbij</string>
     <string name="list_members">Nabroji članove</string>
     <string name="open_chat_header">Otvori zaglavlje</string>
     <string name="room_sync_in_progress">Sinkroniziranje…</string>
@@ -454,17 +454,6 @@
     <string name="tab_title_search_messages">PORUKE</string>
     <string name="tab_title_search_people">OSOBE</string>
     <string name="tab_title_search_files">DATOTEKE</string>
-    <string name="room_recents_join">PRIDRUŽILI SE</string>
-    <string name="room_recents_directory">POPIS</string>
-    <string name="room_recents_favourites">OMILJENO</string>
-    <string name="room_recents_conversations">SOBE</string>
-    <string name="room_recents_low_priority">NISKI PRIORITET</string>
-    <string name="room_recents_invites">POZIVNICE</string>
-    <string name="room_recents_start_chat">Započni ćaskanje</string>
-    <string name="room_recents_create_room">Izradi sobu</string>
-    <string name="room_recents_join_room">Pridruži se sobi</string>
-    <string name="room_recents_join_room_title">Pridruži se sobi</string>
-    <string name="room_recents_join_room_prompt">Unesite identitet ili alternativni naziv sobe</string>
     <string name="directory_search_results_title">Pregledaj popis</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d soba</item>
@@ -934,8 +923,8 @@
     <string name="room_list_rooms_empty_title">Sobe</string>
     <string name="room_list_rooms_empty_body">Ovdje će biti prikazane Vaše sobe</string>
     <string name="title_activity_emoji_reaction_picker">Reakcije</string>
-    <string name="reactions_agree">Složi se</string>
-    <string name="reactions_like">Sviđa mi se</string>
+    <string name="action_agree">Složi se</string>
+    <string name="action_like">Sviđa mi se</string>
     <string name="message_add_reaction">Dodaj reakciju</string>
     <string name="message_view_reaction">Pogledaj reakcije</string>
     <string name="reactions">Reakcije</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 525d355108..043dc86fbf 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -39,7 +39,7 @@
     <string name="notice_room_third_party_invite">%1$s meghívót küldött %2$s számára, hogy csatlakozzon a szobához</string>
     <string name="notice_room_third_party_registered_invite">%1$s elfogadta a meghívót ebbe: %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Visszafejtés sikertelen: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">A küldő eszköze nem küldte el a kulcsokat ehhez az üzenethez.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">A küldő eszköze nem küldte el a kulcsokat ehhez az üzenethez.</string>
     <string name="could_not_redact">Kitakarás sikertelen</string>
     <string name="unable_to_send_message">Üzenet küldése sikertelen</string>
     <string name="message_failed_to_upload">Kép feltöltése sikertelen</string>
@@ -198,20 +198,20 @@
     <string name="title_activity_settings">Beállítások</string>
     <string name="title_activity_historical">Előzmények</string>
     <string name="ok">OK</string>
-    <string name="cancel">Mégse</string>
-    <string name="save">Mentés</string>
-    <string name="leave">Elhagyás</string>
-    <string name="send">Küldés</string>
-    <string name="resend">Újraküldés</string>
-    <string name="redact">Törlés</string>
-    <string name="quote">Idézés</string>
-    <string name="share">Megosztás</string>
+    <string name="action_cancel">Mégse</string>
+    <string name="action_save">Mentés</string>
+    <string name="action_leave">Elhagyás</string>
+    <string name="action_send">Küldés</string>
+    <string name="action_resend">Újraküldés</string>
+    <string name="action_redact">Törlés</string>
+    <string name="action_quote">Idézés</string>
+    <string name="action_share">Megosztás</string>
     <string name="later">Később</string>
     <string name="permalink">Állandó hivatkozás</string>
     <string name="view_source">Forrás megtekintése</string>
     <string name="view_decrypted_source">Visszafejtett forrás megtekintése</string>
-    <string name="delete">Törlés</string>
-    <string name="rename">Átnevezés</string>
+    <string name="action_delete">Törlés</string>
+    <string name="action_rename">Átnevezés</string>
     <string name="report_content">Tartalom Bejelentése</string>
     <string name="active_call">Aktív hívás</string>
     <string name="ongoing_conference_call">Folyamatban lévő konferenciahívás.
@@ -226,7 +226,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">A titkosított szobákban nem támogatott a konferenciahívás</string>
     <string name="send_anyway">Küldés mindenképpen</string>
     <string name="or">vagy</string>
-    <string name="invite">Meghívás</string>
+    <string name="action_invite">Meghívás</string>
     <string name="action_sign_out">Kijelentkezés</string>
     <string name="action_voice_call">Hanghívás</string>
     <string name="action_video_call">Videohívás</string>
@@ -239,7 +239,7 @@
     <string name="copied_to_clipboard">Vágólapra másolva</string>
     <string name="dialog_title_confirmation">Megerősítés</string>
     <string name="dialog_title_warning">Figyelmeztetés</string>
-    <string name="disable">Tiltás</string>
+    <string name="action_disable">Tiltás</string>
     <string name="bottom_action_home">Kezdőképernyő</string>
     <string name="bottom_action_favourites">Kedvencek</string>
     <string name="bottom_action_people">Emberek</string>
@@ -405,14 +405,14 @@
     <string name="yes">IGEN</string>
     <string name="no">NEM</string>
     <string name="_continue">Folytatás</string>
-    <string name="remove">Eltávolítás</string>
-    <string name="join">Csatlakozás</string>
-    <string name="preview">Előnézet</string>
-    <string name="reject">Elutasítás</string>
+    <string name="action_remove">Eltávolítás</string>
+    <string name="action_join">Csatlakozás</string>
+    <string name="action_preview">Előnézet</string>
+    <string name="action_reject">Elutasítás</string>
     <string name="room_jump_to_first_unread">Ugrás az olvasatlanra</string>
     <string name="room_preview_invitation_format">Meg lettél hívva, hogy csatlakozz ehhez a szobához %s által</string>
     <string name="title_activity_member_details">Tagok adatai</string>
-    <string name="forward">Továbbítás</string>
+    <string name="action_forward">Továbbítás</string>
     <string name="room_preview_unlinked_email_warning">Ez a meghívó erre a címre lett küldve: %s, ami nincs összekötve a felhasználóddal.
 \nHa gondolod jelentkezz be egy másik felhasználóval, vagy add hozzá ezt az e-mail címet a felhasználódhoz.</string>
     <string name="room_preview_try_join_an_unknown_room">"%s szobához próbálsz hozzáférni.  Szeretnél csatlakozni, hogy részt tudj venni a beszélgetésben?"</string>
@@ -500,17 +500,6 @@ Vedd figyelembe, hogy az alkalmazás újraindul  ami sok időt vehet igénybe."<
     <string name="tab_title_search_messages">ÜZENETEK</string>
     <string name="tab_title_search_people">EMBEREK</string>
     <string name="tab_title_search_files">FÁJLOK</string>
-    <string name="room_recents_join">BELÉPÉS</string>
-    <string name="room_recents_directory">KÖNYVTÁR</string>
-    <string name="room_recents_favourites">KEDVENCEK</string>
-    <string name="room_recents_conversations">SZOBÁK</string>
-    <string name="room_recents_low_priority">ALACSONY PRIORITÁSÚ</string>
-    <string name="room_recents_invites">MEGHÍVÁSOK</string>
-    <string name="room_recents_start_chat">Csevegés indítása</string>
-    <string name="room_recents_create_room">Szoba létrehozása</string>
-    <string name="room_recents_join_room">Csatlakozás szobához</string>
-    <string name="room_recents_join_room_title">Csatlakozás egy szobához</string>
-    <string name="room_recents_join_room_prompt">Írd be a szoba azonosítóját vagy nevét</string>
     <string name="directory_search_results_title">Könyvtár böngészése</string>
     <string name="directory_searching_title">Könyvtár keresése…</string>
     <string name="room_settings_favourite">Kedvenc</string>
@@ -745,7 +734,6 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="widget_creation_failure">Kisalkalmazás létrehozása sikertelen</string>
     <string name="settings_labs_create_conference_with_jitsi">Hozz létre konferencia hívást a jitsi segítségével</string>
     <string name="widget_delete_message_confirmation">Biztos vagy benne hogy törölni akarod ezt a kisalkalmazást ebből a szobából?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Kisalkalmazás létrehozása sikertelen.</string>
     <string name="widget_integration_failed_to_send_request">Felkérés elküldése sikertelen.</string>
     <string name="widget_integration_positive_power_level">Az erősségi szintnek egy pozitív egész számnak kell lennie.</string>
@@ -771,14 +759,11 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="option_take_video">Videofelvétel</string>
     <string name="settings_analytics">Elemzés</string>
     <string name="settings_labs_native_camera">Beépített kamera használata</string>
-    <!-- share keys -->
     <string name="title_activity_bug_report">Hibajelentés</string>
     <string name="conference_call_warning_title">Figyelmeztetés!</string>
     <string name="conference_call_warning_message">A konferenciabeszélgetés fejlesztés alatt van, elképzelhető, hogy nem működik még megfelelően.</string>
-    <!-- slash commands -->
     <string name="command_error">Utasítás hiba</string>
     <string name="unrecognized_command">Ismeretlen utasítás: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Ki</string>
     <string name="notification_noisy">Hangos</string>
     <string name="encrypted_message">Titkosított üzenet</string>
@@ -811,7 +796,6 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="community_name_hint">Példa</string>
     <string name="community_id">Közösség azonosító</string>
     <string name="community_id_hint">példa</string>
-    <!-- group details -->
     <string name="group_details_rooms">Szobák</string>
     <string name="group_details_people">Emberek</string>
     <string name="no_users_placeholder">Nincsenek felhasználók</string>
@@ -876,7 +860,6 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
         <item quantity="one">%d aktív kisalkalmazás</item>
         <item quantity="other">%d aktív kisalkalmazás</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="avatar">Profilkép</string>
     <string name="receipt_avatar">Címzett profilképe</string>
     <string name="notice_avatar">Észlelési profilkép</string>
@@ -918,9 +901,9 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="deactivate_account_prompt_password">A folytatáshoz add meg a jelszavadat:</string>
     <string name="deactivate_account_submit">Fiók felfüggesztése</string>
     <string name="dialog_title_third_party_licences">Harmadik felektől származó licencek</string>
-    <string name="download">Letöltés</string>
-    <string name="speak">Beszéd</string>
-    <string name="clear">Törlés</string>
+    <string name="action_download">Letöltés</string>
+    <string name="action_speak">Beszéd</string>
+    <string name="action_clear">Törlés</string>
     <string name="e2e_re_request_encryption_key">Végpontok közötti titkosításhoz használt kulcsok újrakérése a többi munkamenetedtől.</string>
     <string name="e2e_re_request_encryption_key_sent">Kulcs újrakérve.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Kérés elküldve</string>
@@ -1041,7 +1024,7 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="template_settings_call_ringtone_use_app_ringtone">Az alapértelmezett ${app_name} csengőhang használata bejövő hívásokhoz</string>
     <string name="settings_call_ringtone_title">Bejövő hívás csengőhangja</string>
     <string name="settings_call_ringtone_dialog_title">Csengőhang kiválasztása a hívásokhoz:</string>
-    <string name="accept">Elfogadás</string>
+    <string name="action_accept">Elfogadás</string>
     <string name="auth_accept_policies">Nézd át és fogadd el a Matrix-kiszolgáló házirendjét:</string>
     <string name="settings_notification_troubleshoot">Értesítéshibák felderítése</string>
     <string name="settings_troubleshoot_diagnostic">Hibakereső diagnosztika</string>
@@ -1112,7 +1095,7 @@ Bármi amit a ${app_name} el akar végezni amíg a háttérben fut, agresszívan
     <string name="title_activity_keys_backup_setup">Kulcsmentés</string>
     <string name="title_activity_keys_backup_restore">Kulcsmentés használata</string>
     <string name="keys_backup_is_not_finished_please_wait">A kulcsok biztonsági mentése még tart, kis türelmet…</string>
-    <string name="skip">Kihagyás</string>
+    <string name="action_skip">Kihagyás</string>
     <string name="done">Kész</string>
     <string name="settings_notification_advanced">Haladó Értesítés beállítások</string>
     <string name="settings_notification_by_event">Értesítés fontosságának beállítása eseménynél</string>
@@ -1209,8 +1192,8 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törlik.</s
     <string name="are_you_sure">Biztos vagy benne?</string>
     <string name="backup">Mentés</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Elveszted a hozzáférésedet a titkosított üzeneteidhez, ha nem mented el a titkosítási kulcsaidat kilépés előtt.</string>
-    <string name="stay">Maradás</string>
-    <string name="abort">Megszakítás</string>
+    <string name="action_stay">Maradás</string>
+    <string name="action_abort">Megszakítás</string>
     <string name="action_sign_out_confirmation_simple">Biztos, hogy ki akarsz lépni?</string>
     <string name="settings_data_save_mode_summary">Az adatkímélő mód kiszűri az állapotjelentéseket és a gépelés jelentést az adatfolyamból.</string>
     <string name="encryption_message_recovery">Titkosított Üzenetek Visszaállítása</string>
@@ -1256,7 +1239,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="keys_backup_restoring_computing_key_waiting_message">Visszaállítási kulcs kiszámítása…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Kulcsok letöltése…</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Kulcsok betöltése…</string>
-    <string name="ignore">Figyelmen kívül hagyás</string>
+    <string name="action_ignore">Figyelmen kívül hagyás</string>
     <string name="auth_login_sso">Belépés egyszeri bejelelentkezéssel</string>
     <string name="login_error_unknown_host">Ez az URL nem érhető el, ellenőrizd</string>
     <string name="login_error_ssl_handshake">Az eszközöd elavult TLS biztonsági protokollt használ, amely támadható, a biztonságod érdekében nem csatlakozhatsz</string>
@@ -1366,8 +1349,8 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="room_list_rooms_empty_title">Szobák</string>
     <string name="room_list_rooms_empty_body">A szobáidat itt láthatod. Koppints a + -ra jobbra lent a meglévők kereséséhez vagy egy saját indításához.</string>
     <string name="title_activity_emoji_reaction_picker">Reakciók</string>
-    <string name="reactions_agree">Egyetértek</string>
-    <string name="reactions_like">Kedvelem</string>
+    <string name="action_agree">Egyetértek</string>
+    <string name="action_like">Kedvelem</string>
     <string name="message_add_reaction">Reakció hozzáadása</string>
     <string name="message_view_reaction">Reakciók megjelenítése</string>
     <string name="reactions">Reakciók</string>
@@ -1449,8 +1432,8 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="direct_room_filter_hint">Szűrés felhasználói névre vagy azonosítóra…</string>
     <string name="joining_room">Szobába belépés…</string>
     <string name="message_view_edit_history">Szerkesztési napló megtekintése</string>
-    <string name="review">Átnézés</string>
-    <string name="decline">Elutasítás</string>
+    <string name="action_review">Átnézés</string>
+    <string name="action_decline">Elutasítás</string>
     <string name="widget_integration_review_terms">A továbblépéshez el kell fogadnod a Felhasználási feltételeket.</string>
     <string name="terms_of_service">Felhasználási feltételek</string>
     <string name="review_terms">Feltételek átnézése</string>
@@ -1458,8 +1441,8 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="terms_description_for_integration_manager">Használj botokat, hidakat (bridges), kisalkalmazásokat és matrica csomagokat</string>
     <string name="read_at">Olvasd itt</string>
     <string name="none">Nincs</string>
-    <string name="revoke">Visszavonás</string>
-    <string name="disconnect">Bontás</string>
+    <string name="action_revoke">Visszavonás</string>
+    <string name="action_disconnect">Bontás</string>
     <string name="people_no_identity_server">Nincs beállítva azonosítási kiszolgáló.</string>
     <string name="call_failed_no_ice_title">A hívás a hibásan beállított kiszolgáló miatt sikertelen</string>
     <string name="call_failed_no_ice_description">Kérd meg a Matrix-kiszolgálód (%1$s) rendszergazdáját, hogy állítson be egy TURN-kiszolgálót, hogy a hívások megbízhatóan működjenek.
@@ -1894,15 +1877,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="login_signup_username_hint">Felhasználónév</string>
     <string name="settings_dev_tools">Fejlesztői Eszközök</string>
     <string name="settings_account_data">Fiók Adatok</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d szavazat</item>
-        <item quantity="other">%d szavazat</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d szavazat – Végeredmény</item>
-        <item quantity="other">%d szavazat – Végeredmény</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Kiválasztott Beállítások</string>
     <string name="command_description_poll">Egyszerű szavazás készítése</string>
     <string name="verification_cannot_access_other_session">Használd a visszaállítási eljárást</string>
     <string name="verification_use_passphrase">Ha nem érsz el létező munkamenetet</string>
@@ -2029,7 +2003,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \n${app_name} Desktop</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">"vagy más eszközök közötti hitelesítést támogató  Matrix-klienst"</string>
+    <string name="or_other_mx_capable_client">"vagy más eszközök közötti hitelesítést támogató  Matrix-klienst"</string>
     <string name="template_use_latest_app">Az ${app_name} legújabb kliensét használd a többi eszközödön:</string>
     <string name="command_description_discard_session">A jelenlegi csoport munkamenet törlését kikényszeríti a titkosított szobában</string>
     <string name="command_description_discard_session_not_handled">Csak a titkosított szobákban támogatott</string>
@@ -2104,7 +2078,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="identity_server_set_default_submit">%1$s használata</string>
     <string name="identity_server_set_alternative_notice">Vagy beírhatsz más azonosítási szerver URL-t</string>
     <string name="identity_server_set_alternative_notice_no_default">Add meg az azonosítási szerver URL-jét</string>
-    <string name="pause_video">Szünet</string>
+    <string name="action_pause">Szünet</string>
     <string name="action_copy">Másolás</string>
     <string name="dialog_title_success">Siker</string>
     <string name="bottom_action_notification">Értesítések</string>
@@ -2137,8 +2111,8 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="reset_secure_backup_title">Új Biztonsági Kulcs generálása, vagy a jelenlegi mentésedhez új Biztonsági Jelmondat megadása.</string>
     <string name="reset_secure_backup_warning">A jelenlegi Kulcsod vagy Jelmondatod ki lesz cserélve erre.</string>
     <string name="disabled_integration_dialog_title">Az integrációk ki vannak kapcsolva</string>
-    <string name="play_video">Lejátszás</string>
-    <string name="dismiss">Eltüntetés</string>
+    <string name="action_play">Lejátszás</string>
+    <string name="action_dismiss">Eltüntetés</string>
     <string name="no_permissions_to_start_conf_call">Nincs engedélyed konferenciahívást indítani ebben a szobában</string>
     <string name="conference_call_in_progress">Már folyamatban van egy konferencia!</string>
     <string name="video_meeting">Videomegbeszélés indítása</string>
@@ -2333,7 +2307,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="call_notification_answer">Fogadás</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Nincsen jogosultságod konferenciahívás indításához</string>
     <string name="start_chatting">Csevegés indítása</string>
-    <string name="reset">Visszaállítás</string>
+    <string name="action_reset">Visszaállítás</string>
     <string name="permissions_denied_add_contact">Engedélyezd a névjegyek elérését.</string>
     <string name="auth_msisdn_already_defined">Ez a telefonszám már meg van adva.</string>
     <string name="send_bug_report_include_key_share_history">Kulcs megosztási kérések naplójának küldése</string>
@@ -2511,7 +2485,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="invite_to_space_with_name_desc">Felfedezhetik ezt: %s</string>
     <string name="invite_to_space_with_name">Meghívó ide: %s</string>
     <string name="invite_by_link">Megosztás hivatkozás</string>
-    <string name="invite_by_mxid">Meghívás felhasználónévvel</string>
+    <string name="invite_by_username">Meghívás felhasználónévvel</string>
     <string name="invite_by_email">Meghívás e-maillel</string>
     <string name="invite_people_to_your_space_desc">Egyelőre csak te vagy itt, %s még jobb lehet másokkal együtt.</string>
     <string name="invite_to_space">Meghívó ide: %s</string>
@@ -2692,7 +2666,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \nAz üzeneteidet zárolással vannak biztosítva és csak neked és a címzetteknek van meg a kulcs hozzá.</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Itt az üzenetek nincsenek végponttól végpontig titkosítva.</string>
     <string name="sent_verification_conclusion">Azonosítás eredménye</string>
-    <string name="sent_a_bot_buttons">Bot Gomb</string>
     <string name="sent_a_poll">Szavazás</string>
     <string name="create_room_in_progress">Szoba létrehozása…</string>
     <string name="create_room_alias_invalid">Néhány karakter nem engedélyezett</string>
@@ -2964,7 +2937,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="discovery_invite">E-mail alapú meghívás, kapcsolatok megtalálása és sok más…</string>
     <string name="finish_setting_up_discovery">Felderíthetőségi beállítás befejezése.</string>
     <string name="create_space_identity_server_info_none">Jelenleg nem használsz azonosítási szolgáltatást. Ahhoz, hogy a csoporttársaidat meghívd vagy megtaláljanak állíts be egyet alább.</string>
-    <string name="invite_by_mxid_or_mail">Meghívás felhasználói névvel vagy e-mail címmel</string>
+    <string name="invite_by_username_or_mail">Meghívás felhasználói névvel vagy e-mail címmel</string>
     <string name="create_spaces_invite_public_header_desc">Ellenőrizd, hogy a megfelelő személyeknek van hozzáférése ehhez a céghez: %s. Később meghívhatsz másokat is.</string>
     <string name="create_spaces_invite_public_header">Kik a csoporttársaid\?</string>
     <string name="command_description_add_to_space">A megadott térhez adás</string>
diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index d71b4a7043..385e5dcc9e 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -12,18 +12,18 @@
     <string name="title_activity_settings">Pengaturan</string>
     <string name="title_activity_member_details">Detail Anggota</string>
     <string name="ok">OK</string>
-    <string name="cancel">Batal</string>
-    <string name="save">Simpan</string>
-    <string name="leave">Tinggalkan</string>
-    <string name="send">Kirim</string>
-    <string name="quote">Kutip</string>
-    <string name="share">Bagikan</string>
-    <string name="delete">Hapus</string>
-    <string name="rename">Ubah Nama</string>
+    <string name="action_cancel">Batal</string>
+    <string name="action_save">Simpan</string>
+    <string name="action_leave">Tinggalkan</string>
+    <string name="action_send">Kirim</string>
+    <string name="action_quote">Kutip</string>
+    <string name="action_share">Bagikan</string>
+    <string name="action_delete">Hapus</string>
+    <string name="action_rename">Ubah Nama</string>
     <string name="report_content">Laporkan Konten</string>
     <string name="device_information">Informasi Perangkat</string>
     <string name="or">atau</string>
-    <string name="invite">Undang</string>
+    <string name="action_invite">Undang</string>
     <string name="action_voice_call">Panggilan Suara</string>
     <string name="action_video_call">Panggilan Video</string>
     <string name="action_quick_reply">Balasan Cepat</string>
@@ -31,7 +31,7 @@
     <string name="dialog_title_confirmation">Konfirmasi</string>
     <string name="action_open">Buka</string>
     <string name="action_close">Tutup</string>
-    <string name="disable">Nonaktifkan</string>
+    <string name="action_disable">Nonaktifkan</string>
     <string name="bottom_action_favourites">Favorit</string>
     <string name="home_filter_placeholder_home">Cari ruang</string>
     <string name="home_filter_placeholder_favorites">Cari favorit</string>
@@ -66,8 +66,8 @@
     <string name="auth_opt_phone_number_placeholder">Nomor Telpon (piihan)</string>
     <string name="auth_repeat_password_placeholder">Ulangi kata sandi</string>
     <string name="auth_repeat_new_password_placeholder">Konfirmasi kata sandi baru</string>
-    <string name="resend">Kirim Ulang</string>
-    <string name="forward">Teruskan</string>
+    <string name="action_resend">Kirim Ulang</string>
+    <string name="action_forward">Teruskan</string>
     <string name="view_source">Tampilkan Sumber</string>
     <string name="permalink">Buat Tautan</string>
     <string name="view_decrypted_source">Tampilkan Sumber Terdekripsi</string>
@@ -129,10 +129,10 @@
     <string name="yes">YA</string>
     <string name="no">TIDAK</string>
     <string name="_continue">Lanjut</string>
-    <string name="remove">Hapus</string>
-    <string name="join">Gabung</string>
-    <string name="preview">Pratinjau</string>
-    <string name="reject">Tolak</string>
+    <string name="action_remove">Hapus</string>
+    <string name="action_join">Gabung</string>
+    <string name="action_preview">Pratinjau</string>
+    <string name="action_reject">Tolak</string>
     <string name="later">Nanti</string>
     <string name="send_anyway">Kirim Saja</string>
     <string name="template_no_contact_access_placeholder">${app_name} belum diizinkan untuk mengakses kontak lokal</string>
@@ -152,7 +152,7 @@
     <string name="encryption_information_unknown_device">perangkat tidak diketahui</string>
     <string name="encryption_information_verified">Terverifikasi</string>
     <string name="title_activity_historical">Jejak Percakapan</string>
-    <string name="redact">Hapus</string>
+    <string name="action_redact">Hapus</string>
     <string name="ongoing_conference_call">Panggilan massal sedang berlangsung.
 \nBergabung sebagai %1$s atau %2$s</string>
     <string name="ongoing_conference_call_voice">suara</string>
@@ -245,9 +245,9 @@
     <string name="title_activity_choose_sticker">Kirimkan Sticker</string>
     <string name="dialog_title_third_party_licences">Lisensi Pihak Ketiga</string>
     <string name="loading">Memuat…</string>
-    <string name="download">Unduh</string>
-    <string name="speak">Bicaralah</string>
-    <string name="clear">Bersihkan</string>
+    <string name="action_download">Unduh</string>
+    <string name="action_speak">Bicaralah</string>
+    <string name="action_clear">Bersihkan</string>
     <string name="missing_permissions_error">Ini tidak dapat dilakukan karena belum mendapat permisi.</string>
     <string name="action_exit">Keluar</string>
     <string name="actions">Tindakan</string>
@@ -413,17 +413,6 @@ Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna ${app_name} yan
     <string name="tab_title_search_messages">PESAN</string>
     <string name="tab_title_search_people">ORANG</string>
     <string name="tab_title_search_files">BERKAS</string>
-    <string name="room_recents_join">GABUNG</string>
-    <string name="room_recents_directory">DIREKTORI</string>
-    <string name="room_recents_favourites">FAVORIT</string>
-    <string name="room_recents_conversations">RUANG</string>
-    <string name="room_recents_low_priority">PRIORITAS RENDAH</string>
-    <string name="room_recents_invites">UNDANGAN</string>
-    <string name="room_recents_start_chat">Mulai percakapan</string>
-    <string name="room_recents_create_room">Buat ruang</string>
-    <string name="room_recents_join_room">Gabung ke ruang</string>
-    <string name="room_recents_join_room_title">Gabung ke ruang</string>
-    <string name="room_recents_join_room_prompt">Ketik id atau alias ruang</string>
     <string name="directory_search_results_title">Jelajahi direktori</string>
     <plurals name="directory_search_rooms">
         <item quantity="other">%d ruangan</item>
@@ -793,7 +782,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="receipt_avatar">Avatar penerima</string>
     <string name="command_description_deop_user">Demosi pengguna dengan id berikut</string>
     <string name="call_anyway">Tetap Panggil</string>
-    <string name="accept">Terima</string>
+    <string name="action_accept">Terima</string>
     <string name="dialog_title_error">Error</string>
     <string name="auth_accept_policies">Mohon telaah dan terima kebijakan homeserver ini:</string>
     <string name="settings_call_category">Panggilan</string>
@@ -873,9 +862,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="are_you_sure">Yakin\?</string>
     <string name="backup">Cadangkan</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Akses ke pesan terenkripsi akan hilang apabila Anda tidak mencadangkan kunci sebelum mencopot akun.</string>
-    <string name="skip">Lewatkan</string>
+    <string name="action_skip">Lewatkan</string>
     <string name="done">Selesai</string>
-    <string name="abort">Hentikan</string>
+    <string name="action_abort">Hentikan</string>
     <string name="action_sign_out_confirmation_simple">Anda yakin ingin mencopot akun\?</string>
     <string name="settings_notification_advanced">Pengaturan Pemberitahuan Lanjutan</string>
     <string name="settings_notification_by_event">Urgensi pemberitahuan lewat kejadian</string>
@@ -1126,9 +1115,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="call_notification_hangup">Tutup Telepon</string>
     <string name="call_notification_reject">Tolak</string>
     <string name="call_notification_answer">Terima</string>
-    <string name="decline">Tolak</string>
-    <string name="review">Tinjauan</string>
-    <string name="ignore">Abaikan</string>
+    <string name="action_decline">Tolak</string>
+    <string name="action_review">Tinjauan</string>
+    <string name="action_ignore">Abaikan</string>
     <string name="failed_to_remove_widget">Gagal menghapus widget</string>
     <string name="failed_to_add_widget">Gagal menambahkan widget</string>
     <string name="cannot_call_yourself_with_invite">Anda tidak dapat melakukan panggilan dengan diri sendiri, tunggu untuk peserta untuk menerima undangan</string>
@@ -1146,14 +1135,14 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="denied_permission_camera">Untuk melakukan tindakan ini, silakan berikan izin Kamera dari pengaturan sistem.</string>
     <string name="denied_permission_generic">Beberapa izin hilang untuk melakukan tindakan ini, mohon berikan izin dari pengaturan sistem.</string>
     <string name="start_chatting">Mulai Mengobrol</string>
-    <string name="reset">Atur Ulang</string>
-    <string name="dismiss">Hilangkan</string>
-    <string name="pause_video">Jeda</string>
-    <string name="play_video">Mainkan</string>
-    <string name="disconnect">Putuskan</string>
-    <string name="revoke">Batalkan</string>
+    <string name="action_reset">Atur Ulang</string>
+    <string name="action_dismiss">Hilangkan</string>
+    <string name="action_pause">Jeda</string>
+    <string name="action_play">Mainkan</string>
+    <string name="action_disconnect">Putuskan</string>
+    <string name="action_revoke">Batalkan</string>
     <string name="none">Tidak Ada</string>
-    <string name="stay">Tetap</string>
+    <string name="action_stay">Tetap</string>
     <string name="title_activity_verify_device">Verifikasi sesi</string>
     <string name="notification_sync_init">Inisialisasi layanan</string>
     <string name="system_theme">Standar Sistem</string>
@@ -1273,7 +1262,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="message_failed_to_upload">Tidak dapat mengunggah gambar</string>
     <string name="could_not_redact">Tidak dapat dihapus</string>
     <string name="unable_to_send_message">Tidak dapat mengirim pesan</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Perangkat pengirim belum mengirimi kami kunci untuk pesan ini.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Perangkat pengirim belum mengirimi kami kunci untuk pesan ini.</string>
     <string name="notice_crypto_unable_to_decrypt">** Tidak dapat mendekripsi: %s **</string>
     <string name="notice_power_level_diff">%1$s dari %2$s ke %3$s</string>
     <string name="notice_power_level_changed_by_you">Anda mengubah tingkat daya %1$s.</string>
@@ -2029,8 +2018,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="reactions">Reaksi</string>
     <string name="message_view_reaction">Tampilkan Reaksi</string>
     <string name="message_add_reaction">Tambah Reaksi</string>
-    <string name="reactions_like">Suka</string>
-    <string name="reactions_agree">Setuju</string>
+    <string name="action_like">Suka</string>
+    <string name="action_agree">Setuju</string>
     <string name="title_activity_emoji_reaction_picker">Reaksi</string>
     <string name="room_list_rooms_empty_body">Ruangan Anda akan ditampilkan di sini. Ketuk tombol + untuk memulai yang baru.</string>
     <string name="room_list_rooms_empty_title">Ruangan</string>
@@ -2173,7 +2162,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="verification_request_waiting">Menunggu…</string>
     <string name="sent_verification_conclusion">Kesimpulan Verifikasi</string>
     <string name="sent_a_reaction">Bereaksi dengan: %s</string>
-    <string name="sent_a_bot_buttons">Tombol Bot</string>
     <string name="sent_a_poll">Poll</string>
     <string name="send_a_sticker">Stiker</string>
     <string name="sent_a_file">File</string>
@@ -2422,8 +2410,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="invite_to_space_with_name_desc">Mereka akan dapat menjelajahi %s</string>
     <string name="invite_to_space_with_name">Undang ke %s</string>
     <string name="invite_by_link">Bagikan tautan</string>
-    <string name="invite_by_mxid_or_mail">Undang dari nama pengguna atau email</string>
-    <string name="invite_by_mxid">Undang dari nama pengguna</string>
+    <string name="invite_by_username_or_mail">Undang dari nama pengguna atau email</string>
+    <string name="invite_by_username">Undang dari nama pengguna</string>
     <string name="invite_by_email">Undang dari email</string>
     <string name="invite_people_to_your_space_desc">Hanya Anda saja saat ini. %s akan lebih baik dengan orang lain.</string>
     <string name="invite_to_space">Undang ke %s</string>
@@ -2684,7 +2672,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="command_description_discard_session">Memaksa sesi kelompok outbound saat ini di ruang terenkripsi untuk dihapus</string>
     <string name="template_use_latest_app">Gunakan ${app_name} di perangkat Anda yang lain:</string>
     <string name="template_use_other_session_content_description">Gunakan ${app_name} di perangkat Anda yang lain, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} untuk Android, atau client Matrix lainnya yang mendukung tanda tangan silang</string>
-    <string name="or_other_mx_capabale_client">atau client Matrix lainnya yang mendukung tanda tangan silang</string>
+    <string name="or_other_mx_capable_client">atau client Matrix lainnya yang mendukung tanda tangan silang</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
     <string name="template_app_desktop_web">${app_name} Web
@@ -2888,13 +2876,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="new_signin">Sign In Baru</string>
     <string name="verification_cannot_access_other_session">Gunakan Frasa Sandi Pemulihan atau Kunci</string>
     <string name="command_description_poll">Membuat poll sederhana</string>
-    <string name="poll_item_selected_aria">Opsi yang Dipilih</string>
-    <plurals name="poll_info_final">
-        <item quantity="other">%d suara — Hasil akhir</item>
-    </plurals>
-    <plurals name="poll_info">
-        <item quantity="other">%d suara</item>
-    </plurals>
     <string name="delete_account_data_warning">Hapus data akun dengan tipe %1$s\?
 \n
 \nHati-hati menggunakannya, ini dapat menyebabkan perilaku yang tidak terduga.</string>
diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml
index 6512cc3b7d..c1a97bb605 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@@ -46,7 +46,7 @@
     <string name="notice_profile_change_redacted">%1$s uppfærði notandasniðið sitt %2$s</string>
     <string name="notice_room_third_party_invite">%1$s sendi boð til %2$s um þátttöku í spjallrásinni</string>
     <string name="notice_room_third_party_registered_invite">%1$s samþykkti boð um að taka þátt í %2$s</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Tæki sendandans hefur ekki sent okkur dulritunarlyklana fyrir þessi skilaboð.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Tæki sendandans hefur ekki sent okkur dulritunarlyklana fyrir þessi skilaboð.</string>
     <string name="could_not_redact">Gat ekki ritstýrt</string>
     <string name="room_error_join_failed_empty_room">Ekki er í augnablikinu hægt að taka aftur þátt í spjallrás sem er tóm.</string>
     <string name="room_displayname_room_invite">Boð á spjallrás</string>
@@ -73,24 +73,24 @@
     <string name="title_activity_group_details">Nánar um samfélag</string>
     <string name="loading">Hleð inn…</string>
     <string name="ok">Í lagi</string>
-    <string name="cancel">Hætta við</string>
-    <string name="save">Vista</string>
-    <string name="leave">Fara út</string>
-    <string name="send">Senda</string>
-    <string name="resend">Endursenda</string>
-    <string name="redact">Ritstýra</string>
-    <string name="quote">Tilvitnun</string>
-    <string name="share">Deila</string>
+    <string name="action_cancel">Hætta við</string>
+    <string name="action_save">Vista</string>
+    <string name="action_leave">Fara út</string>
+    <string name="action_send">Senda</string>
+    <string name="action_resend">Endursenda</string>
+    <string name="action_redact">Ritstýra</string>
+    <string name="action_quote">Tilvitnun</string>
+    <string name="action_share">Deila</string>
     <string name="later">Seinna</string>
-    <string name="forward">Áframsenda</string>
+    <string name="action_forward">Áframsenda</string>
     <string name="permalink">Varanlegur tengill</string>
     <string name="view_source">Skoða frumkóða</string>
-    <string name="delete">Eyða</string>
-    <string name="rename">Endurnefna</string>
+    <string name="action_delete">Eyða</string>
+    <string name="action_rename">Endurnefna</string>
     <string name="device_information">Upplýsingar um tæki</string>
     <string name="send_anyway">Senda samt</string>
     <string name="or">eða</string>
-    <string name="invite">Bjóða</string>
+    <string name="action_invite">Bjóða</string>
     <string name="offline">Ónettengt</string>
     <string name="action_exit">Fara út</string>
     <string name="actions">Aðgerðir</string>
@@ -103,7 +103,7 @@
     <string name="action_open">Opna</string>
     <string name="action_close">Loka</string>
     <string name="copied_to_clipboard">Afritað á klippispjald</string>
-    <string name="disable">Gera óvirkt</string>
+    <string name="action_disable">Gera óvirkt</string>
     <string name="dialog_title_confirmation">Staðfesting</string>
     <string name="dialog_title_warning">Aðvörun</string>
     <string name="bottom_action_home">Heim</string>
@@ -199,10 +199,10 @@
     <string name="yes">JÁ</string>
     <string name="no">NEI</string>
     <string name="_continue">Halda áfram</string>
-    <string name="remove">Fjarlægja</string>
-    <string name="join">Taka þátt</string>
-    <string name="preview">Forskoðun</string>
-    <string name="reject">Hafna</string>
+    <string name="action_remove">Fjarlægja</string>
+    <string name="action_join">Taka þátt</string>
+    <string name="action_preview">Forskoðun</string>
+    <string name="action_reject">Hafna</string>
     <string name="list_members">Listi yfir meðlimi</string>
     <string name="open_chat_header">Opna haus</string>
     <string name="room_sync_in_progress">Samstilli…</string>
@@ -259,16 +259,6 @@
     <string name="tab_title_search_messages">SKILABOÐ</string>
     <string name="tab_title_search_people">FÓLK</string>
     <string name="tab_title_search_files">SKRÁR</string>
-    <string name="room_recents_join">TAKA ÞÁTT</string>
-    <string name="room_recents_directory">MAPPA</string>
-    <string name="room_recents_favourites">EFTIRLÆTI</string>
-    <string name="room_recents_conversations">SPJALLRÁSIR</string>
-    <string name="room_recents_low_priority">LÍTILL FORGANGUR</string>
-    <string name="room_recents_invites">BOÐSGESTIR</string>
-    <string name="room_recents_start_chat">Hefja spjall</string>
-    <string name="room_recents_create_room">Búa til spjallrás</string>
-    <string name="room_recents_join_room">Taka þátt í spjallrás</string>
-    <string name="room_recents_join_room_title">Taka þátt í spjallrás</string>
     <string name="directory_search_results_title">Vafra í möppu</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d spjallrás</item>
@@ -402,22 +392,18 @@
         <item quantity="one">%d virkur viðmótshluti</item>
         <item quantity="other">%d virkir viðmótshlutar</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_must_be_in_room">Þú ert ekki á þessari spjallrás.</string>
     <string name="widget_integration_no_permission_in_room">Þú hefur ekki réttindi til þess að gera þetta á þessari spjallrás.</string>
     <string name="widget_integration_room_not_visible">Spjallrásin %s er ekki sýnileg.</string>
     <string name="conference_call_warning_title">Aðvörun!</string>
     <string name="command_error">Skipanavilla</string>
     <string name="unrecognized_command">Óþekkt skipun: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Slökkt</string>
     <string name="notification_noisy">Hávært</string>
     <string name="encrypted_message">Dulrituð skilaboð</string>
-    <!-- groups creation -->
     <string name="create">Búa til</string>
     <string name="community_name_hint">Dæmi</string>
     <string name="community_id_hint">dæmi</string>
-    <!-- group details -->
     <string name="group_details_home">Heim</string>
     <string name="group_details_people">Fólk</string>
     <string name="group_details_rooms">Spjallrásir</string>
@@ -465,7 +451,6 @@
     <string name="call_error_answered_elsewhere">samtali svarað annars staðar</string>
     <string name="settings_call_invitations">Boð um samtal</string>
     <string name="settings_labs_native_camera">Nota innbyggða myndavél</string>
-    <!-- share keys -->
     <string name="create_community">Búa til samfélag</string>
     <string name="community_name">Heiti samfélags</string>
     <string name="community_id">Auðkenni samfélags</string>
@@ -502,7 +487,6 @@
     <string name="start_verification">Hefja sannvottun</string>
     <string name="share_without_verifying">Deila án sannvottunar</string>
     <string name="ignore_request">Hunsa beiðni</string>
-    <!-- conference call -->
     <string name="has_been_kicked">Þér hefur verið sparkað úr %1$s af %2$s</string>
     <string name="has_been_banned">Þú hefur verið settur í bann á %1$s af %2$s</string>
     <string name="room_settings_labs_pref_title">Tilraunir</string>
@@ -626,7 +610,6 @@
     <string name="people_search_invite_by_id"><u>Bjóða miðað við auðkenni</u></string>
     <string name="people_search_local_contacts">TENGILIÐIR Á TÆKI (%d)</string>
     <string name="people_search_invite_by_id_dialog_title">Bjóða notendum miðað við auðkenni</string>
-    <string name="room_recents_join_room_prompt">Settu inn auðkenni eða samheiti spjallrásar</string>
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s spjallrás fannst fyrir %2$s</item>
         <item quantity="other">%1$s spjallrásir fundust fyrir %2$s</item>
@@ -681,7 +664,6 @@
     <string name="you_added_a_new_device">Þú bættir við nýju tæki \'%s\', sem er að krefjast dulritunarlykla.</string>
     <string name="your_unverified_device_requesting">ósannvottaða tækið þitt \'%s\' er að krefjast dulritunarlykla.</string>
     <string name="conference_call_warning_message">Símafundir eru í þróun og gætu verið óáreiðanlegir.</string>
-    <!-- slash commands -->
     <string name="group_no_long_description">Kerfisstjóri samfélagsins hefur ekki gefið upp ítarlega lýsingu fyrir þetta samfélag.</string>
     <string name="directory_server_type_homeserver">Skrifaðu heimanetþjón til að telja upp opinberar spjallrásir á</string>
     <string name="widget_integration_missing_room_id">Vantar spjallrásarauðkenni í beiðni.</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index efb103b364..43bdfe5f55 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -39,7 +39,7 @@
     <string name="notice_room_third_party_invite">%1$s ha mandato un invito a %2$s per entrare alla stanza</string>
     <string name="notice_room_third_party_registered_invite">%1$s ha accettato l\'invito a %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Impossibile decriptare: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Il dispositivo del mittente non ha inviato le chiavi per questo messaggio.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Il dispositivo del mittente non ha inviato le chiavi per questo messaggio.</string>
     <string name="could_not_redact">Impossibile riscrivere</string>
     <string name="unable_to_send_message">Impossibile inviare il messaggio</string>
     <string name="message_failed_to_upload">Invio dell\'immagine fallito</string>
@@ -49,7 +49,6 @@
     <string name="medium_email">Indirizzo email</string>
     <string name="medium_phone_number">Numero di telefono</string>
     <string name="summary_user_sent_sticker">%1$s ha inviato uno sticker.</string>
-    <!-- Room display name -->
     <string name="room_displayname_invite_from">Invito da %s</string>
     <string name="room_displayname_room_invite">Invito nella stanza</string>
     <string name="room_displayname_two_members">%1$s e %2$s</string>
@@ -264,29 +263,27 @@
     <string name="notice_widget_jitsi_removed_by_you">Hai terminato la videoconferenza</string>
     <string name="notice_widget_jitsi_removed">Videoconferenza terminata da %1$s</string>
     <string name="notice_widget_jitsi_added">Videoconferenza iniziata da %1$s</string>
-    <!-- titles -->
     <string name="title_activity_home">Messaggi</string>
     <string name="title_activity_room">Stanza</string>
     <string name="title_activity_settings">Impostazioni</string>
     <string name="title_activity_member_details">Dettagli sui membri</string>
     <string name="title_activity_historical">Cronologia</string>
-    <!-- button names -->
     <string name="ok">OK</string>
-    <string name="cancel">Annulla</string>
-    <string name="save">Salva</string>
-    <string name="leave">Esci</string>
-    <string name="send">Invia</string>
-    <string name="resend">Rispedisci</string>
-    <string name="redact">Rimuovi</string>
-    <string name="quote">Cita</string>
-    <string name="share">Condividi</string>
+    <string name="action_cancel">Annulla</string>
+    <string name="action_save">Salva</string>
+    <string name="action_leave">Esci</string>
+    <string name="action_send">Invia</string>
+    <string name="action_resend">Rispedisci</string>
+    <string name="action_redact">Rimuovi</string>
+    <string name="action_quote">Cita</string>
+    <string name="action_share">Condividi</string>
     <string name="later">Ultimi</string>
-    <string name="forward">Inoltra</string>
+    <string name="action_forward">Inoltra</string>
     <string name="permalink">URL Link</string>
     <string name="view_source">Vedi il codice sorgente</string>
     <string name="view_decrypted_source">Vedi il codice sorgente decifrato</string>
-    <string name="delete">Elimina</string>
-    <string name="rename">Rinomina</string>
+    <string name="action_delete">Elimina</string>
+    <string name="action_rename">Rinomina</string>
     <string name="report_content">Segnala contenuto</string>
     <string name="active_call">Chiamata in corso</string>
     <string name="ongoing_conference_call">Avvio conferenza. 
@@ -301,9 +298,8 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Le stanze criptate non supportano le conferenze</string>
     <string name="send_anyway">Invia comunque</string>
     <string name="or">o</string>
-    <string name="invite">Invita</string>
+    <string name="action_invite">Invita</string>
     <string name="offline">Disconnesso</string>
-    <!-- actions -->
     <string name="action_sign_out">Disconnetti</string>
     <string name="action_voice_call">Chiamata audio</string>
     <string name="action_video_call">Chiamata video</string>
@@ -314,24 +310,19 @@
     <string name="action_open">Apri</string>
     <string name="action_close">Chiudi</string>
     <string name="copied_to_clipboard">Copiato negli appunti</string>
-    <string name="disable">Disabilita</string>
-    <!-- dialog titles -->
+    <string name="action_disable">Disabilita</string>
     <string name="dialog_title_confirmation">Conferma</string>
     <string name="dialog_title_warning">Attenzione</string>
-    <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Home</string>
     <string name="bottom_action_favourites">Preferiti</string>
     <string name="bottom_action_people">Chat dirette</string>
     <string name="bottom_action_rooms">Stanze</string>
-    <!-- Home screen -->
     <string name="home_filter_placeholder_home">Cerca</string>
     <string name="home_filter_placeholder_favorites">Cerca tra i preferiti</string>
     <string name="home_filter_placeholder_people">Cerca tra le chat dirette</string>
     <string name="home_filter_placeholder_rooms">Cerca tra le stanze</string>
-    <!-- Home fragment -->
     <string name="invitations_header">Inviti</string>
     <string name="low_priority_header">Bassa priorità</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">Conversazioni</string>
     <string name="local_address_book_header">Rubrica locale</string>
     <string name="user_directory_header">Elenco utenti</string>
@@ -339,7 +330,6 @@
     <string name="no_conversation_placeholder">Nessuna conversazione</string>
     <string name="template_no_contact_access_placeholder">${app_name} non ha avuto l\'autorizzazione ad accedere alla tua Rubrica locale</string>
     <string name="no_result_placeholder">Nessun risultato</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">Stanze</string>
     <string name="rooms_directory_header">Elenco stanze</string>
     <string name="no_room_placeholder">Nessuna stanza</string>
@@ -378,7 +368,6 @@
     <string name="call_notification_answer">Accetta</string>
     <string name="call_notification_reject">Rifiuta</string>
     <string name="call_notification_hangup">Riaggancia</string>
-    <!-- Authentication -->
     <string name="auth_login">Accedi</string>
     <string name="auth_register">Crea account</string>
     <string name="auth_submit">Invia</string>
@@ -426,7 +415,6 @@
     <string name="auth_reset_password_success_message">La tua password è stata reimpostata. 
 \n 
 \nSei stato disconnesso da tutte le sessioni e non riceverai più alcuna notifica. Per ripristinare le notifiche, riconnettiti su ciascun dispositivo.</string>
-    <!-- Login Screen -->
     <string name="login_error_must_start_http">L\'URL deve iniziare con http[s]://</string>
     <string name="login_error_network_error">Impossibile accedere: errore di rete</string>
     <string name="login_error_unable_login">Impossibile accedere</string>
@@ -441,28 +429,20 @@
     <string name="login_error_limit_exceeded">Sono state inviate troppe richieste</string>
     <string name="login_error_user_in_use">Questo nome utente è già in uso</string>
     <string name="login_error_login_email_not_yet">Il link nella mail non è ancora stato cliccato</string>
-    <!-- crypto warnings -->
-    <!-- read receipts list Screen -->
     <string name="read_receipts_list">Elenco ricevute lette</string>
-    <!-- accounts list Screen -->
-    <!-- image size selection -->
     <string name="compression_options">Invia come </string>
     <string name="compression_opt_list_original">Originario</string>
     <string name="compression_opt_list_large">Grande</string>
     <string name="compression_opt_list_medium">Medio</string>
     <string name="compression_opt_list_small">Piccolo</string>
-    <!-- media upload / download messages -->
     <string name="attachment_cancel_download">"Annullare il download?</string>
     <string name="attachment_cancel_upload">Annullare l\'upload?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
-    <!-- room creation dialog Screen -->
     <string name="yesterday">Ieri</string>
     <string name="today">Oggi</string>
-    <!-- room info dialog Screen -->
     <string name="room_info_room_name">Nome stanza</string>
     <string name="room_info_room_topic">Argomento stanza</string>
-    <!-- call string -->
     <string name="call_connected">Chiamata in corso</string>
     <string name="call_connecting">Chiamata in connessione…</string>
     <string name="call_ended">Chiamata terminata</string>
@@ -475,10 +455,8 @@
     <string name="call_error_ice_failed">La connessione al supporto multimediale è fallita</string>
     <string name="call_error_camera_init_failed">Impossibile avviare la fotocamera</string>
     <string name="call_error_answered_elsewhere">chiamata risposta altrove</string>
-    <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Fai una foto o un video</string>
     <string name="media_picker_cannot_record_video">Impossibile registrare video</string>
-    <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informazione</string>
     <string name="template_permissions_rationale_msg_storage">${app_name} deve essere autorizzato ad accedere alla tua Galleria di foto e video per poter inviare e salvare allegati.
 \n
@@ -499,31 +477,25 @@
 \n
 \nTi sta bene comunicare i dati di tutti i tuoi contatti per questo scopo\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Purtroppo l\'azione non è stata eseguita a causa di autorizzazioni mancanti</string>
-    <!-- medias slider string -->
     <string name="media_slider_saved">Salvato</string>
     <string name="media_slider_saved_message">Salvare nei download?</string>
     <string name="yes">SÌ</string>
     <string name="no">NO</string>
     <string name="_continue">Continua</string>
-    <!-- Actions -->
-    <string name="remove">Rimuovi</string>
-    <string name="join">Entra</string>
-    <string name="preview">Anteprima</string>
-    <string name="reject">Rifiuta</string>
-    <!-- Room -->
+    <string name="action_remove">Rimuovi</string>
+    <string name="action_join">Entra</string>
+    <string name="action_preview">Anteprima</string>
+    <string name="action_reject">Rifiuta</string>
     <string name="room_jump_to_first_unread">Vai ai non letti</string>
-    <!-- Room Preview -->
     <string name="room_preview_invitation_format">Sei stato invitato da %s a entrare in questa stanza</string>
     <string name="room_preview_unlinked_email_warning">Questo invito è stato spedito a %s, che non è associato a questo account.
 \nPuoi aggiungere questa email al tuo account o provare ad accedere con un account differente.</string>
     <string name="room_preview_try_join_an_unknown_room">Stai provando ad accedere a %s. Vuoi entrare e partecipare alla discussione\?</string>
     <string name="room_preview_try_join_an_unknown_room_default">una stanza</string>
     <string name="room_preview_room_interactions_disabled">Questa è l\'anteprima della stanza. Le interazioni sono disabilitate.</string>
-    <!-- Chat creation -->
     <string name="room_creation_title">Nuova chat</string>
     <string name="room_creation_add_member">Aggiungi utente</string>
     <string name="room_title_one_member">1 utente</string>
-    <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Esci dalla stanza</string>
     <string name="room_participants_leave_prompt_msg">Sei sicuro di voler uscire dalla stanza?</string>
     <string name="room_participants_remove_prompt_msg">Sei sicuro di voler rimuovere %s da questa chat?</string>
@@ -551,7 +523,6 @@
     <string name="room_participants_power_level_prompt">La nomina non potrà essere annullata perché darai a questo utente i tuoi stessi poteri.
 \nSicuro di voler procedere\?</string>
     <string name="room_participants_invite_prompt_msg">Sicuro di voler invitare %s\?</string>
-    <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Invita tramite ID utente </u></string>
     <string name="people_search_local_contacts">CONTATTI LOCALI (%d)</string>
     <string name="people_search_user_directory">ELENCO UTENTI (%s)</string>
@@ -559,7 +530,6 @@
     <string name="people_search_invite_by_id_dialog_title">Invita tramite ID utente</string>
     <string name="people_search_invite_by_id_dialog_description">Per favore inserisci uno o più indirizzi email o ID utente</string>
     <string name="people_search_invite_by_id_dialog_hint">Email o ID utente</string>
-    <!--  Chat -->
     <string name="room_menu_search">Cerca</string>
     <string name="room_one_user_is_typing">%s sta scrivendo…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s stanno scrivendo…</string>
@@ -575,7 +545,6 @@
     <string name="room_delete_unsent_messages">Elimina i messaggi non inviati</string>
     <string name="room_message_file_not_found">File non trovato</string>
     <string name="room_do_not_have_permission_to_post">Non hai il permesso di pubblicare in questa stanza.</string>
-    <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Fidati</string>
     <string name="ssl_do_not_trust">Non fidarti</string>
     <string name="ssl_logout_account">Disconnetti</string>
@@ -587,7 +556,6 @@
     <string name="ssl_unexpected_existing_expl">Il certificato è diverso da quello precedentemente contrassegnato sul tuo telefono come \"affidabile\". Questa cosa è MOLTO INSOLITA. Si raccomanda di NON ACCETTARE questo nuovo certificato.</string>
     <string name="ssl_expected_existing_expl">Il certificato del server è cambiato: quello precedente era stato contrassegnato come affidabile ma quello attuale no. Può darsi che il certificato precedente sia scaduto e sia stato semplicemente sostituito con uno nuovo. Contatta l\'amministratore del server per verificare l\'impronta digitale in uso.</string>
     <string name="ssl_only_accept">Contrassegna il certificato come affidabile solo se l\'mpronta digitale comunicata dall\'amministratore del server corrisponde a quella qua sopra.</string>
-    <!-- Room Details -->
     <string name="room_details_title">Dettagli stanza</string>
     <string name="room_details_people">Utenti</string>
     <string name="room_details_files">File</string>
@@ -595,14 +563,12 @@
     <string name="malformed_id">ID malformato. Dovrebbe essere un indirizzo email o un ID utente Matrix come \'@localpart:domain\'</string>
     <string name="room_details_people_invited_group_name">INVITATI</string>
     <string name="room_details_people_present_group_name">MEMBRI</string>
-    <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Motivo per cui segnali questo contenuto</string>
     <string name="room_event_action_report_prompt_ignore_user">Desideri nascondere tutti i messaggi di questo utente\? 
 \n
 \nTieni presente che questa azione riavvierà l\'app e ciò potrebbe richiedere molto tempo.</string>
     <string name="room_event_action_cancel_upload">Annulla l\'Upload</string>
     <string name="room_event_action_cancel_download">Annulla il Download</string>
-    <!-- Search -->
     <string name="search_hint">Cerca</string>
     <string name="search_members_hint">Cerca tra i membri della stanza</string>
     <string name="search_no_results">Nessun risultato</string>
@@ -610,28 +576,13 @@
     <string name="tab_title_search_messages">MESSAGGI</string>
     <string name="tab_title_search_people">UTENTI</string>
     <string name="tab_title_search_files">FILE</string>
-    <!-- Room recents -->
-    <string name="room_recents_join">ENTRA</string>
-    <string name="room_recents_directory">ELENCO</string>
-    <string name="room_recents_favourites">PREFERITI</string>
-    <string name="room_recents_conversations">STANZE</string>
-    <string name="room_recents_low_priority">BASSA PRIORITÀ</string>
-    <string name="room_recents_invites">INVITI</string>
-    <string name="room_recents_start_chat">Avvia chat</string>
-    <string name="room_recents_create_room">Crea stanza</string>
-    <string name="room_recents_join_room">Entra nella stanza</string>
-    <string name="room_recents_join_room_title">Entra in una stanza</string>
-    <string name="room_recents_join_room_prompt">Digita l\'ID stanza o il suo nome</string>
-    <!-- Directory -->
     <string name="directory_search_results_title">Esplora l\'elenco</string>
     <string name="directory_searching_title">Ricerca negli elenchi…</string>
-    <!-- home room settings -->
     <string name="room_settings_favourite">Preferito</string>
     <string name="room_settings_de_prioritize">Bassa priorità</string>
     <string name="room_settings_direct_chat">Chat diretta</string>
     <string name="room_settings_leave_conversation">Esci dalla conversazione</string>
     <string name="room_settings_forget">Dimentica</string>
-    <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Messaggi</string>
     <string name="room_sliding_menu_settings">Impostazioni</string>
     <string name="room_sliding_menu_version">Versione</string>
@@ -639,7 +590,6 @@
     <string name="room_sliding_menu_third_party_notices">Avvisi di terze parti</string>
     <string name="room_sliding_menu_copyright">Copyright</string>
     <string name="room_sliding_menu_privacy_policy">Politica sulla privacy</string>
-    <!-- Vector Settings -->
     <string name="settings_profile_picture">Immagine del profilo</string>
     <string name="settings_display_name">Nome visualizzato</string>
     <string name="settings_email_address">Email</string>
@@ -729,42 +679,33 @@
     <string name="settings_phone_number_verification_error_empty_code">Inserisci un codice di attivazione</string>
     <string name="settings_phone_number_verification_error">Errore durante la verifica del numero di telefono</string>
     <string name="settings_phone_number_code">Codice</string>
-    <!-- medias saving settings -->
     <string name="media_saving_period_3_days">3 giorni</string>
     <string name="media_saving_period_1_week">1 settimana</string>
     <string name="media_saving_period_1_month">1 mese</string>
     <string name="media_saving_period_forever">Per sempre</string>
-    <!-- Room Settings -->
-    <!-- room global settings-->
     <string name="room_settings_room_photo">Icona della stanza</string>
     <string name="room_settings_room_name">Nome della stanza</string>
     <string name="room_settings_topic">Argomento</string>
     <string name="room_settings_room_tag">Etichetta dela stanza</string>
     <string name="room_settings_tag_pref_dialog_title">Etichetta come:</string>
-    <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Preferito</string>
     <string name="room_settings_tag_pref_entry_low_priority">Bassa priorità</string>
     <string name="room_settings_tag_pref_entry_none">Nessuna etichetta</string>
-    <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Accesso e visibilità</string>
     <string name="room_settings_directory_visibility">Mostra questa stanza nell\'elenco delle stanze pubbliche</string>
     <string name="room_settings_room_access_rules_pref_title">Accesso alla stanza</string>
     <string name="room_settings_room_read_history_rules_pref_title">Accesso alla Timeline</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Chi può leggere la Timeline\?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Chi può entrare in questa stanza?</string>
-    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Chiunque</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Solo i membri (dal momento in cui questa opzione è stata selezionata)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Solo i membri (dal momento in cui vengono invitati)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Solo i membri (dal momento in cui entrano nella stanza)</string>
-    <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Una stanza deve avere un indirizzo per poter essere linkata.</string>
     <string name="room_settings_room_access_entry_only_invited">Solo le persone che sono state invitate</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Chiunque conosca il link della stanza, eccetto gli ospiti</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Chiunque conosca il link della stanza, compresi gli ospiti</string>
-    <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Utenti bannati</string>
-    <!-- advanced -->
     <string name="room_settings_category_advanced_title">Avanzate</string>
     <string name="room_settings_room_internal_id">ID interno della stanza</string>
     <string name="room_settings_addresses_pref_title">Indirizzi</string>
@@ -775,7 +716,6 @@
     <string name="room_settings_labs_end_to_end_warnings">Per abilitare la crittografia devi disconnetterti.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Cripta solo per le sessioni verificate</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Da questa sessione non inviare mai messaggi cifrati alle sessioni non verificate presenti in questa stanza.</string>
-    <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Questa stanza non ha indirizzi locali</string>
     <string name="room_settings_addresses_add_new_address">Nuovo indirizzo stanza (es. #foo:matrix.org)</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Il formato del nome della stanza non è corretto</string>
@@ -790,12 +730,9 @@
     <string name="room_settings_addresses_e2e_disabled">La Crittografia in questa stanza non è attiva.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Attiva crittografia
 \n(attenzione: non potrà più essere disattivata!)</string>
-    <!-- Directory -->
     <string name="directory_title">Elenco</string>
     <string name="settings_theme">Tema</string>
-    <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s stava cercando di caricare un punto specifico nella cronologia di questa stanza ma non è stato in grado di trovarlo.</string>
-    <!-- encryption dialog -->
     <string name="encryption_information_title">Informazioni sulla crittografia E2E</string>
     <string name="encryption_information_device_info">Informazioni sull\'evento</string>
     <string name="encryption_information_user_id">ID utente</string>
@@ -839,23 +776,19 @@
     <string name="encryption_information_verify_device_warning">Conferma confrontando la seguente con le impostazioni utente della tua altra sessione:</string>
     <string name="encryption_information_verify_device_warning2">Se non corrispondono, la sicurezza delle tue comunicazioni potrebbe essere compromessa.</string>
     <string name="encryption_information_verify_key_match">Ho verificato che le chiavi corrispondono</string>
-    <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">La stanza contiene sessioni sconosciute</string>
     <string name="unknown_devices_alert_message">Questa stanza contiene sessioni sconosciute che non sono state verificate. 
 \nNon v\'è alcuna garanzia che le sessioni appartengano agli utenti dichiarati. 
 \nTi consigliamo di verificare ogni sessione prima di continuare, ma se lo preferisci, è comunque possibile inviare il messaggio anche senza la verifica. 
 \n 
 \nSessioni sconosciute:</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">Scegli un elenco di stanze</string>
     <string name="directory_server_fail_to_retrieve_server">Il server potrebbe essere non disponibile o sovraccarico</string>
     <string name="directory_server_type_homeserver">Inserisci un Home Server per vedere le sue stanze pubbliche</string>
     <string name="directory_server_placeholder">Nome del server</string>
     <string name="directory_server_all_rooms_on_server">Tutte le stanze sull\'Home Server %s</string>
     <string name="directory_server_native_rooms">Tutte le stanze native %s</string>
-    <!-- historical -->
     <string name="historical_placeholder">Cerca tra i messaggi passati</string>
-    <!-- text size selection -->
     <string name="font_size">Dimensione font</string>
     <string name="tiny">Minuscolo</string>
     <string name="small">Piccolo</string>
@@ -873,7 +806,6 @@
     <string name="widget_no_power_to_manage">Devi avere il permesso per poter gestire i widget in questa stanza</string>
     <string name="settings_labs_create_conference_with_jitsi">Avvia una conferenza usando Jitsi</string>
     <string name="widget_delete_message_confirmation">Vuoi davvero eliminare questo widget dalla stanza\?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Impossibile creare il widget.</string>
     <string name="widget_integration_failed_to_send_request">L\'invio della richiesta è fallito.</string>
     <string name="widget_integration_must_be_in_room">Non sei in questa stanza.</string>
@@ -959,22 +891,17 @@
         <item quantity="one">%d widget attivo</item>
         <item quantity="other">%d widget attivi</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_room_not_visible">La stanza %s non è visibile.</string>
     <string name="settings_labs_native_camera">Usa la fotocamera di sistema</string>
-    <!-- share keys -->
     <string name="you_added_a_new_device">Hai aggiunto una nuova sessione \'%s\' che sta richiedendo le chiavi crittografiche.</string>
     <string name="your_unverified_device_requesting">La tua sessione non verificata \'%s\' sta chiedendo le chiavi crittografiche.</string>
     <string name="start_verification">Avvia la verifica</string>
     <string name="share_without_verifying">Condividi senza verificare</string>
     <string name="ignore_request">Ignora la richiesta</string>
-    <!-- conference call -->
     <string name="conference_call_warning_title">Attenzione!</string>
     <string name="conference_call_warning_message">Le conferenze sono in fase di sviluppo e potrebbero non essere affidabili.</string>
-    <!-- slash commands -->
     <string name="command_error">Errore di comando</string>
     <string name="unrecognized_command">Comando non riconosciuto: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Spento</string>
     <string name="notification_noisy">Rumoroso</string>
     <string name="create">Crea</string>
@@ -983,7 +910,6 @@
     <string name="community_name_hint">Esempio</string>
     <string name="community_id">ID comunità</string>
     <string name="community_id_hint">esempio</string>
-    <!-- group details -->
     <string name="group_details_home">Home</string>
     <string name="group_details_rooms">Stanze</string>
     <string name="no_users_placeholder">Nessun utente</string>
@@ -1046,9 +972,9 @@
     <string name="deactivate_account_prompt_password">Per continuare, inserisci la tua password:</string>
     <string name="deactivate_account_submit">Disattiva l\'account</string>
     <string name="dialog_title_third_party_licences">Licenze di terze parti</string>
-    <string name="download">Scarica</string>
-    <string name="speak">Parla</string>
-    <string name="clear">Svuota</string>
+    <string name="action_download">Scarica</string>
+    <string name="action_speak">Parla</string>
+    <string name="action_clear">Svuota</string>
     <string name="e2e_re_request_encryption_key">Richiedi di nuovo le chiavi di crittografia dalle tue altre sessioni.</string>
     <string name="e2e_re_request_encryption_key_sent">La richiesta della chiave è stata inviata.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Richiesta inviata</string>
@@ -1170,7 +1096,7 @@
     <string name="template_settings_call_ringtone_use_app_ringtone">Usa la suoneria predefinita di ${app_name} per le chiamate in arrivo</string>
     <string name="settings_call_ringtone_title">Suoneria delle chiamate in arrivo</string>
     <string name="settings_call_ringtone_dialog_title">Scegli la suoneria per le chiamate:</string>
-    <string name="accept">Accetta</string>
+    <string name="action_accept">Accetta</string>
     <string name="auth_accept_policies">Per favore, leggi e accetta i termini di servizio di questo Home Server:</string>
     <string name="settings_notification_troubleshoot">Diagnostica delle notifiche</string>
     <string name="settings_troubleshoot_diagnostic">Diagnosi dei problemi</string>
@@ -1242,7 +1168,7 @@
     <string name="title_activity_keys_backup_setup">Backup delle chiavi</string>
     <string name="title_activity_keys_backup_restore">Usa il Backup delle chiavi</string>
     <string name="keys_backup_is_not_finished_please_wait">Il Backup delle chiavi non è concluso, attendere prego…</string>
-    <string name="skip">Salta</string>
+    <string name="action_skip">Salta</string>
     <string name="done">Fatto</string>
     <string name="settings_notification_advanced">Impostazioni di notifica avanzate</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Se ti disconnetti adesso perderai i tuoi messaggi cifrati</string>
@@ -1254,9 +1180,9 @@
     <string name="are_you_sure">Sei sicuro\?</string>
     <string name="backup">Backup</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Perderai l\'accesso ai tuoi messaggi criptati a meno che tu non faccia il Backup delle chiavi prima di disconnetterti.</string>
-    <string name="stay">Rimani</string>
-    <string name="abort">Interrompi</string>
-    <string name="ignore">Ignora</string>
+    <string name="action_stay">Rimani</string>
+    <string name="action_abort">Interrompi</string>
+    <string name="action_ignore">Ignora</string>
     <string name="action_sign_out_confirmation_simple">Sei sicuro di volerti disconnettere\?</string>
     <string name="auth_login_sso">Accedi con single sign-on</string>
     <string name="login_error_unknown_host">Questo URL è irraggiungibile. Per favore controllalo</string>
@@ -1492,8 +1418,8 @@
     <string name="room_list_rooms_empty_title">Stanze</string>
     <string name="room_list_rooms_empty_body">Le tue stanze verranno mostrate qui. Tocca il pulsante + per trovare quelle esistenti o crearne di nuove.</string>
     <string name="title_activity_emoji_reaction_picker">Reazioni</string>
-    <string name="reactions_agree">D\'accordo</string>
-    <string name="reactions_like">Piace</string>
+    <string name="action_agree">D\'accordo</string>
+    <string name="action_like">Piace</string>
     <string name="message_add_reaction">Aggiungi reazione</string>
     <string name="message_view_reaction">Vedi le reazioni</string>
     <string name="reactions">Reazioni</string>
@@ -1576,8 +1502,8 @@
     <string name="direct_room_filter_hint">Cerca per nome o ID utente …</string>
     <string name="joining_room">Sto entrando nella stanza …</string>
     <string name="message_view_edit_history">Visualizza Modifica Timeline</string>
-    <string name="review">Leggi</string>
-    <string name="decline">Rifiuta</string>
+    <string name="action_review">Leggi</string>
+    <string name="action_decline">Rifiuta</string>
     <string name="widget_integration_review_terms">Per continuare devi accettare i termini di servizio.</string>
     <string name="terms_of_service">Termini di servizio</string>
     <string name="review_terms">Leggi i termini di servizio</string>
@@ -1585,8 +1511,8 @@
     <string name="terms_description_for_integration_manager">Usa bot, bridge, widget e pacchetti di sticker</string>
     <string name="read_at">Leggi su</string>
     <string name="none">Nessuno</string>
-    <string name="revoke">Revoca</string>
-    <string name="disconnect">Disconnetti</string>
+    <string name="action_revoke">Revoca</string>
+    <string name="action_disconnect">Disconnetti</string>
     <string name="people_no_identity_server">Non è stato configurato alcun server d\'identità.</string>
     <string name="call_failed_no_ice_title">Chiamata fallita a causa di un\'errata configurazione del server</string>
     <string name="call_failed_no_ice_description">Chiedi all\'amministratore del tuo Home Server (%1$s) di configurare un server TURN affinché le chiamate funzionino in modo affidabile. 
@@ -2015,15 +1941,6 @@
     <string name="login_signup_username_hint">Nome utente</string>
     <string name="settings_dev_tools">Strumenti per sviluppatori</string>
     <string name="settings_account_data">Dati account</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d voto</item>
-        <item quantity="other">%d voti</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d voto - Risultato finale</item>
-        <item quantity="other">%d voti - Risultato finale</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Opzione selezionata</string>
     <string name="command_description_poll">Crea un semplice sondaggio</string>
     <string name="verification_cannot_access_other_session">Usa una Passphrase o un codice di recupero</string>
     <string name="verification_use_passphrase">Se non puoi accedere a una sessione esistente</string>
@@ -2151,7 +2068,7 @@
 \n${app_name} Desktop</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">o un altro client Matrix che supporti la firma incrociata</string>
+    <string name="or_other_mx_capable_client">o un altro client Matrix che supporti la firma incrociata</string>
     <string name="template_use_latest_app">Usa l\'ultima versione di ${app_name} anche sui tuoi altri dispositivi:</string>
     <string name="command_description_discard_session">Forza l\'attuale sessione di gruppo in uscita in una stanza cifrata ad essere scartata</string>
     <string name="command_description_discard_session_not_handled">Supportato solo nelle stanze criptate</string>
@@ -2225,9 +2142,9 @@
     <string name="identity_server_set_alternative_notice">In alternativa, puoi inserire l\'URL di un qualsiasi altro server d\'identità</string>
     <string name="identity_server_set_alternative_notice_no_default">Inserisci l\'URL di un server d\'identità</string>
     <string name="identity_server_set_alternative_submit">Invia</string>
-    <string name="play_video">Avvia</string>
-    <string name="pause_video">Pausa</string>
-    <string name="dismiss">Annulla</string>
+    <string name="action_play">Avvia</string>
+    <string name="action_pause">Pausa</string>
+    <string name="action_dismiss">Annulla</string>
     <string name="action_copy">Copia</string>
     <string name="dialog_title_success">Completato</string>
     <string name="bottom_action_notification">Notifiche</string>
@@ -2425,7 +2342,6 @@
     <string name="settings_show_room_member_state_events">Mostra eventi di stato dei membri della stanza</string>
     <string name="settings_show_room_member_state_events_summary">Includi eventi di invito/entrata/uscita/kick/ban e modifiche di avatar/nome.</string>
     <string name="sent_a_poll">Sondaggio</string>
-    <string name="sent_a_bot_buttons">Pulsanti bot</string>
     <string name="sent_a_reaction">Reagito con: %s</string>
     <string name="sent_verification_conclusion">Verifica conclusa</string>
     <string name="delete_account_data_warning">Vuoi eliminare i dati dell\'account di tipo %1$s\?
@@ -2479,7 +2395,7 @@
     <string name="search_banned_user_hint">Filtra utenti banditi</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Non hai il permesso di avviare una chiamata</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Non hai il permesso di avviare una chiamata di gruppo</string>
-    <string name="reset">Reimposta</string>
+    <string name="action_reset">Reimposta</string>
     <string name="template_settings_security_pin_code_grace_period_summary_off">Il codice PIN è richiesto ogni volta che apri ${app_name}.</string>
     <string name="template_settings_security_pin_code_grace_period_summary_on">Il codice PIN è richiesto dopo 2 minuti di inattività su ${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Richiedi il PIN dopo 2 minuti</string>
@@ -2753,7 +2669,7 @@
     <string name="invite_to_space_with_name_desc">Potranno esplorare %s</string>
     <string name="invite_to_space_with_name">Invita in %s</string>
     <string name="invite_by_link">Condividi link</string>
-    <string name="invite_by_mxid">Invita per nome utente</string>
+    <string name="invite_by_username">Invita per nome utente</string>
     <string name="invite_by_email">Invita per email</string>
     <string name="invite_people_to_your_space_desc">Al momento ci sei solo tu. Con più persone %s sarà ancora migliore.</string>
     <string name="invite_people_menu">Invita persone</string>
@@ -3013,7 +2929,7 @@
     <string name="finish_setup">Termina configurazione</string>
     <string name="discovery_invite">Invita per email, trova contatti e altro…</string>
     <string name="create_space_identity_server_info_none">Attualmente non stai usando un server d\'identità. Per poter invitare compagni ed essere individuabile da loro, configurane uno sotto.</string>
-    <string name="invite_by_mxid_or_mail">Invita per nome utente o email</string>
+    <string name="invite_by_username_or_mail">Invita per nome utente o email</string>
     <string name="create_spaces_invite_public_header_desc">Assicurati che le persone giuste abbiano accesso a %s. Puoi invitarne altre dopo.</string>
     <string name="create_spaces_invite_public_header">Chi sono i tuoi compagni di squadra\?</string>
     <string name="command_description_add_to_space">Aggiungi allo spazio scelto</string>
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index 947c58ad79..5b06f0f742 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -6,7 +6,7 @@
     <string name="dialog_title_error">שגיאה</string>
     <string name="dialog_title_warning">אזהרה</string>
     <string name="dialog_title_confirmation">אישור</string>
-    <string name="disable">השבת</string>
+    <string name="action_disable">השבת</string>
     <string name="copied_to_clipboard">העתק ללוח הגזירים</string>
     <string name="action_unpublish">הסר פרסום</string>
     <string name="action_add">הוסף</string>
@@ -26,15 +26,15 @@
     <string name="call_notification_hangup">נתק</string>
     <string name="call_notification_reject">להסיר</string>
     <string name="call_notification_answer">לקבל</string>
-    <string name="decline">יְרִידָה</string>
-    <string name="review">סקירה</string>
-    <string name="ignore">להתעלם</string>
-    <string name="abort">לְהַפִּיל</string>
+    <string name="action_decline">יְרִידָה</string>
+    <string name="action_review">סקירה</string>
+    <string name="action_ignore">להתעלם</string>
+    <string name="action_abort">לְהַפִּיל</string>
     <string name="done">בוצע</string>
-    <string name="skip">לדלג</string>
-    <string name="accept">לְקַבֵּל</string>
+    <string name="action_skip">לדלג</string>
+    <string name="action_accept">לְקַבֵּל</string>
     <string name="offline">לא מקוון</string>
-    <string name="invite">להזמין</string>
+    <string name="action_invite">להזמין</string>
     <string name="send_anyway">לשלוח בכל מקרה</string>
     <string name="call_anyway">תתקשר בכל מקרה</string>
     <string name="room_no_conference_call_in_encrypted_rooms">שיחות ועידה אינן נתמכות בחדרים מוצפנים</string>
@@ -59,33 +59,33 @@
     <string name="ongoing_conference_call_video">וידאו</string>
     <string name="ongoing_conference_call_voice">קול</string>
     <string name="start_chatting">התחל לצ\'וטט</string>
-    <string name="reset">אתחול</string>
-    <string name="pause_video">השהה</string>
-    <string name="play_video">לנגן</string>
+    <string name="action_reset">אתחול</string>
+    <string name="action_pause">השהה</string>
+    <string name="action_play">לנגן</string>
     <string name="active_call">שיחה פעילה</string>
     <string name="report_content">דווח על תוכן</string>
-    <string name="disconnect">התנתק</string>
-    <string name="revoke">לבטל</string>
+    <string name="action_disconnect">התנתק</string>
+    <string name="action_revoke">לבטל</string>
     <string name="none">אין</string>
-    <string name="rename">שנה שם</string>
-    <string name="delete">מחק</string>
+    <string name="action_rename">שנה שם</string>
+    <string name="action_delete">מחק</string>
     <string name="view_decrypted_source">צפה במקור המפוענח</string>
     <string name="view_source">צפה במקור הדף</string>
     <string name="permalink">קישור קבוע</string>
-    <string name="forward">העבר</string>
+    <string name="action_forward">העבר</string>
     <string name="later">מאוחר יותר</string>
-    <string name="clear">ניקוי</string>
-    <string name="speak">דבר</string>
-    <string name="share">שתף</string>
-    <string name="download">הורדה</string>
-    <string name="quote">צטט</string>
-    <string name="redact">הסר</string>
-    <string name="resend">שלח שוב</string>
-    <string name="send">שלח</string>
-    <string name="stay">הישאר</string>
-    <string name="leave">עזיבה</string>
-    <string name="save">שמירה</string>
-    <string name="cancel">ביטול</string>
+    <string name="action_clear">ניקוי</string>
+    <string name="action_speak">דבר</string>
+    <string name="action_share">שתף</string>
+    <string name="action_download">הורדה</string>
+    <string name="action_quote">צטט</string>
+    <string name="action_redact">הסר</string>
+    <string name="action_resend">שלח שוב</string>
+    <string name="action_send">שלח</string>
+    <string name="action_stay">הישאר</string>
+    <string name="action_leave">עזיבה</string>
+    <string name="action_save">שמירה</string>
+    <string name="action_cancel">ביטול</string>
     <string name="ok">אוקיי</string>
     <string name="loading">טוען…</string>
     <string name="dialog_title_third_party_licences">רישיונות צד ג \'</string>
@@ -102,7 +102,7 @@
     <string name="or">או</string>
     <string name="action_open">פתיחה</string>
     <string name="login_signin">כניסה</string>
-    <string name="dismiss">שחרר</string>
+    <string name="action_dismiss">שחרר</string>
     <string name="keys_backup_is_not_finished_please_wait">גיבוי המפתחות לא הסתיים, אנא המתן …</string>
     <string name="title_activity_verify_device">אמת מושב</string>
     <string name="title_activity_keys_backup_restore">השתמש במפתח גיבוי</string>
@@ -297,10 +297,10 @@
     <string name="room_sync_in_progress">מסנכרן…</string>
     <string name="open_chat_header">פתח כותרת</string>
     <string name="list_members">חברי רשימה</string>
-    <string name="reject">דחייה</string>
-    <string name="preview">תצוגה מקדימה</string>
-    <string name="join">הצטרף</string>
-    <string name="remove">הסר</string>
+    <string name="action_reject">דחייה</string>
+    <string name="action_preview">תצוגה מקדימה</string>
+    <string name="action_join">הצטרף</string>
+    <string name="action_remove">הסר</string>
     <string name="_continue">המשך</string>
     <string name="no">לא</string>
     <string name="yes">כן</string>
@@ -684,17 +684,6 @@
         <item quantity="other">%d חדרים</item>
     </plurals>
     <string name="directory_search_results_title">חפש בתיקיות</string>
-    <string name="room_recents_join_room_prompt">הקלד מזהה חדר או כינוי לחדר</string>
-    <string name="room_recents_join_room_title">הצטרף לחדר</string>
-    <string name="room_recents_join_room">הצטרף לחדר</string>
-    <string name="room_recents_create_room">צור חדר</string>
-    <string name="room_recents_start_chat">התחלת שיחת צ\'אט</string>
-    <string name="room_recents_invites">הזמנות</string>
-    <string name="room_recents_low_priority">עדיפות נמוכה</string>
-    <string name="room_recents_conversations">חדרים</string>
-    <string name="room_recents_favourites">מועדפים</string>
-    <string name="room_recents_directory">תיקייה ראשית</string>
-    <string name="room_recents_join">הצטרף</string>
     <string name="search_is_not_supported_in_e2e_room">עדיין אין תמיכה בחיפוש בחדרים מוצפנים.</string>
     <string name="tab_title_search_files">קבצים</string>
     <string name="tab_title_search_people">אנשים</string>
@@ -1283,7 +1272,6 @@
     <string name="keys_backup_setup_step3_button_title_no_passphrase">הכנתי עותק</string>
     <string name="sent_verification_conclusion">מסקנת אימות</string>
     <string name="sent_a_reaction">הגיב עם: %s</string>
-    <string name="sent_a_bot_buttons">כפתורי בוט</string>
     <string name="sent_a_poll">משאל</string>
     <string name="send_a_sticker">מדבקה</string>
     <string name="sent_a_file">קובץ</string>
@@ -1730,8 +1718,8 @@
     <string name="reactions">תגובות</string>
     <string name="message_view_reaction">צפה בתגובות</string>
     <string name="message_add_reaction">הוסף תגובה</string>
-    <string name="reactions_like">אהבתי</string>
-    <string name="reactions_agree">מסכים</string>
+    <string name="action_like">אהבתי</string>
+    <string name="action_agree">מסכים</string>
     <string name="title_activity_emoji_reaction_picker">תגובות</string>
     <string name="room_list_rooms_empty_body">החדרים שלך יוצגו כאן. הקש על + שמאל למטה כדי למצוא את הקיים או התחל כמה משלך.</string>
     <string name="room_list_rooms_empty_title">חדרים</string>
@@ -2021,7 +2009,6 @@
     <string name="verification_use_passphrase">אם אינך יכול לגשת להפעלה קיימת</string>
     <string name="verification_cannot_access_other_session">השתמש בביטוי סיסמה או מפתח שחזור</string>
     <string name="command_description_poll">יוצר סקר פשוט</string>
-    <string name="poll_item_selected_aria">אפשרות נבחרת</string>
     <string name="delete_account_data_warning">למחוק את נתוני החשבון מסוג %1$s\?
 \n
 \nהשתמש בזהירות, זה עלול להוביל להתנהגות בלתי צפויה.</string>
@@ -2042,12 +2029,6 @@
     <string name="bottom_sheet_setup_secure_backup_security_key_title">השתמש במפתח אבטחה</string>
     <string name="bottom_sheet_setup_secure_backup_submit">התקן</string>
     <string name="bottom_sheet_setup_secure_backup_subtitle">הגן מפני אובדן גישה להודעות ונתונים מוצפנים על ידי גיבוי של מפתחות הצפנה בשרת שלך.</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d הצבעה</item>
-        <item quantity="two">%d הצבעות</item>
-        <item quantity="many">%d הצבעות</item>
-        <item quantity="other">%d הצבעות</item>
-    </plurals>
     <string name="settings_dev_tools">כלי מפתחים</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">מצב טיסה פועל</string>
     <string name="no_connectivity_to_the_server_indicator">הקישוריות לשרת אבדה</string>
@@ -2131,7 +2112,7 @@
     <string name="command_description_discard_session_not_handled">נתמך רק בחדרים מוצפנים</string>
     <string name="command_description_discard_session">מכריח את ההפעלה הקבוצתית החוצה הנוכחית בחדר מוצפן להיזרק</string>
     <string name="template_use_latest_app">השתמש באלמנט האחרון במכשירים האחרים שלך:</string>
-    <string name="or_other_mx_capabale_client">או לקוח מטריקס אחר עם יכולת חתימה צולבת</string>
+    <string name="or_other_mx_capable_client">או לקוח מטריקס אחר עם יכולת חתימה צולבת</string>
     <string name="template_app_ios_android">אלמנט iOS
 \nאלמנט אנדרואיד</string>
     <string name="template_app_desktop_web">רשת האינטרנט
@@ -2250,12 +2231,6 @@
         <item quantity="many">שלח תמונות בגודל המקורי</item>
         <item quantity="other">שלח תמונות בגודל המקורי</item>
     </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d הצבעה - תוצאות סופיות</item>
-        <item quantity="two">%d הצבעות - תוצאות סופיות</item>
-        <item quantity="many">%d הצבעעות - תוצאות סופיות</item>
-        <item quantity="other">%d הצבעות - תוצאות סופיות</item>
-    </plurals>
     <string name="create_pin_title">בחר PIN לאבטחה</string>
     <string name="too_many_pin_failures">שגיאות רבות מדי, יצאת מהחשבון</string>
     <string name="wrong_pin_message_last_remaining_attempt">אַזהָרָה! ניסיון אחרון שנותר לפני היציאה!</string>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index abfe5d6ef9..8826c6ccea 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -47,7 +47,7 @@
     <string name="notice_room_third_party_invite">%1$s は %2$s にルームに参加するよう招待状を送りました</string>
     <string name="notice_room_third_party_registered_invite">%1$sは%2$sの招待を受け入れました</string>
     <string name="notice_crypto_unable_to_decrypt">** 解読できません: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">送信者の端末からこのメッセージのキーが送信されていません。</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">送信者の端末からこのメッセージのキーが送信されていません。</string>
     <string name="could_not_redact">修正できませんでした</string>
     <string name="unable_to_send_message">メッセージを送信できません</string>
     <string name="message_failed_to_upload">画像のアップロードに失敗しました</string>
@@ -86,17 +86,17 @@
     <string name="title_activity_settings">設定</string>
     <string name="title_activity_historical">履歴</string>
     <string name="ok">OK</string>
-    <string name="cancel">キャンセル</string>
-    <string name="save">保存</string>
-    <string name="leave">退室</string>
-    <string name="send">送信</string>
-    <string name="resend">再送信</string>
-    <string name="redact">削除</string>
-    <string name="share">共有</string>
-    <string name="delete">削除</string>
+    <string name="action_cancel">キャンセル</string>
+    <string name="action_save">保存</string>
+    <string name="action_leave">退室</string>
+    <string name="action_send">送信</string>
+    <string name="action_resend">再送信</string>
+    <string name="action_redact">削除</string>
+    <string name="action_share">共有</string>
+    <string name="action_delete">削除</string>
     <string name="device_information">端末情報</string>
     <string name="room_no_conference_call_in_encrypted_rooms">暗号化された部屋での多人数通話はサポートされていません</string>
-    <string name="invite">招待</string>
+    <string name="action_invite">招待</string>
     <string name="action_mark_all_as_read">全ての発言を既読にする</string>
     <string name="action_historical">履歴</string>
     <string name="action_quick_reply">すぐに返信</string>
@@ -193,18 +193,18 @@
     <string name="notification_sync_in_progress">同期中…</string>
     <string name="title_activity_home">メッセージ</string>
     <string name="title_activity_member_details">メンバー詳細</string>
-    <string name="quote">引用</string>
+    <string name="action_quote">引用</string>
     <string name="later">後で</string>
-    <string name="forward">転送</string>
+    <string name="action_forward">転送</string>
     <string name="permalink">直リンク</string>
     <string name="view_source">ソースコードを表示</string>
     <string name="or">または</string>
     <string name="dialog_title_confirmation">確認</string>
-    <string name="disable">無効にする</string>
+    <string name="action_disable">無効にする</string>
     <string name="send_bug_report_progress">送信中 (%s%%)</string>
     <string name="login_error_user_in_use">このユーザ名はすでに使用されています</string>
-    <string name="remove">削除</string>
-    <string name="join">参加</string>
+    <string name="action_remove">削除</string>
+    <string name="action_join">参加</string>
     <string name="room_preview_invitation_format">あなたは %s さんに呼ばれてこの部屋へ参加しました</string>
     <string name="room_creation_title">新しい会話</string>
     <string name="room_creation_add_member">参加者を追加</string>
@@ -347,7 +347,7 @@
     <string name="huge">巨大</string>
     <string name="notification_listening_for_events">発言更新を確認</string>
     <string name="view_decrypted_source">暗号解除されたソースコードを表示</string>
-    <string name="rename">名前変更</string>
+    <string name="action_rename">名前変更</string>
     <string name="offline">切断中</string>
     <string name="start_new_chat">会話を開始</string>
     <string name="start_voice_call">音声通話を開始</string>
@@ -424,8 +424,8 @@
     <string name="media_picker_both_capture_title">写真または動画の撮影</string>
     <string name="media_picker_cannot_record_video">動画を記録できません</string>
     <string name="media_slider_saved">保存</string>
-    <string name="preview">試写</string>
-    <string name="reject">拒否</string>
+    <string name="action_preview">試写</string>
+    <string name="action_reject">拒否</string>
     <string name="room_participants_header_admin_tools">管理者権限操作</string>
     <string name="room_participants_header_call">通話</string>
     <string name="room_participants_header_direct_chats">ダイレクトメッセージ</string>
@@ -450,14 +450,6 @@
     <string name="tab_title_search_people">参加者</string>
     <string name="tab_title_search_files">ファイル</string>
     <string name="tab_title_search_rooms">部屋</string>
-    <string name="room_recents_favourites">お気に入り</string>
-    <string name="room_recents_conversations">部屋</string>
-    <string name="room_recents_low_priority">低優先度</string>
-    <string name="room_recents_start_chat">会話を開始</string>
-    <string name="room_recents_create_room">部屋を作成</string>
-    <string name="room_recents_join_room">部屋へ参加</string>
-    <string name="room_recents_join_room_title">部屋へ参加</string>
-    <string name="room_recents_join">参加</string>
     <string name="directory_search_results_title">部屋一覧を見る</string>
     <string name="room_settings_leave_conversation">退室</string>
     <string name="room_sliding_menu_messages">会話</string>
@@ -602,9 +594,6 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="room_event_action_cancel_download">ダウンロードをキャンセルする</string>
     <string name="search_hint">検索</string>
     <string name="tab_title_search_messages">メッセージ</string>
-    <string name="room_recents_directory">ディレクトリ</string>
-    <string name="room_recents_invites">招待</string>
-    <string name="room_recents_join_room_prompt">部屋のIDまたは部屋のエイリアスを入力してください</string>
     <string name="directory_searching_title">ディレクトリを検索中…</string>
     <string name="room_sliding_menu_third_party_notices">サードパーティの通知</string>
     <string name="settings_app_info_link_summary">このアプリのシステムの情報を見る。</string>
@@ -651,15 +640,11 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="room_unknown_devices_messages_notification">不明なデバイスが存在しているため、メッセージを送ることができませんでした。今 %1$s または %2$s しますか？</string>
     <string name="encryption_information_claimed_ed25519_fingerprint_key">要求されたフィンガープリントキー Ed25519</string>
     <string name="settings_labs_create_conference_with_jitsi">jitsiを用いて会議通話を始める</string>
-    <!-- Widget Integration Manager -->
     <string name="settings_labs_native_camera">端末のカメラを使う</string>
-    <!-- share keys -->
     <string name="conference_call_warning_title">警告！</string>
     <string name="conference_call_warning_message">ビデオ会議は開発中であり、確実でない可能性があります。</string>
-    <!-- slash commands -->
     <string name="command_error">コマンドエラー</string>
     <string name="unrecognized_command">認識されないコマンド: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">切</string>
     <string name="notification_noisy">音量大</string>
     <string name="encrypted_message">暗号化されたメッセージ</string>
@@ -698,7 +683,6 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="community_name_hint">例</string>
     <string name="community_id">コミュニティID</string>
     <string name="community_id_hint">例</string>
-    <!-- group details -->
     <string name="group_details_home">ホーム</string>
     <string name="group_details_people">参加者</string>
     <string name="group_details_rooms">部屋</string>
@@ -745,9 +729,9 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="settings_notification_privacy_metadata">• 通知はメタデータのみを含みます</string>
     <string name="title_activity_choose_sticker">スタンプを送る</string>
     <string name="dialog_title_third_party_licences">サードパーティーライセンス</string>
-    <string name="download">ダウンロード</string>
-    <string name="speak">話す</string>
-    <string name="clear">消去</string>
+    <string name="action_download">ダウンロード</string>
+    <string name="action_speak">話す</string>
+    <string name="action_clear">消去</string>
     <string name="missing_permissions_error">許可がないため、この操作を実行できません。</string>
     <string name="actions">実行</string>
     <string name="system_alerts_header">システムアラート</string>
@@ -886,7 +870,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="merged_events_collapse">畳む</string>
     <string name="show_info_area_messages_and_errors">メッセージとエラーの場合</string>
     <string name="call_anyway">とにかく通話する</string>
-    <string name="accept">了承</string>
+    <string name="action_accept">了承</string>
     <string name="auth_accept_policies">このホームサーバーの方針を閲覧し承認してください:</string>
     <string name="settings_call_category">通話設定画面</string>
     <string name="template_settings_call_ringtone_use_app_ringtone">着信に${app_name}の既定の着信音を使う</string>
@@ -956,7 +940,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="settings_troubleshoot_test_bing_settings_title">カスタム設定。</string>
     <string name="settings_troubleshoot_test_service_boot_title">起動時の実行</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">バックグラウンド制限の確認</string>
-    <string name="stay">とどまる</string>
+    <string name="action_stay">とどまる</string>
     <string name="edit">編集</string>
     <string name="reply">返信</string>
     <string name="event_redacted">削除済みのメッセージ</string>
@@ -1053,21 +1037,21 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="encryption_enabled_tile_description">この部屋内でのメッセージはエンドツーエンド暗号化されます。詳細の確認や検証はユーザーのプロフィールをご確認ください。</string>
     <string name="encryption_not_enabled">暗号化が有効化されていません</string>
     <string name="settings_notification_configuration">通知設定</string>
-    <string name="disconnect">切断</string>
+    <string name="action_disconnect">切断</string>
     <string name="action_sign_out_confirmation_simple">ログアウトしますか？</string>
     <string name="action_mark_room_read">既読にする</string>
     <string name="action_copy">コピー</string>
     <string name="dialog_title_success">成功</string>
     <string name="bottom_action_notification">通知</string>
     <string name="call_failed_no_ice_title">サーバーの設定ミスにより通話に失敗しました</string>
-    <string name="revoke">破棄</string>
-    <string name="play_video">再生</string>
-    <string name="pause_video">一時停止</string>
-    <string name="dismiss">消去</string>
-    <string name="skip">スキップ</string>
+    <string name="action_revoke">破棄</string>
+    <string name="action_play">再生</string>
+    <string name="action_pause">一時停止</string>
+    <string name="action_dismiss">消去</string>
+    <string name="action_skip">スキップ</string>
     <string name="done">完了</string>
-    <string name="ignore">無視</string>
-    <string name="review">レビュー</string>
+    <string name="action_ignore">無視</string>
+    <string name="action_review">レビュー</string>
     <string name="send_file_step_idle">待機中…</string>
     <string name="send_file_step_encrypting_thumbnail">サムネイル暗号化中…</string>
     <string name="send_file_step_sending_thumbnail">サムネイル送信中 (%1$s / %2$s)</string>
@@ -1138,7 +1122,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="verification_scan_notice">相手ユーザーのデバイスのコードをスキャンし、相互に安全性を検証します</string>
     <string name="verification_scan_their_code">相手のコードをスキャン</string>
     <string name="verification_scan_emoji_title">スキャンできません</string>
-    <string name="decline">断る</string>
+    <string name="action_decline">断る</string>
     <string name="sas_incoming_request_notif_title">検証リクエスト</string>
     <string name="settings_call_show_confirmation_dialog_summary">通話の開始前に確認する</string>
     <string name="settings_call_show_confirmation_dialog_title">意図しない通話を阻止する</string>
@@ -1168,7 +1152,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="call_notification_hangup">終了</string>
     <string name="call_notification_reject">拒否</string>
     <string name="call_notification_answer">承諾</string>
-    <string name="abort">中止</string>
+    <string name="action_abort">中止</string>
     <string name="failed_to_remove_widget">ウィジェットを削除できませんでした</string>
     <string name="failed_to_add_widget">ウィジェットを追加できませんでした</string>
     <string name="video_meeting">ビデオ通話を開始</string>
@@ -1176,7 +1160,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">通話を開始する権限がありません</string>
     <string name="no_permissions_to_start_webrtc_call">このルームで通話を開始する権限がありません</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">グループ通話を開始する権限がありません</string>
-    <string name="reset">リセット</string>
+    <string name="action_reset">リセット</string>
     <string name="none">なし</string>
     <string name="room_settings_topic_hint">トピック</string>
     <string name="room_settings_name_hint">ルーム名</string>
@@ -1811,7 +1795,7 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="login_set_msisdn_submit">次に</string>
     <string name="login_set_email_submit">次に</string>
     <string name="login_reset_password_submit">次に</string>
-    <string name="invite_by_mxid">ユーザー名で招待</string>
+    <string name="invite_by_username">ユーザー名で招待</string>
     <string name="error_empty_field_choose_user_name">ユーザー名を選択してください。</string>
     <string name="auth_invalid_login_param_space_in_password">ユーザー名やパスワードが正しくありません。 入力したパスワードは、スペースで開始または終了しますので、ご確認ください。</string>
     <string name="login_signup_error_user_in_use">そのユーザー名は既に使用されています</string>
@@ -1893,8 +1877,8 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="reactions">リアクション</string>
     <string name="message_view_reaction">リアクションを見る</string>
     <string name="message_add_reaction">リアクションを追加する</string>
-    <string name="reactions_like">いいね</string>
-    <string name="reactions_agree">同意</string>
+    <string name="action_like">いいね</string>
+    <string name="action_agree">同意</string>
     <string name="title_activity_emoji_reaction_picker">リアクション</string>
     <string name="room_list_rooms_empty_body">ルームがここに表示されます。右下の[+]をタップして、既存のルームを検索するか、独自のルームを開始します。</string>
     <string name="room_list_people_empty_body">ダイレクトメッセージの会話がここに表示されます。右下の[+]をタップして開始します。</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 53e883baf6..e169b491c1 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -97,7 +97,7 @@
     <string name="notice_power_level_changed_by_you">Tbeddleḍ aswir n tezmert n %1$s.</string>
     <string name="notice_power_level_changed">%1$s ibeddel aswir n tezmert n %2$s.</string>
     <string name="notice_crypto_unable_to_decrypt">** Awgelhen d awezɣi: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Ibenk n umazan ur aɣ-d-yuzin ara tisura i yizen-a.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Ibenk n umazan ur aɣ-d-yuzin ara tisura i yizen-a.</string>
     <string name="unable_to_send_message">Tuzna n yizen d tawezɣit</string>
     <string name="network_error">Tuccḍa deg uẓeṭṭa</string>
     <string name="matrix_error">Tuccḍa deg Matrix</string>
@@ -201,37 +201,37 @@
     <string name="are_you_sure">Tebɣiḍ s tidet\?</string>
     <string name="loading">Asali…</string>
     <string name="ok">IH</string>
-    <string name="cancel">Sefsex</string>
-    <string name="save">Sekles</string>
-    <string name="leave">Ffeɣ</string>
-    <string name="send">Azen</string>
-    <string name="resend">Ɛawed azen</string>
-    <string name="redact">Sfeḍ</string>
-    <string name="quote">Tanebdurt</string>
-    <string name="download">Sader</string>
-    <string name="share">Bḍu</string>
+    <string name="action_cancel">Sefsex</string>
+    <string name="action_save">Sekles</string>
+    <string name="action_leave">Ffeɣ</string>
+    <string name="action_send">Azen</string>
+    <string name="action_resend">Ɛawed azen</string>
+    <string name="action_redact">Sfeḍ</string>
+    <string name="action_quote">Tanebdurt</string>
+    <string name="action_download">Sader</string>
+    <string name="action_share">Bḍu</string>
     <string name="later">Ticki</string>
     <string name="view_source">Wali aɣbalu</string>
-    <string name="delete">Kkes</string>
-    <string name="rename">Beddel isem</string>
+    <string name="action_delete">Kkes</string>
+    <string name="action_rename">Beddel isem</string>
     <string name="none">Ula yiwen</string>
-    <string name="revoke">Ḥwi</string>
-    <string name="disconnect">Ffeɣ seg tuqqna</string>
+    <string name="action_revoke">Ḥwi</string>
+    <string name="action_disconnect">Ffeɣ seg tuqqna</string>
     <string name="active_call">Asiwel urmid</string>
-    <string name="play_video">Ɣeṛ</string>
-    <string name="dismiss">Agi</string>
+    <string name="action_play">Ɣeṛ</string>
+    <string name="action_dismiss">Agi</string>
     <string name="no_permissions_to_start_conf_call">Ur tesεiḍ ara tisirag ad tebduḍ asireg s usiwel deg texxamt-a</string>
     <string name="failed_to_remove_widget">Tukksa n uwiǧit ur teddi ara</string>
     <string name="or">neɣ</string>
-    <string name="invite">Nced</string>
+    <string name="action_invite">Nced</string>
     <string name="offline">Beṛṛa n tuqqna</string>
-    <string name="accept">Qbel</string>
-    <string name="skip">Zgel</string>
+    <string name="action_accept">Qbel</string>
+    <string name="action_skip">Zgel</string>
     <string name="done">Immed</string>
-    <string name="abort">Sefsex</string>
-    <string name="ignore">Ttu</string>
-    <string name="review">Senqed</string>
-    <string name="decline">Agwi</string>
+    <string name="action_abort">Sefsex</string>
+    <string name="action_ignore">Ttu</string>
+    <string name="action_review">Senqed</string>
+    <string name="action_decline">Agwi</string>
     <string name="action_exit">Ffeɣ</string>
     <string name="actions">Tigawin</string>
     <string name="action_sign_out">Ffeɣ seg tuqqna</string>
@@ -240,7 +240,7 @@
     <string name="action_open">Ldi</string>
     <string name="action_close">Mdel</string>
     <string name="action_copy">Nɣel</string>
-    <string name="disable">Sens</string>
+    <string name="action_disable">Sens</string>
     <string name="dialog_title_confirmation">Asentem</string>
     <string name="dialog_title_warning">Asmigel</string>
     <string name="dialog_title_error">Tuccḍa</string>
@@ -291,10 +291,10 @@
     <string name="permissions_rationale_popup_title">Talɣut</string>
     <string name="yes">IH</string>
     <string name="_continue">Kemmel</string>
-    <string name="remove">Sfeḍ</string>
-    <string name="join">Rnu</string>
-    <string name="preview">Taskant</string>
-    <string name="reject">Agi</string>
+    <string name="action_remove">Sfeḍ</string>
+    <string name="action_join">Rnu</string>
+    <string name="action_preview">Taskant</string>
+    <string name="action_reject">Agi</string>
     <string name="room_participants_leave_prompt_title">Ffeɣ seg texxamt</string>
     <string name="room_participants_create">Snulfu-d</string>
     <string name="room_participants_online">Srid</string>
@@ -323,8 +323,6 @@
     <string name="search_hint">Nadi</string>
     <string name="search_members_hint">Sizdeg iɛeggalen n texxamt</string>
     <string name="search_no_results">Ulac igmad</string>
-    <string name="room_recents_start_chat">Bdu adiwenni</string>
-    <string name="room_recents_create_room">Rnu taxxamt</string>
     <string name="room_settings_all_messages_noisy">Iznan i meṛṛa (sɛan ṣṣut)</string>
     <string name="room_settings_all_messages">Iznan i meṛṛa</string>
     <string name="room_settings_mute">Sens imesli</string>
@@ -620,10 +618,10 @@
     <string name="keys_backup_activate">Aḥraz n tsarut n useqdac</string>
     <string name="backup">Aḥraz</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Ad tesruḥeḍ anekcum ɣer yiznan-ik•im yettwawgelhen anagar ma tkelseḍ tisura-inek•inem send tuffɣa.</string>
-    <string name="stay">Qqim</string>
-    <string name="speak">Mmeslay</string>
-    <string name="clear">Sfeḍ</string>
-    <string name="forward">Ɣer sdat</string>
+    <string name="action_stay">Qqim</string>
+    <string name="action_speak">Mmeslay</string>
+    <string name="action_clear">Sfeḍ</string>
+    <string name="action_forward">Ɣer sdat</string>
     <string name="permalink">Aseɣwen imezgi</string>
     <string name="view_decrypted_source">Senqed taɣbalut tawgelhent</string>
     <string name="report_content">Agbur n uneqqis</string>
@@ -656,7 +654,7 @@
     <string name="home_filter_placeholder_home">Sizdeg ismawen n texxamin</string>
     <string name="notification_noisy_notifications">Ilɣa s ṣṣut</string>
     <string name="dialog_title_third_party_licences">Turagin n wis tlata</string>
-    <string name="pause_video">Sgunfu</string>
+    <string name="action_pause">Sgunfu</string>
     <string name="ongoing_conference_call">Asarag s usiwel iteddu
 \nRnu-d ɣer-s s %1$s neɣ s %2$s</string>
     <string name="home_filter_placeholder_favorites">Sizdeg ismenyifen</string>
@@ -866,15 +864,6 @@
     <string name="tab_title_search_messages">IZNAN</string>
     <string name="tab_title_search_people">IMDANEN</string>
     <string name="tab_title_search_files">IFUYLA</string>
-    <string name="room_recents_join">RNU</string>
-    <string name="room_recents_directory">AKARAM</string>
-    <string name="room_recents_favourites">INURIFEN</string>
-    <string name="room_recents_conversations">TIXXAMIN</string>
-    <string name="room_recents_low_priority">TAZWART TADDAYT</string>
-    <string name="room_recents_invites">INEBGAWEN</string>
-    <string name="room_recents_join_room">Rnu ɣer texxamt</string>
-    <string name="room_recents_join_room_title">Rnu ɣer texxamt</string>
-    <string name="room_recents_join_room_prompt">Aru asulay n texxamt neɣ isem yettunefken i texxamt</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">1 texxamt</item>
         <item quantity="other">%d texxamin</item>
@@ -939,7 +928,7 @@
     <string name="settings_hs_admin_e2e_disabled">Anedbal-ik·im n uqeddac issens awgelhen seg yixef ɣer yixef s wudem amezwer deg texxamin tusligin &amp; yiznan usriden.</string>
     <string name="room_member_profile_sessions_section_title">Tiɣimiyin</string>
     <string name="delete_event_dialog_content">S tidet tebɣiḍ ad tekkseḍ aneḍru-a\? Err deg uqerru-k·m ma yella tekkseḍ asnifel n yisem neɣ asentel n texxamt, yemzer asnifel-a ad yettusefsex.</string>
-    <string name="or_other_mx_capabale_client">neɣ amsaɣ-nniḍen n Matrix yemṣadan d uzmul amdigan</string>
+    <string name="or_other_mx_capable_client">neɣ amsaɣ-nniḍen n Matrix yemṣadan d uzmul amdigan</string>
     <string name="command_description_discard_session">Ḥettem tiɣimit n ugraw ara d-yeffɣen akka tura deg texxamt tawgelhant ad tettwakkes</string>
     <string name="confirm_your_identity">Sentem timagit-ik·im s usenqed n yinekcam-a seg yiwet gar tɣimiyin-inek·inem-nniḍen, serreḥ-as ad tekcem ɣer yiznan yettwawgelhen.</string>
     <string name="create_room_dm_failure">D awezɣi ad ternuḍ izen-inek·inem uslig. Ttxil-k·m senqed iseqdacen i tebɣiḍ ad d-tnecdeḍ syen ɛreḍ tikkelt-nniḍen.</string>
@@ -1062,8 +1051,8 @@
     <string name="sas_cancelled_dialog_title">Asuter yettwasefsex</string>
     <string name="sas_error_unknown">Tuccḍa tarussint</string>
     <string name="invited_by">Yettwanced-d sɣur %s</string>
-    <string name="reactions_agree">Qbel</string>
-    <string name="reactions_like">Ḥemmel</string>
+    <string name="action_agree">Qbel</string>
+    <string name="action_like">Ḥemmel</string>
     <string name="create_new_room">Rnu taxxamt tamaynut</string>
     <string name="change_room_directory_network">Snifel azeṭṭa</string>
     <string name="group_all_communities">Meṛṛa timɣiwnin</string>
@@ -1453,7 +1442,6 @@
     <string name="verification_request_waiting_for">Ittraju %s…</string>
     <string name="room_profile_section_more_uploads">Isuli-d</string>
     <string name="settings_account_data">Isefka n umiḍan</string>
-    <string name="poll_item_selected_aria">Taxtirit yettefernen</string>
     <string name="new_signin">Anekcum amaynut</string>
     <string name="enter_secret_storage_passphrase">Sekcem tasarut tuffirt n uḥraz uffir</string>
     <string name="enter_secret_storage_passphrase_warning">Ɣur-k·m:</string>
@@ -2112,14 +2100,6 @@
     <string name="no_connectivity_to_the_server_indicator">Tuqqna ɣer uqeddac truḥ</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">Askar n usafag yermed</string>
     <string name="settings_dev_tools">Ifecka n tneflit</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d tafrant</item>
-        <item quantity="other">%d tifranin</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d tafrant - Igmaḍ n taggara</item>
-        <item quantity="other">%d tifranin - Igmaḍ n taggara</item>
-    </plurals>
     <string name="command_description_poll">Yerna assenqed afessas</string>
     <string name="verification_cannot_access_other_session">Seqdec tafyirt tuffirt n tririt neɣ tasarut</string>
     <string name="verification_use_passphrase">Ma yella ur tezmireḍ ara ad tkecmeḍ ɣer tɣimit i yellan</string>
@@ -2295,7 +2275,6 @@
         <item quantity="other">%d n tsintin</item>
     </plurals>
     <string name="settings_show_room_member_state_events">Sken tidyanin n waddad n uɛeggal n texxamt</string>
-    <string name="sent_a_bot_buttons">Tiqeffalin n uṛubut</string>
     <string name="sent_verification_conclusion">Taggrayt n usenqed</string>
     <string name="universal_link_malformed">Aseɣwen ur yemsil ara akken iwata</string>
     <string name="no_permissions_to_start_webrtc_call">Ur tesɛiḍ ara tasiregt ad tebduḍ asiwel deg texxamt-a</string>
@@ -2312,7 +2291,7 @@
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Ur tesεiḍ ara azref ad tesiwleḍ</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Ur tesεiḍ ara azref ad tebduḍ asarag s tilifun</string>
     <string name="start_chatting">Bdu asqerdec</string>
-    <string name="reset">Wennez</string>
+    <string name="action_reset">Wennez</string>
     <string name="settings_security_pin_code_use_biometrics_title">Rmed abyumitri</string>
     <string name="settings_security_application_protection_screen_title">Swel ammesten</string>
     <string name="settings_security_application_protection_summary">Mmesten anekcum s useqdec n PIN d ubyumtri.</string>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index fdc94d4821..d1a11f794a 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -45,7 +45,7 @@
     <string name="notice_room_third_party_invite">%1$s님이 %2$s님에게 방 초대를 보냈습니다</string>
     <string name="notice_room_third_party_registered_invite">%1$s님이 %2$s의 초대를 수락했습니다</string>
     <string name="notice_crypto_unable_to_decrypt">** 암호를 복호화할 수 없음: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">발신인의 기기에서 이 메시지의 키를 보내지 않았습니다.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">발신인의 기기에서 이 메시지의 키를 보내지 않았습니다.</string>
     <string name="could_not_redact">검열할 수 없습니다</string>
     <string name="unable_to_send_message">메시지를 보낼 수 없습니다</string>
     <string name="message_failed_to_upload">사진 업로드에 실패했습니다</string>
@@ -93,20 +93,20 @@
     <string name="dialog_title_third_party_licences">제 3자 라이선스</string>
     <string name="loading">불러오는 중…</string>
     <string name="ok">네</string>
-    <string name="cancel">취소</string>
-    <string name="save">저장</string>
-    <string name="leave">떠나기</string>
-    <string name="send">보내기</string>
-    <string name="resend">다시 보내기</string>
-    <string name="redact">감추기</string>
-    <string name="quote">인용</string>
-    <string name="download">다운로드</string>
-    <string name="share">공유</string>
+    <string name="action_cancel">취소</string>
+    <string name="action_save">저장</string>
+    <string name="action_leave">떠나기</string>
+    <string name="action_send">보내기</string>
+    <string name="action_resend">다시 보내기</string>
+    <string name="action_redact">감추기</string>
+    <string name="action_quote">인용</string>
+    <string name="action_download">다운로드</string>
+    <string name="action_share">공유</string>
     <string name="permalink">고유 주소</string>
     <string name="view_source">소스 보기</string>
     <string name="view_decrypted_source">복호화된 소스 보기</string>
-    <string name="delete">삭제</string>
-    <string name="rename">다시 이름 짓기</string>
+    <string name="action_delete">삭제</string>
+    <string name="action_rename">다시 이름 짓기</string>
     <string name="report_content">내용 신고하기</string>
     <string name="ongoing_conference_call_voice">음성</string>
     <string name="ongoing_conference_call_video">영상</string>
@@ -117,7 +117,7 @@
     <string name="device_information">기기 정보</string>
     <string name="send_anyway">무시하고 보내기</string>
     <string name="or">또는</string>
-    <string name="invite">초대</string>
+    <string name="action_invite">초대</string>
     <string name="offline">오프라인</string>
     <string name="action_exit">나가기</string>
     <string name="actions">활동</string>
@@ -130,7 +130,7 @@
     <string name="action_open">열기</string>
     <string name="action_close">닫기</string>
     <string name="copied_to_clipboard">클립보드에 복사되었습니다</string>
-    <string name="disable">비활성화</string>
+    <string name="action_disable">비활성화</string>
     <string name="dialog_title_confirmation">확인</string>
     <string name="dialog_title_warning">경고</string>
     <string name="dialog_title_error">오류</string>
@@ -190,8 +190,8 @@
     <string name="keys_backup_activate">키 백업하기</string>
     <string name="are_you_sure">확신합니까\?</string>
     <string name="backup">백업</string>
-    <string name="stay">머물기</string>
-    <string name="skip">넘기기</string>
+    <string name="action_stay">머물기</string>
+    <string name="action_skip">넘기기</string>
     <string name="done">완료</string>
     <string name="action_sign_out_confirmation_simple">정말 로그아웃하시겠습니까\?</string>
     <string name="action_mark_room_read">읽음으로 표시</string>
@@ -234,19 +234,19 @@
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">암호화된 메시지를 원하지 않습니다</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">키 백업 중…</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">로그아웃하기 전에 키를 백업하지 않으면 암호화된 메시지에 접근할 수 없습니다.</string>
-    <string name="speak">말하기</string>
-    <string name="clear">지우기</string>
+    <string name="action_speak">말하기</string>
+    <string name="action_clear">지우기</string>
     <string name="later">후</string>
-    <string name="forward">가져오기</string>
+    <string name="action_forward">가져오기</string>
     <string name="active_call">현재 전화</string>
     <string name="ongoing_conference_call">회의 전화가 진행 중입니다.
 \n%1$s 또는 %2$s로 참가하세요</string>
     <string name="missing_permissions_to_start_conf_call">이 방에서 회의를 시작하려면 초대할 권한이 필요합니다</string>
     <string name="room_no_conference_call_in_encrypted_rooms">회의 전화는 암호화된 방에서 지원하지 않습니다</string>
     <string name="call_anyway">무시하고 통화</string>
-    <string name="accept">수락하기</string>
-    <string name="abort">중단</string>
-    <string name="ignore">차단</string>
+    <string name="action_accept">수락하기</string>
+    <string name="action_abort">중단</string>
+    <string name="action_ignore">차단</string>
     <string name="action_global_search">세계 검색</string>
     <string name="home_filter_placeholder_favorites">즐겨찾기 필터</string>
     <string name="home_filter_placeholder_people">사람 필터</string>
@@ -375,10 +375,10 @@
     <string name="yes">네</string>
     <string name="no">아니오</string>
     <string name="_continue">계속</string>
-    <string name="remove">제거</string>
-    <string name="join">참가</string>
-    <string name="preview">미리보기</string>
-    <string name="reject">받지 않기</string>
+    <string name="action_remove">제거</string>
+    <string name="action_join">참가</string>
+    <string name="action_preview">미리보기</string>
+    <string name="action_reject">받지 않기</string>
     <string name="list_members">구성원 목록</string>
     <string name="open_chat_header">헤더 열기</string>
     <string name="room_sync_in_progress">동기화 중…</string>
@@ -506,17 +506,6 @@
     <string name="tab_title_search_messages">메시지</string>
     <string name="tab_title_search_people">사람</string>
     <string name="tab_title_search_files">파일</string>
-    <string name="room_recents_join">참가</string>
-    <string name="room_recents_directory">목록</string>
-    <string name="room_recents_favourites">즐겨찾기</string>
-    <string name="room_recents_conversations">방</string>
-    <string name="room_recents_low_priority">중요하지 않음</string>
-    <string name="room_recents_invites">초대</string>
-    <string name="room_recents_start_chat">대화 시작</string>
-    <string name="room_recents_create_room">방 만들기</string>
-    <string name="room_recents_join_room">방 참가하기</string>
-    <string name="room_recents_join_room_title">방 참가하기</string>
-    <string name="room_recents_join_room_prompt">방 ID나 방 별칭을 입력</string>
     <string name="directory_search_results_title">목록 찾기</string>
     <plurals name="directory_search_rooms">
         <item quantity="other">%d개의 방</item>
@@ -1228,8 +1217,8 @@
     <string name="room_list_rooms_empty_title">방</string>
     <string name="room_list_rooms_empty_body">방이 여기 표시됩니다</string>
     <string name="title_activity_emoji_reaction_picker">리액션</string>
-    <string name="reactions_agree">동의</string>
-    <string name="reactions_like">좋아요</string>
+    <string name="action_agree">동의</string>
+    <string name="action_like">좋아요</string>
     <string name="message_add_reaction">리액션 추가</string>
     <string name="message_view_reaction">리액션 보기</string>
     <string name="reactions">리액션</string>
@@ -1309,8 +1298,8 @@
     <string name="direct_room_filter_hint">사용자 이름 또는 ID로 필터…</string>
     <string name="joining_room">방에 참가하는 중…</string>
     <string name="message_view_edit_history">편집 기록 보기</string>
-    <string name="review">검토</string>
-    <string name="decline">끊기</string>
+    <string name="action_review">검토</string>
+    <string name="action_decline">끊기</string>
     <string name="widget_integration_review_terms">계속 하려면 이 서비스 약관에 동의해야 합니다.</string>
     <string name="terms_of_service">서비스 약관</string>
     <string name="review_terms">조건 검토</string>
@@ -1318,8 +1307,8 @@
     <string name="terms_description_for_integration_manager">봇, 브릿지, 위젯과 스티커 팩을 사용하세요</string>
     <string name="read_at">읽은 시간</string>
     <string name="none">없음</string>
-    <string name="revoke">취소</string>
-    <string name="disconnect">연결 해제</string>
+    <string name="action_revoke">취소</string>
+    <string name="action_disconnect">연결 해제</string>
     <string name="people_no_identity_server">설정된 ID 서버가 없습니다.</string>
     <string name="call_failed_no_ice_title">잘놋 설정된 서버로 인해 전화에 실패함</string>
     <string name="call_failed_no_ice_description">전화가 정상적으로 작동하도록 TURN 서버를 설정하려면 홈서버 (%1$s)의 관리자에게 연락해주세요.
@@ -1480,8 +1469,8 @@
     <string name="missing_permissions_title">권한 없음</string>
     <string name="denied_permission_camera">이 작업을 수행하려면 시스템 설정에서 카메라 권한을 허용해주세요.</string>
     <string name="denied_permission_generic">이 작업을 수행할 수 있는 일부 권한이 없습니다. 시스템 설정에서 권한을 허용해주세요.</string>
-    <string name="pause_video">일시 정지</string>
-    <string name="play_video">재생</string>
+    <string name="action_pause">일시 정지</string>
+    <string name="action_play">재생</string>
     <string name="denied_permission_voice_message">음성 메시지를 보내려면 마이크 권한을 허용해주세요.</string>
     <string name="event_redacted">삭제된 메시지</string>
     <string name="action_copy">복사</string>
diff --git a/vector/src/main/res/values-lt/strings.xml b/vector/src/main/res/values-lt/strings.xml
index 5428fe5ee8..1a189047a7 100644
--- a/vector/src/main/res/values-lt/strings.xml
+++ b/vector/src/main/res/values-lt/strings.xml
@@ -53,10 +53,10 @@
     <string name="room_participants_offline">Atsijungę</string>
     <string name="room_participants_create">Sukurti</string>
     <string name="room_sync_in_progress">Sinchronizuojama…</string>
-    <string name="reject">Atmesti</string>
-    <string name="preview">Peržiūra</string>
-    <string name="join">Prisijungti</string>
-    <string name="remove">Pašalinti</string>
+    <string name="action_reject">Atmesti</string>
+    <string name="action_preview">Peržiūra</string>
+    <string name="action_join">Prisijungti</string>
+    <string name="action_remove">Pašalinti</string>
     <string name="_continue">Tęsti</string>
     <string name="no">NE</string>
     <string name="yes">TAIP</string>
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 7def907952..e5e61b7807 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -39,7 +39,7 @@
     <string name="notice_room_third_party_invite">%1$s nosūtīja %2$s uzaicinājumu pievienoties istabai</string>
     <string name="notice_room_third_party_registered_invite">%1$s pieņēma uzaicinājumu %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Neizdodas atšifrēt: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Sūtītāja ierīce mums nav nenosūtījusi atslēgas priekš šīs ziņas.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Sūtītāja ierīce mums nav nenosūtījusi atslēgas priekš šīs ziņas.</string>
     <string name="could_not_redact">Nevarēja rediģēt</string>
     <string name="unable_to_send_message">Neizdodas nosūtīt ziņu</string>
     <string name="message_failed_to_upload">Neizdevās augšuplādēt attēlu</string>
@@ -247,21 +247,21 @@
     <string name="title_activity_member_details">Dalībnieka informācija</string>
     <string name="title_activity_historical">Bijušie</string>
     <string name="ok">Labi</string>
-    <string name="cancel">Atcelt</string>
-    <string name="save">Saglabāt</string>
-    <string name="leave">Pamest</string>
-    <string name="send">Nosūtīt</string>
-    <string name="resend">Sūtīt atkārtoti</string>
-    <string name="redact">Rediģēt</string>
-    <string name="quote">Citēt</string>
-    <string name="share">Dalīties</string>
+    <string name="action_cancel">Atcelt</string>
+    <string name="action_save">Saglabāt</string>
+    <string name="action_leave">Pamest</string>
+    <string name="action_send">Nosūtīt</string>
+    <string name="action_resend">Sūtīt atkārtoti</string>
+    <string name="action_redact">Rediģēt</string>
+    <string name="action_quote">Citēt</string>
+    <string name="action_share">Dalīties</string>
     <string name="later">Vēlāk</string>
-    <string name="forward">Pārsūtīt</string>
+    <string name="action_forward">Pārsūtīt</string>
     <string name="permalink">Iekšējā saite</string>
     <string name="view_source">Skatīt pirmkodu</string>
     <string name="view_decrypted_source">Skatīt atšifrētu pirmkodu</string>
-    <string name="delete">Dzēst</string>
-    <string name="rename">Pārdēvēt</string>
+    <string name="action_delete">Dzēst</string>
+    <string name="action_rename">Pārdēvēt</string>
     <string name="report_content">Ziņot par saturu</string>
     <string name="active_call">Aktīvs zvans</string>
     <string name="ongoing_conference_call">Turpinās konferences zvans.
@@ -276,7 +276,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Konferences zvani netiek atbalstīti šifrētās istabās</string>
     <string name="send_anyway">Nosūtīt jebkurā gadījumā</string>
     <string name="or">vai</string>
-    <string name="invite">Uzaicināt</string>
+    <string name="action_invite">Uzaicināt</string>
     <string name="action_sign_out">Izrakstīties</string>
     <string name="action_voice_call">Balss zvans</string>
     <string name="action_video_call">Video zvans</string>
@@ -287,7 +287,7 @@
     <string name="action_open">Atvērt</string>
     <string name="action_close">Aizvērt</string>
     <string name="copied_to_clipboard">Nokopēts starpliktuvē</string>
-    <string name="disable">Atslēgt</string>
+    <string name="action_disable">Atslēgt</string>
     <string name="dialog_title_confirmation">Apstiprinājums</string>
     <string name="dialog_title_warning">Brīdinājums</string>
     <string name="bottom_action_home">Uz sākumu</string>
@@ -483,10 +483,10 @@ Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespē
     <string name="yes">JĀ</string>
     <string name="no">NĒ</string>
     <string name="_continue">Turpināt</string>
-    <string name="remove">Dzēst</string>
-    <string name="join">Pievienoties</string>
-    <string name="preview">Piekšskatījums</string>
-    <string name="reject">Noraidīt</string>
+    <string name="action_remove">Dzēst</string>
+    <string name="action_join">Pievienoties</string>
+    <string name="action_preview">Piekšskatījums</string>
+    <string name="action_reject">Noraidīt</string>
     <string name="room_jump_to_first_unread">Pāriet uz pirmo neizlasīto ziņu</string>
     <string name="room_preview_invitation_format">%s jūs uzaicināja pievienoties šai istabai</string>
     <string name="room_preview_unlinked_email_warning">Uzaicinājums tika nosūtīts uz %s, kura nav piesaistīta šim kontam. 
@@ -578,17 +578,6 @@ Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespē
     <string name="tab_title_search_messages">ZIŅAS</string>
     <string name="tab_title_search_people">CILVĒKI</string>
     <string name="tab_title_search_files">FAILI</string>
-    <string name="room_recents_join">PIEVIENOTIES</string>
-    <string name="room_recents_directory">KATALOGS</string>
-    <string name="room_recents_favourites">IZLASE</string>
-    <string name="room_recents_conversations">ISTABAS</string>
-    <string name="room_recents_low_priority">ZEMA PRIORITĀTE</string>
-    <string name="room_recents_invites">UZAICINĀJUMI</string>
-    <string name="room_recents_start_chat">Sākt saraksti</string>
-    <string name="room_recents_create_room">Izveidot istabu</string>
-    <string name="room_recents_join_room">Ieiet istabā</string>
-    <string name="room_recents_join_room_title">Ieiet istabā</string>
-    <string name="room_recents_join_room_prompt">Ievadiet istabas ID vai aliasu</string>
     <string name="directory_search_results_title">Pārlūkot katalogu</string>
     <string name="directory_searching_title">Meklē katalogā…</string>
     <string name="room_settings_all_messages_noisy">Visas ziņas (ar skaņu)</string>
@@ -890,7 +879,6 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
         <item quantity="one">%d aktīvi vidžeti</item>
         <item quantity="other">%d aktīvu vidžetu</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Neizdevās uzstādīt vidžetu.</string>
     <string name="widget_integration_failed_to_send_request">Neizdevās nosūtīt pieprasījumu.</string>
     <string name="widget_integration_positive_power_level">Pieejas līmenim jābūt lielākam par 0.</string>
@@ -901,30 +889,24 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="widget_integration_room_not_visible">Istaba %s ir neredzama.</string>
     <string name="room_add_matrix_apps">Pievienot Matrix lietotnes</string>
     <string name="settings_labs_native_camera">Lietot iebūvēto kameru</string>
-    <!-- share keys -->
     <string name="you_added_a_new_device">Tu pievienoji jaunu ierīci \'%s\', kura pieprasa šifrēšanas atslēgas.</string>
     <string name="your_unverified_device_requesting">Tava neverificētā ierīce \'%s\' pieprasa šifrēšanas atslēgas.</string>
     <string name="start_verification">Sākt tās verifikāciju</string>
     <string name="share_without_verifying">Dalīties bez verificēšanas</string>
     <string name="ignore_request">Ignorēt pieprasījumu</string>
-    <!-- conference call -->
     <string name="conference_call_warning_title">Uzmanību!</string>
     <string name="conference_call_warning_message">Konferences zvans ir izstrādes stadijā un var nebūt uzticams.</string>
-    <!-- slash commands -->
     <string name="command_error">Komandas kļūda</string>
     <string name="unrecognized_command">Nepazīstama komanda: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Izslēgts</string>
     <string name="notification_noisy">Ar skaņu</string>
     <string name="encrypted_message">Šifrēta ziņa</string>
-    <!-- groups creation -->
     <string name="create">Izveidot</string>
     <string name="create_community">Izveidot kopienu</string>
     <string name="community_name">Kopienas nosaukums</string>
     <string name="community_name_hint">Piemērs</string>
     <string name="community_id">Kopienas Id</string>
     <string name="community_id_hint">piemērs</string>
-    <!-- group details -->
     <string name="group_details_home">Sākums</string>
     <string name="group_details_people">Cilvēki</string>
     <string name="group_details_rooms">Istabas</string>
@@ -960,7 +942,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="verify_other_sessions">Verificējiet visas savas sesijas, lai nodrošinātos, ka jūsu konts un ziņas ir drošībā</string>
     <string name="review_logins">Pārskatiet savas pierakstīšanās</string>
     <string name="unencrypted">Nešifrēts</string>
-    <string name="or_other_mx_capabale_client">vai kādu citu Matrix lietotni ar cross-signing atbalstu</string>
+    <string name="or_other_mx_capable_client">vai kādu citu Matrix lietotni ar cross-signing atbalstu</string>
     <string name="auth_invalid_login_deactivated_account">Šis konts ir deaktivizēts.</string>
     <string name="settings_messages_in_e2e_group_chat">Šifrētas ziņas grupas čatos</string>
     <string name="settings_messages_in_e2e_one_to_one">Šifrētas ziņas viens-pret-vienu čatos</string>
@@ -1221,25 +1203,25 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="action_sign_out_confirmation_simple">Vai tiešām vēlies izrakstīties\?</string>
     <string name="call_notification_reject">Noraidīt</string>
     <string name="call_notification_answer">Pieņemt</string>
-    <string name="decline">Noraidīt</string>
-    <string name="review">Pārlūkot</string>
-    <string name="ignore">Nerādīt nevienu šī dalībnieka ziņu</string>
-    <string name="abort">Pārtraukt</string>
+    <string name="action_decline">Noraidīt</string>
+    <string name="action_review">Pārlūkot</string>
+    <string name="action_ignore">Nerādīt nevienu šī dalībnieka ziņu</string>
+    <string name="action_abort">Pārtraukt</string>
     <string name="done">Gatavs</string>
-    <string name="skip">Izlaist</string>
-    <string name="accept">Pieņemt</string>
+    <string name="action_skip">Izlaist</string>
+    <string name="action_accept">Pieņemt</string>
     <string name="no_permissions_to_start_conf_call">Jums nav atļaujas sākt konferences zvanu šajā istabā</string>
-    <string name="reset">Atiestatīt</string>
-    <string name="dismiss">Aizvērt</string>
-    <string name="pause_video">Pauzēt</string>
-    <string name="play_video">Atskaņot</string>
-    <string name="disconnect">Atvienoties</string>
-    <string name="revoke">Atsaukt</string>
+    <string name="action_reset">Atiestatīt</string>
+    <string name="action_dismiss">Aizvērt</string>
+    <string name="action_pause">Pauzēt</string>
+    <string name="action_play">Atskaņot</string>
+    <string name="action_disconnect">Atvienoties</string>
+    <string name="action_revoke">Atsaukt</string>
     <string name="none">Nav</string>
-    <string name="clear">Notīrīt</string>
-    <string name="speak">Runāt</string>
-    <string name="download">Lejupielādēt</string>
-    <string name="stay">Palikt</string>
+    <string name="action_clear">Notīrīt</string>
+    <string name="action_speak">Runāt</string>
+    <string name="action_download">Lejupielādēt</string>
+    <string name="action_stay">Palikt</string>
     <string name="are_you_sure">Vai tiešām to vēlaties\?</string>
     <string name="title_activity_verify_device">Verificēt ierīci</string>
     <string name="system_theme">Sistēmas noklusējuma</string>
@@ -1275,7 +1257,6 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="room_list_sharing_header_other_rooms">Citas istabas</string>
     <string name="room_list_sharing_header_recent_rooms">Nesenās istabas</string>
     <string name="sent_verification_conclusion">Verifikācijas slēdziens</string>
-    <string name="sent_a_bot_buttons">Bota pogas</string>
     <string name="sent_a_poll">Aptauja</string>
     <string name="send_a_sticker">Uzlīme</string>
     <string name="verification_conclusion_compromised">Kāds no uzskaitītajiem var būt kompromitēts:
@@ -1790,8 +1771,8 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="settings_show_redacted">Rādīt izdzēstās ziņas</string>
     <string name="message_view_reaction">Apskatīt Reakcijas</string>
     <string name="message_add_reaction">Pievienot Reakciju</string>
-    <string name="reactions_like">Patīk</string>
-    <string name="reactions_agree">Piekrist</string>
+    <string name="action_like">Patīk</string>
+    <string name="action_agree">Piekrist</string>
     <string name="room_list_people_empty_body">Jūsu sarunas tiks parādītas šeit. Nospiediet + ekrāna labējā, apakšējā stūrī, lai sāktu sarunas.</string>
     <string name="room_list_catchup_welcome_body">Apskatiet nelasītas ziņas šeit</string>
     <string name="room_list_catchup_welcome_title">Laipni lūgti mājās!</string>
@@ -2159,7 +2140,6 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Atslēgas jau ir atjauninātas!</string>
     <string name="event_redacted_by_admin_reason_with_reason">Pasākumu moderē telpas administrators, iemesls: %1$s</string>
     <string name="event_redacted_by_user_reason_with_reason">Lietotājs izdzēsa notikumu, iemesls: %1$s</string>
-    <string name="poll_item_selected_aria">Izvēlētā Opcija</string>
     <string name="delete_account_data_warning">Dzēst %1$s tipa konta datus\?
 \n
 \nLietojiet piesardzīgi, tas var izraisīt neparedzētu uzvedību.</string>
@@ -2351,8 +2331,8 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="invite_to_space_with_name_desc">Viņi varēs izpētīt %s</string>
     <string name="invite_to_space_with_name">Uzaicināt uz %s</string>
     <string name="invite_by_link">Kopīgot saiti</string>
-    <string name="invite_by_mxid_or_mail">Ielūgt pēc lietotājvārda vai pa e-pastu</string>
-    <string name="invite_by_mxid">Ielūgt pēc lietotājvārda</string>
+    <string name="invite_by_username_or_mail">Ielūgt pēc lietotājvārda vai pa e-pastu</string>
+    <string name="invite_by_username">Ielūgt pēc lietotājvārda</string>
     <string name="invite_by_email">Ielūgt pa e-pastu</string>
     <string name="invite_people_to_your_space_desc">Šobrīd esi tikai tu. %s būs vēl labāk kopā ar citiem.</string>
     <string name="invite_to_space">Uzaicināt uz %s</string>
@@ -2563,16 +2543,6 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
         <item quantity="one">Sūtīt attēlu ar oriģinālo izmēru</item>
         <item quantity="other">Sūtīt attēlus ar oriģinālo izmēru</item>
     </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="zero">%d balsu - Galīgie rezultāti</item>
-        <item quantity="one">%d balss - Galīgie rezultāti</item>
-        <item quantity="other">%d balsis - Galīgie rezultāti</item>
-    </plurals>
-    <plurals name="poll_info">
-        <item quantity="zero">%d balsu</item>
-        <item quantity="one">%d balss</item>
-        <item quantity="other">%d balsis</item>
-    </plurals>
     <string name="settings_server_room_version_unstable">nestabila</string>
     <string name="settings_server_room_version_stable">stabila</string>
     <string name="settings_server_default_room_version">Noklusējuma versija</string>
diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index db959072d7..86e199ebb8 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -58,11 +58,11 @@
     <string name="action_voice_call">വോയ്സ് കോൾ</string>
     <string name="actions">പ്രവർത്തനങ്ങൾ</string>
     <string name="action_exit">പുറത്തുകടക്കുക</string>
-    <string name="ignore">അവഗണിക്കൂ</string>
+    <string name="action_ignore">അവഗണിക്കൂ</string>
     <string name="done">ചെയ്‌തു</string>
-    <string name="skip">ഒഴിവാക്കൂ</string>
+    <string name="action_skip">ഒഴിവാക്കൂ</string>
     <string name="offline">ഓഫ്‌ലൈൻ</string>
-    <string name="invite">ക്ഷണിക്കുക</string>
+    <string name="action_invite">ക്ഷണിക്കുക</string>
     <string name="or">അല്ലെങ്കിൽ</string>
     <string name="device_information">സെഷൻ വിശദാംശങ്ങൾ</string>
     <string name="audio_meeting">ഓഡിയോ മീറ്റിംഗ് ആരംഭിക്കുക</string>
@@ -72,14 +72,14 @@
     <string name="cannot_start_call">കോൾ ആരംഭിക്കാൻ കഴിയില്ല, ദയവായി പിന്നീട് ശ്രമിക്കുക</string>
     <string name="ongoing_conference_call_video">വീഡിയോ</string>
     <string name="start_chatting">ചാറ്റിംഗ് ആരംഭിക്കുക</string>
-    <string name="delete">ഇല്ലാതാക്കൂ</string>
-    <string name="clear">മായ്ക്കുക</string>
-    <string name="download">ഡൌൺലോഡ് ചെയ്യൂ</string>
-    <string name="share">പങ്കിടുക</string>
-    <string name="resend">വീണ്ടും അയയ്ക്കൂ</string>
-    <string name="send">അയയ്ക്കൂ</string>
-    <string name="save">സംരക്ഷിക്കൂ</string>
-    <string name="cancel">റദ്ദാക്കൂ</string>
+    <string name="action_delete">ഇല്ലാതാക്കൂ</string>
+    <string name="action_clear">മായ്ക്കുക</string>
+    <string name="action_download">ഡൌൺലോഡ് ചെയ്യൂ</string>
+    <string name="action_share">പങ്കിടുക</string>
+    <string name="action_resend">വീണ്ടും അയയ്ക്കൂ</string>
+    <string name="action_send">അയയ്ക്കൂ</string>
+    <string name="action_save">സംരക്ഷിക്കൂ</string>
+    <string name="action_cancel">റദ്ദാക്കൂ</string>
     <string name="ok">ശരി</string>
     <string name="loading">ലഭ്യമാക്കുന്നു…</string>
     <string name="are_you_sure">നിങ്ങൾക്കു ഉറപ്പാണോ\?</string>
@@ -114,10 +114,10 @@
     <string name="call_notification_reject">നിരസിക്കുക</string>
     <string name="call_notification_answer">സ്വീകരിക്കുക</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">ഒരു കോൾ ആരംഭിക്കാൻ നിങ്ങളെ അനുവദിച്ചിട്ടില്ല</string>
-    <string name="dismiss">ഒഴിവാക്കൂ</string>
-    <string name="rename">പേരുമാറ്റുക</string>
-    <string name="speak">സംസാരിക്കൂ</string>
-    <string name="redact">നീക്കംചെയ്യൂ</string>
+    <string name="action_dismiss">ഒഴിവാക്കൂ</string>
+    <string name="action_rename">പേരുമാറ്റുക</string>
+    <string name="action_speak">സംസാരിക്കൂ</string>
+    <string name="action_redact">നീക്കംചെയ്യൂ</string>
     <string name="backup">ബാക്കപ്പ്</string>
     <string name="title_activity_member_details">അംഗ വിശദാംശങ്ങൾ</string>
     <string name="login_a11y_choose_matrix_org">matrix.org തിരഞ്ഞെടുക്കൂ</string>
@@ -174,9 +174,9 @@
     <string name="room_creation_title">പുതിയ ചാറ്റ്</string>
     <string name="room_preview_try_join_an_unknown_room_default">ഒരു മുറി</string>
     <string name="room_sync_in_progress">സമന്വയിപ്പിക്കുന്നു…</string>
-    <string name="reject">നിരസിക്കുക</string>
-    <string name="join">ചേരുക</string>
-    <string name="remove">നീക്കംചെയ്യൂ</string>
+    <string name="action_reject">നിരസിക്കുക</string>
+    <string name="action_join">ചേരുക</string>
+    <string name="action_remove">നീക്കംചെയ്യൂ</string>
     <string name="_continue">തുടരുക</string>
     <string name="no">ഇല്ല</string>
     <string name="yes">അതെ</string>
@@ -204,7 +204,7 @@
     <string name="no_room_placeholder">മുറികളില്ല</string>
     <string name="rooms_header">മുറികൾ</string>
     <string name="dialog_title_confirmation">ഉറപ്പാക്കൽ</string>
-    <string name="accept">സ്വീകരിക്കുക</string>
+    <string name="action_accept">സ്വീകരിക്കുക</string>
     <string name="later">പിന്നീട്</string>
     <string name="ongoing_conference_call_voice">വോയ്സ്</string>
     <string name="people_search_filter_text">Matrix ഉപയോക്താക്കൾ മാത്രം</string>
@@ -268,7 +268,6 @@
     <string name="room_sliding_menu_settings">ക്രമീകരണങ്ങൾ</string>
     <string name="room_sliding_menu_messages">സന്ദേശങ്ങൾ</string>
     <string name="room_settings_forget">മറക്കൂ</string>
-    <string name="room_recents_conversations">മുറികൾ</string>
     <string name="tab_title_search_files">ഫയലുകൾ</string>
     <string name="tab_title_search_people">ആളുകൾ</string>
     <string name="tab_title_search_messages">സന്ദേശങ്ങൾ</string>
@@ -282,7 +281,7 @@
     <string name="reason_hint">കാരണം</string>
     <string name="room_participants_action_kick">പുറത്താക്കൂ</string>
     <string name="room_participants_action_ban">നിരോധിക്കൂ</string>
-    <string name="reset">പുനഃസജ്ജമാക്കൂ</string>
+    <string name="action_reset">പുനഃസജ്ജമാക്കൂ</string>
     <string name="none">ഒന്നുമില്ല</string>
     <string name="call_only_active">സജീവ കോൾ (%1$s)</string>
     <string name="call_tile_other_declined">%1$s ഈ കോൾ നിരസിച്ചു</string>
@@ -297,8 +296,8 @@
     <string name="bottom_action_home">ഹോം</string>
     <string name="call_anyway">എന്തായാലും വിളിക്കൂ</string>
     <string name="action_global_search">ആഗോള തിരയൽ</string>
-    <string name="decline">നിരസിക്കുക</string>
-    <string name="play_video">പ്ലേ</string>
+    <string name="action_decline">നിരസിക്കുക</string>
+    <string name="action_play">പ്ലേ</string>
     <string name="permalink">പെർമാലിങ്ക്</string>
     <string name="dialog_title_third_party_licences">മൂന്നാം കക്ഷി ലൈസൻസുകൾ</string>
     <string name="verification_profile_warning">മുന്നറിയിപ്പ്</string>
@@ -382,10 +381,6 @@
         <item quantity="one">%d മുറി</item>
         <item quantity="other">%d മുറികൾ</item>
     </plurals>
-    <string name="room_recents_join_room_title">ഒരു മുറിയിൽ ചേരുക</string>
-    <string name="room_recents_join_room">മുറിയിൽ ചേരുക</string>
-    <string name="room_recents_create_room">മുറി സൃഷ്ടിക്കൂ</string>
-    <string name="room_recents_start_chat">ചാറ്റ് ആരംഭിക്കുക</string>
     <string name="search_no_results">ഫലങ്ങളൊന്നുമില്ല</string>
     <string name="room_details_title">മുറി വിശദാംശങ്ങൾ</string>
     <string name="room_permissions_change_topic">വിഷയം മാറ്റുക</string>
@@ -607,7 +602,7 @@
     <string name="message_failed_to_upload">ചിത്രം അപ്‌ലോഡുചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു</string>
     <string name="unable_to_send_message">സന്ദേശം അയയ്‌ക്കാനായില്ല</string>
     <string name="could_not_redact">പുനഃക്രമീകരിക്കാൻ കഴിഞ്ഞില്ല</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">അയച്ചയാളുടെ ഉപകരണം ഈ സന്ദേശത്തിനുള്ള കീകൾ ഞങ്ങൾക്ക് അയച്ചിട്ടില്ല.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">അയച്ചയാളുടെ ഉപകരണം ഈ സന്ദേശത്തിനുള്ള കീകൾ ഞങ്ങൾക്ക് അയച്ചിട്ടില്ല.</string>
     <string name="notice_crypto_unable_to_decrypt">** ഡീക്രിപ്റ്റ് ചെയ്യാൻ കഴിഞ്ഞില്ല: %s **</string>
     <string name="notice_power_level_changed">%1$s %2$s ന്റെ അധികാര നില മാറ്റി.</string>
     <string name="notice_power_level_changed_by_you">നിങ്ങൾ %1$s ന്റെ അധികാര നില മാറ്റി.</string>
@@ -657,7 +652,7 @@
         <item quantity="one">%dസെ</item>
         <item quantity="other">%dസെ</item>
     </plurals>
-    <string name="preview">പ്രിവ്യൂ</string>
+    <string name="action_preview">പ്രിവ്യൂ</string>
     <string name="call_hold_action">ഹോൾഡ്</string>
     <string name="call_resume_action">പുനരാരംഭിക്കുക</string>
     <string name="compression_opt_list_small">ചെറുത്</string>
@@ -671,16 +666,16 @@
     <string name="groups_header">കമ്മ്യൂണിറ്റികൾ</string>
     <string name="bottom_action_groups">കമ്മ്യൂണിറ്റികൾ</string>
     <string name="dialog_title_error">പിശക്</string>
-    <string name="disable">അപ്രാപ്തമാക്കുക</string>
-    <string name="review">അവലോകനം</string>
-    <string name="abort">ഉപേക്ഷിക്കുക</string>
-    <string name="pause_video">താൽക്കാലികമായി നിർത്തുക</string>
-    <string name="disconnect">വിച്ഛേദിക്കുക</string>
-    <string name="revoke">അസാധുവാക്കുക</string>
-    <string name="forward">ഫോർവേഡ്</string>
-    <string name="quote">ഉദ്ധരണി</string>
-    <string name="stay">തുടരുക</string>
-    <string name="leave">വിടുക</string>
+    <string name="action_disable">അപ്രാപ്തമാക്കുക</string>
+    <string name="action_review">അവലോകനം</string>
+    <string name="action_abort">ഉപേക്ഷിക്കുക</string>
+    <string name="action_pause">താൽക്കാലികമായി നിർത്തുക</string>
+    <string name="action_disconnect">വിച്ഛേദിക്കുക</string>
+    <string name="action_revoke">അസാധുവാക്കുക</string>
+    <string name="action_forward">ഫോർവേഡ്</string>
+    <string name="action_quote">ഉദ്ധരണി</string>
+    <string name="action_stay">തുടരുക</string>
+    <string name="action_leave">വിടുക</string>
     <plurals name="notice_room_canonical_alias_alternative_added_by_you">
         <item quantity="one">ഈ മുറിക്കായി %1$s എന്ന ഇതര വിലാസം നിങ്ങൾ ചേർത്തു.</item>
         <item quantity="other">ഈ മുറിക്കായി %1$s എന്ന ഇതര വിലാസങ്ങൾ നിങ്ങൾ ചേർത്തു.</item>
@@ -713,8 +708,8 @@
     <string name="fab_menu_create_room">മുറികൾ</string>
     <string name="action_change">മാറ്റുക</string>
     <string name="reactions">പ്രതികരണങ്ങൾ</string>
-    <string name="reactions_like">ലൈക്ക്</string>
-    <string name="reactions_agree">സമ്മതിക്കുക</string>
+    <string name="action_like">ലൈക്ക്</string>
+    <string name="action_agree">സമ്മതിക്കുക</string>
     <string name="title_activity_emoji_reaction_picker">പ്രതികരണങ്ങൾ</string>
     <string name="room_list_rooms_empty_title">മുറികൾ</string>
     <string name="room_list_people_empty_title">സംഭാഷണങ്ങൾ</string>
@@ -802,8 +797,6 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">പ്രാപ്തമാക്കുക</string>
     <string name="room_sliding_menu_copyright">പകർപ്പാവകാശം</string>
     <string name="room_settings_mute">നിശബ്ദമാക്കുക</string>
-    <string name="room_recents_invites">കഷണങ്ങൾ</string>
-    <string name="room_recents_join">ചേരുക</string>
     <string name="search_hint">തിരയുക</string>
     <string name="ssl_remain_offline">അവഗണിക്കുക</string>
     <string name="room_participants_action_unban">നിരോധനം മാറ്റുക</string>
@@ -890,7 +883,6 @@
     <string name="room_settings_direct_chat">നേരിട്ടുള്ള ചാറ്റ്</string>
     <string name="directory_searching_title">ഡയറക്‌ടറിയിൽ തിരയുന്നു…</string>
     <string name="directory_search_results_title">ഡയറക്ടറി ബ്രൗസ് ചെയ്യുക</string>
-    <string name="room_recents_low_priority">കുറഞ്ഞ മുൻ‌ഗണന</string>
     <string name="room_event_action_cancel_download">ഡൗൺലോഡ് റദ്ദാക്കുക</string>
     <string name="room_event_action_cancel_upload">അപ്‌ലോഡ് റദ്ദാക്കുക</string>
     <plurals name="room_details_selected">
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 712d99b123..f2173d6b3c 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -15,44 +15,44 @@
     <string name="are_you_sure">Er du sikker\?</string>
     <string name="loading">Laster…</string>
     <string name="ok">OK</string>
-    <string name="cancel">Lukk</string>
-    <string name="save">Lagre</string>
-    <string name="leave">Forlat</string>
-    <string name="send">Send</string>
-    <string name="resend">Send på nytt</string>
-    <string name="redact">Fjern</string>
-    <string name="quote">Sitering</string>
-    <string name="download">Nedlastning</string>
-    <string name="share">Del</string>
-    <string name="clear">Tøm</string>
+    <string name="action_cancel">Lukk</string>
+    <string name="action_save">Lagre</string>
+    <string name="action_leave">Forlat</string>
+    <string name="action_send">Send</string>
+    <string name="action_resend">Send på nytt</string>
+    <string name="action_redact">Fjern</string>
+    <string name="action_quote">Sitering</string>
+    <string name="action_download">Nedlastning</string>
+    <string name="action_share">Del</string>
+    <string name="action_clear">Tøm</string>
     <string name="later">Senere</string>
-    <string name="forward">Neste</string>
+    <string name="action_forward">Neste</string>
     <string name="permalink">Permalenke</string>
     <string name="view_source">Vis kilden</string>
-    <string name="delete">Slett</string>
-    <string name="rename">Endre navn</string>
+    <string name="action_delete">Slett</string>
+    <string name="action_rename">Endre navn</string>
     <string name="none">Ingen</string>
-    <string name="revoke">Tilbakekall</string>
-    <string name="disconnect">Koble fra</string>
+    <string name="action_revoke">Tilbakekall</string>
+    <string name="action_disconnect">Koble fra</string>
     <string name="ongoing_conference_call_voice">Stemme</string>
     <string name="ongoing_conference_call_video">Film</string>
     <string name="or">eller</string>
-    <string name="invite">Inviter</string>
+    <string name="action_invite">Inviter</string>
     <string name="offline">Frakoblet</string>
-    <string name="accept">Godta</string>
-    <string name="skip">Hopp over</string>
+    <string name="action_accept">Godta</string>
+    <string name="action_skip">Hopp over</string>
     <string name="done">Fullført</string>
-    <string name="abort">Løp vekk</string>
-    <string name="ignore">Ignorer</string>
-    <string name="review">Gjennomgang</string>
-    <string name="decline">Avslå</string>
+    <string name="action_abort">Løp vekk</string>
+    <string name="action_ignore">Ignorer</string>
+    <string name="action_review">Gjennomgang</string>
+    <string name="action_decline">Avslå</string>
     <string name="action_exit">Avslutt</string>
     <string name="actions">Handlinger</string>
     <string name="action_sign_out">Logg ut</string>
     <string name="action_historical">Historisk</string>
     <string name="action_close">Lukk</string>
     <string name="copied_to_clipboard">Kopiert til utklippstavle</string>
-    <string name="disable">Slå av</string>
+    <string name="action_disable">Slå av</string>
     <string name="dialog_title_warning">Advarsel</string>
     <string name="dialog_title_error">Feil</string>
     <string name="bottom_action_home">Hjem</string>
@@ -103,10 +103,10 @@
     <string name="yes">JA</string>
     <string name="no">NEI</string>
     <string name="_continue">Fortsett</string>
-    <string name="remove">Fjern</string>
-    <string name="join">Bli med</string>
-    <string name="preview">Forhåndsvisning</string>
-    <string name="reject">Avvis</string>
+    <string name="action_remove">Fjern</string>
+    <string name="action_join">Bli med</string>
+    <string name="action_preview">Forhåndsvisning</string>
+    <string name="action_reject">Avvis</string>
     <string name="room_sync_in_progress">Synkroniserer …</string>
     <plurals name="format_time_s">
         <item quantity="one">%ds</item>
@@ -146,7 +146,6 @@
     <string name="room_event_action_cancel_download">Avbryt nedlasting</string>
     <string name="search_no_results">Ingen treff</string>
     <string name="tab_title_search_rooms">ROM</string>
-    <string name="room_recents_conversations">ROM</string>
     <string name="room_settings_mute">Demp</string>
     <string name="room_settings_direct_chat">Direktesamtale</string>
     <string name="room_settings_forget">Glem</string>
@@ -290,7 +289,7 @@
     <string name="global_retry">Prøv igjen</string>
     <string name="invited_by">Invitert av %s</string>
     <string name="title_activity_emoji_reaction_picker">Reaksjoner</string>
-    <string name="reactions_like">Liker</string>
+    <string name="action_like">Liker</string>
     <string name="reactions">Reaksjoner</string>
     <string name="action_change">Endre</string>
     <string name="please_wait">Vennligst vent …</string>
@@ -545,8 +544,8 @@
     <string name="backup">Sikkerhetskopi</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Du kommer til å miste tilgang til dine enkrypterte meldinger med mindre du sikkerhetskopierer nøklene dine før du logger av.</string>
     <string name="dialog_title_third_party_licences">Tredjepartslinsenser</string>
-    <string name="stay">Bli</string>
-    <string name="speak">Snakk</string>
+    <string name="action_stay">Bli</string>
+    <string name="action_speak">Snakk</string>
     <string name="view_decrypted_source">Se dekryptert kilde</string>
     <string name="report_content">Rapporter innhold</string>
     <string name="ongoing_conference_call">Pågående konferansesamtale.
@@ -609,9 +608,9 @@
     <string name="start_new_chat_prompt_msg">Er du sikker på du vil starte en samtale med %s\?</string>
     <string name="start_voice_call_prompt_msg">Er du sikker på du vil starte en lydsamtale\?</string>
     <string name="start_video_call_prompt_msg">Er du sikker på du vil starte en videosamtale\?</string>
-    <string name="play_video">Spill av</string>
-    <string name="pause_video">Pause</string>
-    <string name="dismiss">Avslå</string>
+    <string name="action_play">Spill av</string>
+    <string name="action_pause">Pause</string>
+    <string name="action_dismiss">Avslå</string>
     <string name="no_permissions_to_start_conf_call">Du har ikke rettigheter til å starte en konferansesamtale i dette rommet</string>
     <string name="conference_call_in_progress">Det pågår allerede en konferanse!</string>
     <string name="video_meeting">Start videomøte</string>
@@ -698,9 +697,6 @@
     <string name="room_details_people_invited_group_name">INVITERT</string>
     <string name="tab_title_search_messages">MELDINGER</string>
     <string name="tab_title_search_files">FILER</string>
-    <string name="room_recents_create_room">Opprett et rom</string>
-    <string name="room_recents_join_room">Bli med i rommet</string>
-    <string name="room_recents_join_room_title">Bli med i et rom</string>
     <string name="room_sliding_menu_term_and_conditions">Betingelser og vilkår</string>
     <string name="room_sliding_menu_privacy_policy">Personvernregler</string>
     <string name="settings_add_email_address">Legg til E-postadresse</string>
@@ -878,7 +874,7 @@
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Du har ikke tillatelse til å starte en samtale</string>
     <string name="no_permissions_to_start_webrtc_call">Du har ikke tillatelse til å starte en samtale i dette rommet</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Du har ikke tillatelse til å starte en konferansesamtale</string>
-    <string name="reset">Tilbakestill</string>
+    <string name="action_reset">Tilbakestill</string>
     <string name="login_error_forbidden">Ugyldig brukernavn/passord</string>
     <string name="login_error_ssl_handshake">Denne enheten bruker en utdatert TLS sikkerhetsprotokoll som er sårbar for angrep, for din egen sikkerhet får du ikke kople til serveren</string>
     <string name="login_error_unable_register">Klarte ikke registrere bruker</string>
@@ -1023,12 +1019,6 @@
         <item quantity="other">%1$s rom funnet for %2$s</item>
     </plurals>
     <string name="directory_search_results_title">Bla gjennom katalogen</string>
-    <string name="room_recents_join_room_prompt">Skriv inn et rom-ID eller et romalias</string>
-    <string name="room_recents_start_chat">Start chat</string>
-    <string name="room_recents_low_priority">LAV PRIORITET</string>
-    <string name="room_recents_favourites">FAVORITTER</string>
-    <string name="room_recents_directory">KATALOG</string>
-    <string name="room_recents_join">BLI MED</string>
     <string name="search_is_not_supported_in_e2e_room">Søking i krypterte rom støttes ikke ennå.</string>
     <string name="tab_title_search_people">FOLK</string>
     <string name="room_event_action_report_prompt_reason">Årsak til å rapportere dette innholdet</string>
@@ -1179,7 +1169,7 @@
     <string name="room_list_catchup_welcome_title">Velkommen hjem!</string>
     <string name="room_list_people_empty_body">Dine direktemeldinger vises her. Trykk på + nederst til høyre for å starte noen.</string>
     <string name="room_list_rooms_empty_body">Rommene dine vises her. Trykk på + nederst til høyre for å finne eksisterende eller start din egen.</string>
-    <string name="reactions_agree">Godta</string>
+    <string name="action_agree">Godta</string>
     <string name="message_view_reaction">Se reaksjoner</string>
     <string name="event_redacted_by_user_reason">Arrangement slettet av bruker</string>
     <string name="last_edited_info_message">Sist redigert av %1$s på %2$s</string>
@@ -1613,7 +1603,6 @@
     <string name="settings_troubleshoot_test_foreground_service_started_title">Varslingstjeneste</string>
     <string name="settings_troubleshoot_test_play_services_title">Play Tjenester Sjekk</string>
     <string name="directory_searching_title">Søker i katalogen…</string>
-    <string name="room_recents_invites">INVITASJONER</string>
     <string name="dev_tools_error_no_content">Ikke noe innhold</string>
     <string name="event_status_a11y_sending">Sender</string>
     <string name="event_status_a11y_failed">Mislyktes</string>
@@ -1629,7 +1618,7 @@
     <string name="network_error">Nettverksfeil</string>
     <string name="message_failed_to_upload">Kunne ikke laste opp bildet</string>
     <string name="unable_to_send_message">Kan ikke sende melding</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Avsenderens enhet har ikke sendt oss nøklene til denne meldingen.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Avsenderens enhet har ikke sendt oss nøklene til denne meldingen.</string>
     <string name="notice_crypto_unable_to_decrypt">** Kan ikke dekryptere: %s **</string>
     <string name="power_level_custom_no_value">Tilpasset</string>
     <string name="power_level_custom">Tilpasset (%1$d)</string>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 98ce426c8c..cdbb031833 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -39,23 +39,16 @@
     <string name="notice_room_third_party_invite">%1$s heeft een uitnodiging naar %2$s gestuurd om het gesprek toe te treden</string>
     <string name="notice_room_third_party_registered_invite">%1$s heeft de uitnodiging voor %2$s aanvaard</string>
     <string name="notice_crypto_unable_to_decrypt">** Kan niet ontsleutelen: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Het apparaat van de afzender heeft geen sleutels voor dit bericht gestuurd.</string>
-    <!-- Room Screen -->
+    <string name="notice_crypto_error_unknown_inbound_session_id">Het apparaat van de afzender heeft geen sleutels voor dit bericht gestuurd.</string>
     <string name="could_not_redact">Kon niet verwijderd worden</string>
     <string name="unable_to_send_message">Kan bericht niet verzenden</string>
     <string name="message_failed_to_upload">Uploaden van de afbeelding mislukt</string>
-    <!-- general errors -->
     <string name="network_error">Netwerkfout</string>
     <string name="matrix_error">Matrix-fout</string>
-    <!-- Home Screen -->
-    <!-- Last seen time -->
-    <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Het is momenteel niet mogelijk om een leeg gesprek opnieuw toe te treden.</string>
-    <!-- medium friendly name -->
     <string name="medium_email">E-mailadres</string>
     <string name="medium_phone_number">Telefoonnummer</string>
     <string name="summary_user_sent_sticker">%1$s heeft een sticker gestuurd.</string>
-    <!-- Room display name -->
     <string name="room_displayname_invite_from">Uitnodiging van %s</string>
     <string name="room_displayname_room_invite">Gespreksuitnodiging</string>
     <string name="room_displayname_two_members">%1$s en %2$s</string>
@@ -116,29 +109,27 @@
     <string name="notice_room_guest_access_forbidden">%1$s heeft gasten de toegang tot het gesprek verhinderd.</string>
     <string name="notice_end_to_end_ok">%1$s heeft eind-tot-eindversleuteling ingeschakeld.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s heeft eind-tot-eindversleuteling ingeschakeld (onbekend algoritme %2$s).</string>
-    <!-- titles -->
     <string name="title_activity_home">Berichten</string>
     <string name="title_activity_room">Gesprek</string>
     <string name="title_activity_settings">Instellingen</string>
     <string name="title_activity_member_details">Info over deelnemer</string>
     <string name="title_activity_historical">Historisch</string>
-    <!-- button names -->
     <string name="ok">Oké</string>
-    <string name="cancel">Annuleren</string>
-    <string name="save">Opslaan</string>
-    <string name="leave">Verlaten</string>
-    <string name="send">Versturen</string>
-    <string name="resend">Opnieuw versturen</string>
-    <string name="redact">Verwijderen</string>
-    <string name="quote">Citeren</string>
-    <string name="share">Delen</string>
+    <string name="action_cancel">Annuleren</string>
+    <string name="action_save">Opslaan</string>
+    <string name="action_leave">Verlaten</string>
+    <string name="action_send">Versturen</string>
+    <string name="action_resend">Opnieuw versturen</string>
+    <string name="action_redact">Verwijderen</string>
+    <string name="action_quote">Citeren</string>
+    <string name="action_share">Delen</string>
     <string name="later">Later</string>
-    <string name="forward">Doorsturen</string>
+    <string name="action_forward">Doorsturen</string>
     <string name="permalink">Permalink</string>
     <string name="view_source">Bron weergeven</string>
     <string name="view_decrypted_source">Ontsleutelde bron weergeven</string>
-    <string name="delete">Verwijderen</string>
-    <string name="rename">Hernoemen</string>
+    <string name="action_delete">Verwijderen</string>
+    <string name="action_rename">Hernoemen</string>
     <string name="report_content">Inhoud melden</string>
     <string name="active_call">Actieve oproep</string>
     <string name="ongoing_conference_call">Lopend vergadergesprek.
@@ -153,8 +144,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Vergadergesprekken worden niet ondersteund in versleutelde gesprekken</string>
     <string name="send_anyway">Toch sturen</string>
     <string name="or">of</string>
-    <string name="invite">Uitnodigen</string>
-    <!-- actions -->
+    <string name="action_invite">Uitnodigen</string>
     <string name="action_sign_out">Afmelden</string>
     <string name="action_voice_call">Spraakoproep</string>
     <string name="action_video_call">Video-oproep</string>
@@ -165,31 +155,25 @@
     <string name="action_open">Openen</string>
     <string name="action_close">Sluiten</string>
     <string name="copied_to_clipboard">Gekopieerd naar klembord</string>
-    <string name="disable">Uitschakelen</string>
-    <!-- dialog titles -->
+    <string name="action_disable">Uitschakelen</string>
     <string name="dialog_title_confirmation">Bevestiging</string>
     <string name="dialog_title_warning">Waarschuwing</string>
-    <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Thuis</string>
     <string name="bottom_action_favourites">Favorieten</string>
     <string name="bottom_action_people">Personen</string>
     <string name="bottom_action_rooms">Gesprekken</string>
-    <!-- Home screen -->
     <string name="home_filter_placeholder_home">Gespreksnamen filteren</string>
     <string name="home_filter_placeholder_favorites">Favorieten filteren</string>
     <string name="home_filter_placeholder_people">Personen filteren</string>
     <string name="home_filter_placeholder_rooms">Gespreksnamen filteren</string>
-    <!-- Home fragment -->
     <string name="invitations_header">Uitnodigingen</string>
     <string name="low_priority_header">Lage prioriteit</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">Gesprekken</string>
     <string name="local_address_book_header">Lokale contactenlijst</string>
     <string name="matrix_only_filter">Alleen Matrix-contacten</string>
     <string name="no_conversation_placeholder">Geen gesprekken</string>
     <string name="template_no_contact_access_placeholder">U heeft ${app_name} geen toegang tot uw lokale contacten gegeven</string>
     <string name="no_result_placeholder">Geen resultaten</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">Gesprekken</string>
     <string name="rooms_directory_header">Gesprekscatalogus</string>
     <string name="no_room_placeholder">Geen gesprekken</string>
@@ -225,7 +209,6 @@
     <string name="start_video_call">Video-oproep beginnen</string>
     <string name="option_send_files">Bestanden versturen</string>
     <string name="option_take_photo_video">Foto of video maken</string>
-    <!-- Authentication -->
     <string name="auth_login">Aanmelden</string>
     <string name="auth_register">Account aanmaken</string>
     <string name="auth_submit">Indienen</string>
@@ -273,7 +256,6 @@
     <string name="auth_reset_password_success_message">Uw wachtwoord is opnieuw ingesteld. 
 \n 
 \nU bent op alle sessies afgemeld en zult niet langer pushmeldingen ontvangen. Om meldingen opnieuw in te schakelen, meldt u zich op elk apparaat opnieuw aan.</string>
-    <!-- Login Screen -->
     <string name="login_error_must_start_http">URL moet met http[s]:// beginnen</string>
     <string name="login_error_network_error">Aanmelden mislukt: netwerkfout</string>
     <string name="login_error_unable_login">Aanmelden mislukt</string>
@@ -288,28 +270,20 @@
     <string name="login_error_limit_exceeded">Er zijn te veel verzoeken verstuurd</string>
     <string name="login_error_user_in_use">Deze gebruikersnaam is al in gebruik</string>
     <string name="login_error_login_email_not_yet">Er is nog niet op de koppeling in de e-mail geklikt</string>
-    <!-- crypto warnings -->
-    <!-- read receipts list Screen -->
     <string name="read_receipts_list">Leesbevestigingslijst</string>
-    <!-- accounts list Screen -->
-    <!-- image size selection -->
     <string name="compression_options">Versturen als </string>
     <string name="compression_opt_list_original">Origineel</string>
     <string name="compression_opt_list_large">Groot</string>
     <string name="compression_opt_list_medium">Medium</string>
     <string name="compression_opt_list_small">Klein</string>
-    <!-- media upload / download messages -->
     <string name="attachment_cancel_download">"Download annuleren?</string>
     <string name="attachment_cancel_upload">Upload annuleren?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
-    <!-- room creation dialog Screen -->
     <string name="yesterday">Gisteren</string>
     <string name="today">Vandaag</string>
-    <!-- room info dialog Screen -->
     <string name="room_info_room_name">Gespreksnaam</string>
     <string name="room_info_room_topic">Gespreksonderwerp</string>
-    <!-- call string -->
     <string name="call_connected">Oproep verbonden</string>
     <string name="call_connecting">Oproep is aan het verbinden…</string>
     <string name="call_ended">Oproep beëindigd</string>
@@ -322,10 +296,8 @@
     <string name="call_error_ice_failed">Mediaverbinding is mislukt</string>
     <string name="call_error_camera_init_failed">Kan de camera niet initialiseren</string>
     <string name="call_error_answered_elsewhere">oproep elders opgenomen</string>
-    <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Een afbeelding of video maken"</string>
     <string name="media_picker_cannot_record_video">Kan geen video opnemen"</string>
-    <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informatie</string>
     <string name="template_permissions_rationale_msg_storage">${app_name} heeft toegang nodig tot uw mediabestanden om bijlagen te verzenden en op te slaan.
 \n
@@ -346,31 +318,25 @@
 \n 
 \nWilt u uw adresboek hiervoor delen\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Sorry. De actie is niet toegepast vanwege ontbrekende rechten</string>
-    <!-- medias slider string -->
     <string name="media_slider_saved">Opgeslagen</string>
     <string name="media_slider_saved_message">In downloads opslaan?</string>
     <string name="yes">JA</string>
     <string name="no">NEE</string>
     <string name="_continue">Verdergaan</string>
-    <!-- Actions -->
-    <string name="remove">Verwijderen</string>
-    <string name="join">Toetreden</string>
-    <string name="preview">Voorvertoning</string>
-    <string name="reject">Afwijzen</string>
-    <!-- Room -->
+    <string name="action_remove">Verwijderen</string>
+    <string name="action_join">Toetreden</string>
+    <string name="action_preview">Voorvertoning</string>
+    <string name="action_reject">Afwijzen</string>
     <string name="room_jump_to_first_unread">Ga naar ongelezen</string>
-    <!-- Room Preview -->
     <string name="room_preview_invitation_format">%s heeft u uitgenodigd in dit gesprek</string>
     <string name="room_preview_unlinked_email_warning">Deze uitnodiging is naar %s verstuurd, maar die is niet geassocieerd met deze account.
 \nMisschien wilt u zich met een andere account aanmelden, of dit e-mailadres aan deze account toevoegen.</string>
     <string name="room_preview_try_join_an_unknown_room">U probeert toegang te verkrijgen tot %s. Zou u het gesprek willen toetreden om eraan deel te nemen\?</string>
     <string name="room_preview_try_join_an_unknown_room_default">een gesprek</string>
     <string name="room_preview_room_interactions_disabled">Dit is een voorvertoning van dit gesprek. Gespreksinteracties zijn uitgeschakeld.</string>
-    <!-- Chat creation -->
     <string name="room_creation_title">Nieuw gesprek</string>
     <string name="room_creation_add_member">Deelnemer toevoegen</string>
     <string name="room_title_one_member">1 deelnemer</string>
-    <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Gesprek verlaten</string>
     <string name="room_participants_leave_prompt_msg">Weet u zeker dat u het gesprek wilt verlaten\?</string>
     <string name="room_participants_remove_prompt_msg">Weet u zeker dat u %s uit dit gesprek wilt verwijderen\?</string>
@@ -398,14 +364,12 @@
     <string name="room_participants_power_level_prompt">U kunt deze veranderingen niet ongedaan maken aangezien u de gebruiker tot hetzelfde niveau als uzelf promoveert.
 \nWeet u het zeker\?</string>
     <string name="room_participants_invite_prompt_msg">Weet u zeker dat u %s in dit gesprek wilt uitnodigen\?</string>
-    <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Uitnodigen met ID</u></string>
     <string name="people_search_local_contacts">LOKALE CONTACTEN (%d)</string>
     <string name="people_search_filter_text">Enkel Matrix-gebruikers</string>
     <string name="people_search_invite_by_id_dialog_title">Gebruiker uitnodigen met ID</string>
     <string name="people_search_invite_by_id_dialog_description">Voer één of meer e-mailadressen of Matrix-ID’s in</string>
     <string name="people_search_invite_by_id_dialog_hint">E-mailadres of Matrix-ID</string>
-    <!--  Chat -->
     <string name="room_menu_search">Zoeken</string>
     <string name="room_one_user_is_typing">%s is aan het typen…</string>
     <string name="room_two_users_are_typing">%1$s en %2$s zijn aan het typen…</string>
@@ -421,7 +385,6 @@
     <string name="room_delete_unsent_messages">Onverstuurde berichten verwijderen</string>
     <string name="room_message_file_not_found">Bestand niet gevonden</string>
     <string name="room_do_not_have_permission_to_post">U heeft geen toestemming om dit naar dit gesprek te sturen.</string>
-    <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Vertrouwen</string>
     <string name="ssl_do_not_trust">Niet vertrouwen</string>
     <string name="ssl_logout_account">Afmelden</string>
@@ -433,7 +396,6 @@
     <string name="ssl_unexpected_existing_expl">Het certificaat is veranderd van één dat door uw telefoon werd vertrouwd naar een ander. Dit is HEEL ONGEBRUIKELIJK. Het wordt aangeraden om dit nieuwe certificaat NIET TE AANVAARDEN.</string>
     <string name="ssl_expected_existing_expl">Het certificaat is veranderd van een vertrouwd naar een onvertrouwd certificaat. De server heeft misschien zijn certificaat vernieuwd. Contacteer de serverbeheerder voor de verwachte vingerafdruk.</string>
     <string name="ssl_only_accept">Aanvaard het certificaat alleen als de serverbeheerder een vingerafdruk heeft gepubliceerd die overeenkomt met degene hierboven.</string>
-    <!-- Room Details -->
     <string name="room_details_title">Info over gesprek</string>
     <string name="room_details_people">Personen</string>
     <string name="room_details_files">Bestanden</string>
@@ -441,14 +403,12 @@
     <string name="malformed_id">Ongeldige ID. Het zou een e-mailadres of een Matrix-ID zoals ‘@gebruikersnaam:domein’ moeten zijn</string>
     <string name="room_details_people_invited_group_name">UITGENODIGD</string>
     <string name="room_details_people_present_group_name">TOEGETREDEN</string>
-    <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Reden voor het melden van deze inhoud</string>
     <string name="room_event_action_report_prompt_ignore_user">Wilt u alle berichten van deze gebruiker verbergen\?
 \n
 \nLet op: deze actie zal de app opnieuw opstarten; dit kan even duren.</string>
     <string name="room_event_action_cancel_upload">Upload annuleren</string>
     <string name="room_event_action_cancel_download">Download annuleren</string>
-    <!-- Search -->
     <string name="search_hint">Zoeken</string>
     <string name="search_members_hint">Gespreksleden filteren</string>
     <string name="search_no_results">Geen resultaten</string>
@@ -456,28 +416,13 @@
     <string name="tab_title_search_messages">BERICHTEN</string>
     <string name="tab_title_search_people">PERSONEN</string>
     <string name="tab_title_search_files">BESTANDEN</string>
-    <!-- Room recents -->
-    <string name="room_recents_join">TOETREDEN</string>
-    <string name="room_recents_directory">CATALOGUS</string>
-    <string name="room_recents_favourites">FAVORIETEN</string>
-    <string name="room_recents_conversations">GESPREKKEN</string>
-    <string name="room_recents_low_priority">LAGE PRIORITEIT</string>
-    <string name="room_recents_invites">UITNODIGINGEN</string>
-    <string name="room_recents_start_chat">Gesprek beginnen</string>
-    <string name="room_recents_create_room">Gesprek aanmaken</string>
-    <string name="room_recents_join_room">Gesprek toetreden</string>
-    <string name="room_recents_join_room_title">Treed een gesprek toe</string>
-    <string name="room_recents_join_room_prompt">Voer een gespreks(bij)naam in</string>
-    <!-- Directory -->
     <string name="directory_search_results_title">Catalogus doorbladeren</string>
     <string name="directory_searching_title">Catalogus wordt doorzocht…</string>
-    <!-- home room settings -->
     <string name="room_settings_favourite">Favoriet</string>
     <string name="room_settings_de_prioritize">Lage prioriteit</string>
     <string name="room_settings_direct_chat">Tweegesprek</string>
     <string name="room_settings_leave_conversation">Gesprek verlaten</string>
     <string name="room_settings_forget">Vergeten</string>
-    <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Berichten</string>
     <string name="room_sliding_menu_settings">Instellingen</string>
     <string name="room_sliding_menu_version">Versie</string>
@@ -485,7 +430,6 @@
     <string name="room_sliding_menu_third_party_notices">Derdepartijvermeldingen</string>
     <string name="room_sliding_menu_copyright">Copyright</string>
     <string name="room_sliding_menu_privacy_policy">Privacybeleid</string>
-    <!-- Vector Settings -->
     <string name="settings_profile_picture">Profielfoto</string>
     <string name="settings_display_name">Naam</string>
     <string name="settings_email_address">E-mailadres</string>
@@ -513,7 +457,6 @@
     <string name="settings_copyright">Copyright</string>
     <string name="settings_privacy_policy">Privacybeleid</string>
     <string name="settings_clear_cache">Cache wissen</string>
-    <!--string name="settings_room_privacy_label">Privacy</string-->
     <string name="settings_user_settings">Gebruikersinstellingen</string>
     <string name="settings_notifications">Meldingen</string>
     <string name="settings_ignored_users">Genegeerde gebruikers</string>
@@ -569,37 +512,29 @@
     <string name="settings_phone_number_verification_error_empty_code">Voer een activeringscode in</string>
     <string name="settings_phone_number_verification_error">Er is een fout opgetreden bij het valideren van uw telefoonnummer</string>
     <string name="settings_phone_number_code">Code</string>
-    <!-- Room Settings -->
-    <!-- room global settings-->
     <string name="room_settings_room_photo">Gespreksafbeelding</string>
     <string name="room_settings_room_name">Gespreksnaam</string>
     <string name="room_settings_topic">Onderwerp</string>
     <string name="room_settings_room_tag">Gesprekslabel</string>
     <string name="room_settings_tag_pref_dialog_title">Gelabeld als:</string>
-    <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Favoriet</string>
     <string name="room_settings_tag_pref_entry_low_priority">Lage prioriteit</string>
     <string name="room_settings_tag_pref_entry_none">Geen</string>
-    <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Toegankelijk- en zichtbaarheid</string>
     <string name="room_settings_directory_visibility">Dit gesprek vermelden in de gesprekscatalogus</string>
     <string name="room_settings_room_access_rules_pref_title">Toegang tot gesprek</string>
     <string name="room_settings_room_read_history_rules_pref_title">Toegang tot de gespreksgeschiedenis</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Wie kan er de geschiedenis lezen\?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Wie heeft er toegang tot dit gesprek\?</string>
-    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Iedereen</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Alleen deelnemers (vanaf het moment dat deze optie wordt geselecteerd)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Alleen deelnemers (vanaf het moment dat ze worden uitgenodigd)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Alleen deelnemers (vanaf het moment dat ze toetreden)</string>
-    <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Om naar een gesprek te verwijzen moet dit een adres hebben.</string>
     <string name="room_settings_room_access_entry_only_invited">Alleen personen die uitgenodigd zijn</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Iedereen die de koppeling van het gesprek kent, met uitzondering van gasten</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Iedereen die de koppeling van het gesprek kent, inclusief gasten</string>
-    <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Verbannen gebruikers</string>
-    <!-- advanced -->
     <string name="room_settings_category_advanced_title">Geavanceerd</string>
     <string name="room_settings_room_internal_id">Interne ID van dit gesprek</string>
     <string name="room_settings_addresses_pref_title">Adressen</string>
@@ -610,7 +545,6 @@
     <string name="room_settings_labs_end_to_end_is_active">Eind-tot-eind-versleuteling is actief</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Alleen naar geverifieerde sessies versleutelen</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Ongeverifieerde sessies in dit gesprek nooit berichten sturen vanaf deze sessie.</string>
-    <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Dit gesprek heeft geen lokale adressen</string>
     <string name="room_settings_addresses_add_new_address">Nieuw adres (bv. #foo:matrix.org)</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Ongeldig bijnaamformaat</string>
@@ -625,11 +559,8 @@
     <string name="room_settings_addresses_e2e_disabled">Versleuteling is uitgeschakeld in dit gesprek.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Versleuteling inschakelen
 \n(let op: dit kan niet meer uitgeschakeld worden!)</string>
-    <!-- Directory -->
     <string name="directory_title">Catalogus</string>
-    <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s heeft geprobeerd een specifiek punt in de geschiedenis van dit gesprek te laden, maar kon het niet vinden.</string>
-    <!-- encryption dialog -->
     <string name="encryption_information_title">Informatie over eind-tot-eind-versleuteling</string>
     <string name="encryption_information_device_info">Gebeurtenisinformatie</string>
     <string name="encryption_information_user_id">Gebruikers-ID</string>
@@ -673,21 +604,18 @@
     <string name="encryption_information_verify_device_warning">Om te verifiëren dat deze sessie vertrouwd kan worden, contacteert u de eigenaar via een andere methode (bv. persoonlijk of via een telefoontje) en vraagt u hem/haar of de sleutel die hij/zij ziet in zijn/haar Gebruikersinstellingen van deze sessie overeenkomt met de sleutel hieronder:</string>
     <string name="encryption_information_verify_device_warning2">Als het overeenkomt, drukt u op de knop ‘Verifiëren’ hieronder. Als het niet overeenkomt, dan onderschept iemand anders deze sessie en zou u het beter blokkeren. In de toekomst zal dit verificatieproces verbeterd worden.</string>
     <string name="encryption_information_verify_key_match">Ik verifieer dat de sleutels overeenkomen</string>
-    <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Dit gesprek bevat onbekende sessies</string>
     <string name="unknown_devices_alert_message">Dit gesprek bevat onbekende sessies die niet geverifieerd zijn. 
 \nDit betekent dat er geen garantie is dat de sessies bij de gebruikers horen waartoe ze beweren te horen. 
 \nWe raden u aan om bij elke sessie door het verificatieprocces heen te gaan voordat u verdergaat, maar u kunt het bericht ook zonder te verifiëren opnieuw versturen. 
 \n 
 \nOnbekende sessies:</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">Kies een gesprekscatalogus</string>
     <string name="directory_server_fail_to_retrieve_server">Het kan zijn dat de server niet beschikbaar of overbelast is</string>
     <string name="directory_server_type_homeserver">Voer een thuisserver in om de publieke gesprekken ervan weer te geven</string>
     <string name="directory_server_placeholder">Thuisserver-naam</string>
     <string name="directory_server_all_rooms_on_server">Alle gesprekken op server %s</string>
     <string name="directory_server_native_rooms">Alle lokale gesprekken op %s</string>
-    <!-- historical -->
     <string name="historical_placeholder">Zoeken in de historiek</string>
     <string name="offline">Offline</string>
     <string name="user_directory_header">Gebruikerscatalogus</string>
@@ -724,7 +652,6 @@
     <string name="widget_creation_failure">Aanmaken van widget is mislukt</string>
     <string name="settings_labs_create_conference_with_jitsi">Vergadergesprekken maken met jitsi</string>
     <string name="widget_delete_message_confirmation">Weet u zeker dat u deze widget uit dit gesprek wilt verwijderen\?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Kan widget niet aanmaken.</string>
     <string name="widget_integration_failed_to_send_request">Versturen van verzoek mislukt.</string>
     <string name="widget_integration_positive_power_level">Het machtsniveau moet een positief geheel getal zijn.</string>
@@ -744,19 +671,15 @@
     <string name="settings_containing_my_user_name">Berichten die mijn gebruikersnaam bevatten</string>
     <string name="settings_analytics">Statistische gegevens</string>
     <string name="settings_labs_native_camera">Systeemcamera gebruiken</string>
-    <!-- share keys -->
     <string name="you_added_a_new_device">U heeft een nieuwe sessie ‘%s’ toegevoegd, die versleutelingssleutels aanvraagt.</string>
     <string name="your_unverified_device_requesting">Uw ongeverifieerde sessie ‘%s’ vraagt versleutelingssleutels aan.</string>
     <string name="start_verification">Verificatie starten</string>
     <string name="share_without_verifying">Delen zonder te verifiëren</string>
     <string name="ignore_request">Verzoek negeren</string>
-    <!-- conference call -->
     <string name="conference_call_warning_title">Let op!</string>
     <string name="conference_call_warning_message">Vergadergesprekken zijn in ontwikkeling en kunnen dus nog kuren vertonen.</string>
-    <!-- slash commands -->
     <string name="command_error">Opdrachtfout</string>
     <string name="unrecognized_command">Onbekende opdracht: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Uit</string>
     <string name="notification_noisy">Lawaaierig</string>
     <string name="encrypted_message">Versleuteld bericht</string>
@@ -828,14 +751,12 @@
         <item quantity="one">%d actieve widget</item>
         <item quantity="other">%d actieve widgets</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="create">Aanmaken</string>
     <string name="create_community">Gemeenschap aanmaken</string>
     <string name="community_name">Gemeenschapsnaam</string>
     <string name="community_name_hint">Voorbeeld</string>
     <string name="community_id">Gemeenschaps-ID</string>
     <string name="community_id_hint">voorbeeld</string>
-    <!-- group details -->
     <string name="group_details_home">Thuis</string>
     <string name="group_details_people">Personen</string>
     <string name="group_details_rooms">Gesprekken</string>
@@ -896,14 +817,14 @@
     <string name="deactivate_account_prompt_password">Voer uw wachtwoord in om verder te gaan:</string>
     <string name="deactivate_account_submit">Account deactiveren</string>
     <string name="dialog_title_third_party_licences">Licenties van derde partijen</string>
-    <string name="download">Downloaden</string>
-    <string name="speak">Inspreken</string>
+    <string name="action_download">Downloaden</string>
+    <string name="action_speak">Inspreken</string>
     <string name="e2e_re_request_encryption_key">Beveiligingssleutels van uw sessies <u>opnieuw aanvragen</u>.</string>
     <string name="e2e_re_request_encryption_key_sent">Sleutelaanvraag verstuurd.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Aanvraag verstuurd</string>
     <string name="template_e2e_re_request_encryption_key_dialog_content">Start ${app_name} op een ander apparaat dat het bericht kan ontsleutelen, zodat het de sleutels naar deze sessie kan sturen.</string>
     <string name="lock_screen_hint">Typ hier…</string>
-    <string name="clear">Wissen</string>
+    <string name="action_clear">Wissen</string>
     <string name="option_send_voice">Spraakbericht versturen</string>
     <string name="go_on_with">doorgaan met…</string>
     <string name="error_no_external_application_found">Sorry, er is geen externe toepassing gevonden om deze actie te voltooien.</string>
@@ -978,7 +899,7 @@
     <string name="resource_limit_hard_contact">Gelieve %s om deze dienst te blijven gebruiken.</string>
     <string name="dialog_title_error">Foutmelding</string>
     <string name="call_anyway">Toch bellen</string>
-    <string name="accept">Aanvaarden</string>
+    <string name="action_accept">Aanvaarden</string>
     <string name="auth_accept_policies">Gelieve het beleid van deze thuisserver te lezen en aanvaarden:</string>
     <string name="settings_call_category">Oproepen</string>
     <string name="template_settings_call_ringtone_use_app_ringtone">Gebruik de standaardbeltoon van ${app_name} voor inkomende oproepen</string>
@@ -1011,11 +932,11 @@
     <string name="are_you_sure">Weet u het zeker\?</string>
     <string name="backup">Back-up maken</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">U zult de toegang tot uw versleutelde berichten verliezen, tenzij u eerst een back-up van uw sleutels maakt vooraleer u zich afmeldt.</string>
-    <string name="stay">Blijven</string>
-    <string name="skip">Overslaan</string>
+    <string name="action_stay">Blijven</string>
+    <string name="action_skip">Overslaan</string>
     <string name="done">Klaar</string>
-    <string name="abort">Afbreken</string>
-    <string name="ignore">Negeren</string>
+    <string name="action_abort">Afbreken</string>
+    <string name="action_ignore">Negeren</string>
     <string name="action_sign_out_confirmation_simple">Weet u zeker dat u zich wilt afmelden\?</string>
     <string name="action_mark_room_read">Markeren als gelezen</string>
     <string name="auth_login_sso">Aanmelden met unieke aanmelding</string>
@@ -1326,10 +1247,10 @@
     <string name="sas_error_m_user_error">Gebruikers komen niet overeen</string>
     <string name="sas_error_unknown">Onbekende fout</string>
     <string name="none">Geen</string>
-    <string name="revoke">Intrekken</string>
-    <string name="disconnect">Verbinding verbreken</string>
-    <string name="review">Nakijken</string>
-    <string name="decline">Weigeren</string>
+    <string name="action_revoke">Intrekken</string>
+    <string name="action_disconnect">Verbinding verbreken</string>
+    <string name="action_review">Nakijken</string>
+    <string name="action_decline">Weigeren</string>
     <string name="people_no_identity_server">Geen identiteitsserver geconfigureerd.</string>
     <string name="call_failed_no_ice_title">Oproep mislukt door verkeerd geconfigureerde server</string>
     <string name="call_failed_no_ice_description">Vraag de beheerder van uw thuisserver (%1$s) om een TURN-server te configureren om oproepen betrouwbaar te doen werken.
@@ -1419,8 +1340,8 @@
     <string name="room_list_rooms_empty_title">Kamers</string>
     <string name="room_list_rooms_empty_body">Je kamers zullen hier worden weergegeven. Gebruik de + knop rechtsonder om een bestaande kamer te openen of een nieuwe aan te maken.</string>
     <string name="title_activity_emoji_reaction_picker">Reacties</string>
-    <string name="reactions_agree">Bevestigen</string>
-    <string name="reactions_like">Leuk vinden</string>
+    <string name="action_agree">Bevestigen</string>
+    <string name="action_like">Leuk vinden</string>
     <string name="message_add_reaction">Reactie Toevoegen</string>
     <string name="message_view_reaction">Reacties Bekijken</string>
     <string name="reactions">Reacties</string>
@@ -1443,8 +1364,8 @@
     <string name="create_room_name_hint">Gespreksnaam</string>
     <string name="create_room_public_title">Publiek</string>
     <string name="create_room_public_description">Iedereen zal dit gesprek kunnen toetreden</string>
-    <string name="pause_video">Pauzeren</string>
-    <string name="play_video">Afspelen</string>
+    <string name="action_pause">Pauzeren</string>
+    <string name="action_play">Afspelen</string>
     <string name="notice_room_canonical_alias_unset_by_you">U heeft het hoofdadres voor dit gesprek verwijderd.</string>
     <string name="notice_room_invite_with_reason_by_you">Je hebt %1$s uitgenodigd. Reden: %2$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Jouw uitnodiging. Reden: %1$s</string>
@@ -1588,7 +1509,6 @@
     <string name="voice_message_n_seconds_warning_toast">%1$ds over</string>
     <string name="direct_room_created_summary_item">%s is toegetreden.</string>
     <string name="sent_verification_conclusion">Conclusie Bevestiging</string>
-    <string name="sent_a_bot_buttons">Botknoppen</string>
     <string name="create_room_settings_section">Gespreksinstellingen</string>
     <string name="create_room_name_section">Gespreksnaam</string>
     <string name="room_manage_integrations">Integraties Beheren</string>
@@ -1640,11 +1560,6 @@
     <string name="verification_cancelled">Bevestiging Geannuleerd</string>
     <string name="settings_key_requests">Sleutelverzoeken</string>
     <string name="delete_event_dialog_title">Verwijderen Bevestigen</string>
-    <string name="poll_item_selected_aria">Gekozen Optie</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d stem</item>
-        <item quantity="other">%d stemmen</item>
-    </plurals>
     <string name="settings_account_data">Accountgegevens</string>
     <string name="settings_dev_tools">Dev Tools</string>
     <string name="a11y_qr_code_for_verification">QR-code</string>
@@ -1896,8 +1811,8 @@
     <string name="spaces">Spaces</string>
     <string name="learn_more">Meer Weten</string>
     <string name="start_chatting">Begin met chatten</string>
-    <string name="reset">Herstellen</string>
-    <string name="dismiss">Afwijzen</string>
+    <string name="action_reset">Herstellen</string>
+    <string name="action_dismiss">Afwijzen</string>
     <string name="system_theme">Systeemstandaard</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Je hebt eind-tot-eindversleuteling ingeschakeld (onbekend algoritme %1$s).</string>
     <string name="notice_end_to_end_ok_by_you">Je hebt eind-tot-eindversleuteling ingeschakeld.</string>
diff --git a/vector/src/main/res/values-nn/strings.xml b/vector/src/main/res/values-nn/strings.xml
index 3488546447..44981bda8a 100644
--- a/vector/src/main/res/values-nn/strings.xml
+++ b/vector/src/main/res/values-nn/strings.xml
@@ -40,7 +40,7 @@
     <string name="notice_room_third_party_invite">%1$s inviterte %2$s til rommet</string>
     <string name="notice_room_third_party_registered_invite">%1$s sa ja til innbjodingi til %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Fekk ikkje til å dekryptera: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Avsendareiningi hev ikkje sendt oss nyklane fyr denna meldingi.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Avsendareiningi hev ikkje sendt oss nyklane fyr denna meldingi.</string>
     <string name="could_not_redact">Kunde ikkje gjera um</string>
     <string name="unable_to_send_message">Fekk ikkje til å senda meldingi</string>
     <string name="message_failed_to_upload">Fekk ikkje til å lasta biletet upp</string>
@@ -82,24 +82,24 @@
     <string name="dialog_title_third_party_licences">Tredjepartilisensar</string>
     <string name="loading">Lastar…</string>
     <string name="ok">Greitt</string>
-    <string name="cancel">Avbryt</string>
-    <string name="save">Lagra</string>
-    <string name="leave">Forlat</string>
-    <string name="send">Send</string>
-    <string name="resend">Send på nytt</string>
-    <string name="redact">Fjern</string>
-    <string name="quote">Siter</string>
-    <string name="download">Last ned</string>
-    <string name="share">Del</string>
-    <string name="speak">Snakk</string>
-    <string name="clear">Tøm</string>
+    <string name="action_cancel">Avbryt</string>
+    <string name="action_save">Lagra</string>
+    <string name="action_leave">Forlat</string>
+    <string name="action_send">Send</string>
+    <string name="action_resend">Send på nytt</string>
+    <string name="action_redact">Fjern</string>
+    <string name="action_quote">Siter</string>
+    <string name="action_download">Last ned</string>
+    <string name="action_share">Del</string>
+    <string name="action_speak">Snakk</string>
+    <string name="action_clear">Tøm</string>
     <string name="later">Seinare</string>
-    <string name="forward">Send vidare</string>
+    <string name="action_forward">Send vidare</string>
     <string name="permalink">Permanent lenkje</string>
     <string name="view_source">Vis kjelde</string>
     <string name="view_decrypted_source">Vis den dekrypterte kjelda</string>
-    <string name="delete">Slett</string>
-    <string name="rename">Gje nytt namn</string>
+    <string name="action_delete">Slett</string>
+    <string name="action_rename">Gje nytt namn</string>
     <string name="report_content">Rapporter innhaldet</string>
     <string name="active_call">Pågåande samtale</string>
     <string name="ongoing_conference_call">Pågåande konferansesamtale. 
@@ -114,7 +114,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Konferansesamtalar er ikkje støtta i krypterte rom</string>
     <string name="send_anyway">Send likevel</string>
     <string name="or">eller</string>
-    <string name="invite">Inviter</string>
+    <string name="action_invite">Inviter</string>
     <string name="offline">Fråkopla</string>
     <string name="action_exit">Gå ut</string>
     <string name="actions">Handlingar</string>
@@ -128,7 +128,7 @@
     <string name="action_open">Opna</string>
     <string name="action_close">Lat att</string>
     <string name="copied_to_clipboard">Kopier til utklippstavla</string>
-    <string name="disable">Skru av</string>
+    <string name="action_disable">Skru av</string>
     <string name="dialog_title_confirmation">Stadfesting</string>
     <string name="dialog_title_warning">Åtvaring</string>
     <string name="bottom_action_home">Heim</string>
@@ -322,10 +322,10 @@
     <string name="yes">JA</string>
     <string name="no">NEI</string>
     <string name="_continue">Gå fram</string>
-    <string name="remove">Ta vekk</string>
-    <string name="join">Bli med</string>
-    <string name="preview">Førehandsvisning</string>
-    <string name="reject">Avvis</string>
+    <string name="action_remove">Ta vekk</string>
+    <string name="action_join">Bli med</string>
+    <string name="action_preview">Førehandsvisning</string>
+    <string name="action_reject">Avvis</string>
     <string name="list_members">Medlemsoversikt</string>
     <string name="open_chat_header">Opne overskrift</string>
     <string name="room_sync_in_progress">Synkroniserer…</string>
@@ -436,17 +436,6 @@
     <string name="tab_title_search_messages">MELDINGAR</string>
     <string name="tab_title_search_people">FOLK</string>
     <string name="tab_title_search_files">FILER</string>
-    <string name="room_recents_join">VERT MED</string>
-    <string name="room_recents_directory">UTVAL</string>
-    <string name="room_recents_favourites">YNDLINGAR</string>
-    <string name="room_recents_conversations">ROM</string>
-    <string name="room_recents_low_priority">LÅGRETT</string>
-    <string name="room_recents_invites">INNBJODINGAR</string>
-    <string name="room_recents_start_chat">Start samtale</string>
-    <string name="room_recents_create_room">Laga eit rom</string>
-    <string name="room_recents_join_room">Vert med i romet</string>
-    <string name="room_recents_join_room_title">Vert med i eit rom</string>
-    <string name="room_recents_join_room_prompt">Skriv inn ein rom-ID eller eit romalias</string>
     <string name="directory_search_results_title">Bla gjennom katalog</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d rom</item>
@@ -854,12 +843,12 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="resource_limit_soft_contact">Ver venleg og %s for å heva grensa.</string>
     <string name="resource_limit_hard_contact">Ver venleg og %s for å halda fram med å bruka tenesten.</string>
     <string name="call_anyway">Ring likevel</string>
-    <string name="accept">Aksepter</string>
+    <string name="action_accept">Aksepter</string>
     <string name="dialog_title_error">Feil</string>
-    <string name="skip">Hopp over</string>
+    <string name="action_skip">Hopp over</string>
     <string name="done">Ferdig</string>
-    <string name="abort">Avbryt</string>
-    <string name="ignore">Ignorer</string>
+    <string name="action_abort">Avbryt</string>
+    <string name="action_ignore">Ignorer</string>
     <string name="action_sign_out_confirmation_simple">Sikker på at du vil logga ut\?</string>
     <string name="action_mark_room_read">Merk som lest</string>
     <string name="auth_accept_policies">Venligast sjå over og godta retningslinjene til heimtenaren:</string>
@@ -909,12 +898,12 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="are_you_sure">Er du sikker \?</string>
     <string name="backup">Sikkerheitskopier</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Du vil miste tilgang til dine krypterte meldingar, med mindre nøklane dine er sikkerheitskopierte før utlogging.</string>
-    <string name="stay">Bli</string>
+    <string name="action_stay">Bli</string>
     <string name="none">Ingen</string>
-    <string name="revoke">Trekk tilbake</string>
-    <string name="disconnect">Koble frå</string>
-    <string name="review">Sjå gjennom</string>
-    <string name="decline">Avvis</string>
+    <string name="action_revoke">Trekk tilbake</string>
+    <string name="action_disconnect">Koble frå</string>
+    <string name="action_review">Sjå gjennom</string>
+    <string name="action_decline">Avvis</string>
     <string name="people_no_identity_server">Ingen identitetstenar er satt opp.</string>
     <string name="call_failed_no_ice_title">Samtale feila fordi tenaren er satt opp feil</string>
     <string name="call_failed_no_ice_description">Be administratoren for din heimetenar (%1$s) om, å setta opp ein \"TURN-server\" for å handtera samtalar på rett måte. 
@@ -993,7 +982,7 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="settings_advanced_settings">Avanserte innstillingar</string>
     <string name="login_server_other_text">Avanserte og tilpassa innstillingar</string>
     <string name="settings_general_title">Generelt</string>
-    <string name="play_video">Spel av</string>
+    <string name="action_play">Spel av</string>
     <string name="auth_msisdn_already_defined">Dette telefonnummeret er allereie definert.</string>
     <string name="call_format_turn_hd_off">Skru HD av</string>
     <string name="call_camera_front">Front</string>
@@ -1017,8 +1006,8 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="no_permissions_to_start_conf_call_in_direct_room">Du har ikkje lov til å starta ein konferansesamtale</string>
     <string name="no_permissions_to_start_conf_call">Du har ikkje lov til å starta ein konferansesamtale i dette rommet</string>
     <string name="start_chatting">Start samtale</string>
-    <string name="reset">Nullstill</string>
-    <string name="pause_video">Pause</string>
+    <string name="action_reset">Nullstill</string>
+    <string name="action_pause">Pause</string>
     <string name="bottom_action_people_x">Folk</string>
     <string name="fab_menu_create_chat">Folk</string>
     <string name="summary_you_sent_image">Du sende eit bilde.</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 8bf7ee98f1..025a1e037c 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -56,7 +56,7 @@
     <string name="notice_profile_change_redacted">%1$s zaktualizował swój profil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s wysłał(a) zaproszenie do %2$s aby dołączył(a) do tego pokoju</string>
     <string name="notice_room_third_party_registered_invite">%1$s zaakceptował(a) zaproszenie dla %2$s</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Urządzenie nadawcy nie wysłało nam kluczy do tej wiadomości.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Urządzenie nadawcy nie wysłało nam kluczy do tej wiadomości.</string>
     <string name="could_not_redact">Nie można zredagować</string>
     <string name="room_error_join_failed_empty_room">Obecnie nie jest możliwe ponowne dołączenie do pustego pokoju.</string>
     <string name="notice_event_redacted">Wiadomość usunięta</string>
@@ -89,21 +89,21 @@
     <string name="title_activity_member_details">Informacje o użytkowniku</string>
     <string name="title_activity_historical">Archiwum</string>
     <string name="ok">OK</string>
-    <string name="cancel">Anuluj</string>
-    <string name="save">Zapisz</string>
-    <string name="leave">Opuść</string>
-    <string name="send">Wyślij</string>
-    <string name="resend">Wyślij ponownie</string>
-    <string name="redact">Usuń</string>
-    <string name="quote">Cytuj</string>
-    <string name="share">Udostępnij</string>
+    <string name="action_cancel">Anuluj</string>
+    <string name="action_save">Zapisz</string>
+    <string name="action_leave">Opuść</string>
+    <string name="action_send">Wyślij</string>
+    <string name="action_resend">Wyślij ponownie</string>
+    <string name="action_redact">Usuń</string>
+    <string name="action_quote">Cytuj</string>
+    <string name="action_share">Udostępnij</string>
     <string name="later">Później</string>
-    <string name="forward">Przekaż</string>
+    <string name="action_forward">Przekaż</string>
     <string name="permalink">Odnośnik bezpośredni</string>
     <string name="view_source">Wyświetl źródło</string>
     <string name="view_decrypted_source">Wyświetl odszyfrowane źródło</string>
-    <string name="delete">Usuń</string>
-    <string name="rename">Zmień nazwę</string>
+    <string name="action_delete">Usuń</string>
+    <string name="action_rename">Zmień nazwę</string>
     <string name="report_content">Zgłoś treść</string>
     <string name="active_call">Aktywne połączenie</string>
     <string name="ongoing_conference_call">Przychodzące połączenie grupowe.
@@ -118,7 +118,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Połączenia grupowe nie są obsługiwane w szyfrowanych pokojach</string>
     <string name="send_anyway">Wyślij mimo to</string>
     <string name="or">i</string>
-    <string name="invite">Zaproś</string>
+    <string name="action_invite">Zaproś</string>
     <string name="offline">Offline</string>
     <string name="action_sign_out">Wyloguj się</string>
     <string name="action_voice_call">Połączenie głosowe</string>
@@ -130,7 +130,7 @@
     <string name="action_open">Otwórz</string>
     <string name="action_close">Zamknij</string>
     <string name="copied_to_clipboard">Skopiowano do schowka</string>
-    <string name="disable">Wyłącz</string>
+    <string name="action_disable">Wyłącz</string>
     <string name="dialog_title_confirmation">Potwierdzenie</string>
     <string name="dialog_title_warning">Ostrzeżenie</string>
     <string name="bottom_action_home">Home</string>
@@ -275,10 +275,10 @@
     <string name="yes">TAK</string>
     <string name="no">NIE</string>
     <string name="_continue">Kontynuuj</string>
-    <string name="remove">Usuń</string>
-    <string name="join">Dołącz</string>
-    <string name="preview">Podgląd</string>
-    <string name="reject">Odrzuć</string>
+    <string name="action_remove">Usuń</string>
+    <string name="action_join">Dołącz</string>
+    <string name="action_preview">Podgląd</string>
+    <string name="action_reject">Odrzuć</string>
     <string name="room_jump_to_first_unread">Przejdź do pierwszej nieprzeczytanej wiadomości</string>
     <string name="room_preview_invitation_format">Zostałeś(-aś) zaproszony(-a) do tego pokoju przez %s</string>
     <string name="room_preview_try_join_an_unknown_room">Próbujesz uzyskać dostęp do %s. Czy chcesz dołączyć do pokoju, aby wziąć udział w dyskusji?</string>
@@ -357,17 +357,6 @@
     <string name="tab_title_search_messages">WIADOMOŚCI</string>
     <string name="tab_title_search_people">LUDZIE</string>
     <string name="tab_title_search_files">PLIKI</string>
-    <string name="room_recents_join">DOŁĄCZ</string>
-    <string name="room_recents_directory">KATALOG</string>
-    <string name="room_recents_favourites">ULUBIONE</string>
-    <string name="room_recents_conversations">POKÓJ</string>
-    <string name="room_recents_low_priority">NISKI PRIORYTET</string>
-    <string name="room_recents_invites">ZAPROSZENIA</string>
-    <string name="room_recents_start_chat">Rozpocznij rozmowę</string>
-    <string name="room_recents_create_room">Utwórz pokój</string>
-    <string name="room_recents_join_room">Dołącz do pokoju</string>
-    <string name="room_recents_join_room_title">Dołącz do pokoju</string>
-    <string name="room_recents_join_room_prompt">Wprowadź ID lub nazwę pokoju</string>
     <string name="directory_search_results_title">Przeglądaj katalog</string>
     <string name="directory_searching_title">Przeszukiwanie katalogu…</string>
     <string name="room_settings_favourite">Dodaj do ulubionych</string>
@@ -538,9 +527,7 @@
     <string name="group_details_people">Ludzie</string>
     <string name="community_name_hint">Przykład</string>
     <string name="community_id_hint">przykład</string>
-    <!-- group details -->
     <string name="encrypted_message">Wiadomość zaszyfrowana</string>
-    <!-- groups creation -->
     <string name="create">Utwórz</string>
     <string name="notification_off">Wyłączone</string>
     <string name="conference_call_warning_title">Uwaga!</string>
@@ -698,8 +685,8 @@
     <string name="encryption_export_room_keys_summary">Eksportuj klucze do pliku lokalnego</string>
     <string name="rejoin">Dołącz ponownie</string>
     <string name="forget_room">Zapomnij pokój</string>
-    <string name="download">Pobierz</string>
-    <string name="clear">Wyczyść</string>
+    <string name="action_download">Pobierz</string>
+    <string name="action_clear">Wyczyść</string>
     <string name="option_send_sticker">Wyślij naklejkę</string>
     <string name="e2e_re_request_encryption_key"><u>Poproś ponownie o klucze szyfrujące</u> z innych Twoich sesji.</string>
     <string name="e2e_re_request_encryption_key_sent">Prośba o klucz wysłana.</string>
@@ -766,7 +753,7 @@
     </plurals>
     <string name="widget_integration_room_not_visible">Pokój %s nie jest widoczny.</string>
     <string name="settings_labs_native_camera">Użyj natywnej kamery</string>
-    <string name="speak">Mów</string>
+    <string name="action_speak">Mów</string>
     <string name="option_send_voice">Wyślij głos</string>
     <string name="no_sticker_application_dialog_content">Nie masz obecnie aktywnych żadnych pakietów naklejek.
 \n
@@ -959,7 +946,7 @@
     <string name="settings_show_read_receipts_summary">Kliknij na potwierdzenie odbioru, aby wyświetlić szczegółową listę.</string>
     <string name="command_problem_with_parameters">Komenda „%s” potrzebuje więcej parametrów lub niektóre parametry są niepoprawne.</string>
     <string name="settings_info_area_show">Pokaż obszar informacyjny</string>
-    <string name="accept">Akceptuj</string>
+    <string name="action_accept">Akceptuj</string>
     <string name="auth_accept_policies">Przeczytaj i zaakceptuj zasady tego serwera domowego:</string>
     <string name="settings_labs_enable_send_voice_summary">Ta opcja wymaga aplikacji osoby trzeciej do nagrywania wiadomości.</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Uruchom Testy</string>
@@ -998,19 +985,19 @@
     <string name="video_call_in_progress">Połączenie wideo trwa…</string>
     <string name="title_activity_keys_backup_setup">Kopia Zapasowa Klucza</string>
     <string name="keys_backup_is_not_finished_please_wait">Kopia zapasowa kluczy nie jest zakończona, proszę czekać…</string>
-    <string name="skip">Pomiń</string>
+    <string name="action_skip">Pomiń</string>
     <string name="settings_notification_advanced">Zaawansowane ustawienia powiadomień</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Sprawdź ustawienia</string>
     <string name="keys_backup_info_title_algorithm">Algorytm</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Stracisz zaszyfrowane wiadomości, jeśli się teraz wylogujesz</string>
     <string name="are_you_sure">Jesteś pewien?</string>
-    <string name="abort">Przerwij</string>
+    <string name="action_abort">Przerwij</string>
     <string name="action_sign_out_confirmation_simple">Czy na pewno chcesz się wylogować?</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Trwa tworzenie kopii zapasowej klucza. Jeśli wylogujesz się teraz utracisz dostęp do zaszyfrowanych wiadomości.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Nie chcę moich zaszyfrowanych wiadomości</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Utracisz dostęp do zaszyfrowanych wiadomości, chyba że wykonasz kopię zapasową kluczy przed wylogowaniem się.</string>
-    <string name="stay">Zostań</string>
-    <string name="ignore">Ignoruj</string>
+    <string name="action_stay">Zostań</string>
+    <string name="action_ignore">Ignoruj</string>
     <string name="settings_default_compression">Domyślna kompresja</string>
     <string name="settings_noisy_notifications_preferences">Konfiguruj głośne powiadomienia</string>
     <string name="settings_silent_notifications_preferences">Konfiguruj ciche powiadomienia</string>
@@ -1094,8 +1081,8 @@
 \nJeżeli nie ustawiałeś nowej metody odzyskiwania, atakujący mogą uzyskać dostęp do Twojego konta. Zmień hasło konta i ustaw nową metodę odzyskiwania jak najszybciej w Ustawieniach.</string>
     <string name="room_list_catchup_empty_title">Jesteś na bieżąco!</string>
     <string name="login_error_unknown_host">Ten adres URL jest nieosiągalny, proszę sprawdź jego poprawność</string>
-    <string name="revoke">Unieważnij</string>
-    <string name="disconnect">Rozłącz</string>
+    <string name="action_revoke">Unieważnij</string>
+    <string name="action_disconnect">Rozłącz</string>
     <string name="call_failed_dont_ask_again">Nie pytaj ponownie</string>
     <string name="login_error_no_homeserver_found">To nie jest prawidłowy adres serwera Matrix</string>
     <string name="settings_add_3pid_confirm_password_title">Potwierdź swoje hasło</string>
@@ -1791,17 +1778,6 @@
     <string name="qr_code_scanned_by_other_no">Nie</string>
     <string name="settings_dev_tools">Narzędzia programistyczne</string>
     <string name="settings_account_data">Dane konta</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d głos</item>
-        <item quantity="few">%d głosów</item>
-        <item quantity="many"/>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d głos - wyniki końcowe</item>
-        <item quantity="few">%d głosów - wyniki końcowe</item>
-        <item quantity="many"/>
-    </plurals>
-    <string name="poll_item_selected_aria">Wybrana Opcja</string>
     <string name="command_description_poll">Tworzy prostą ankietę</string>
     <string name="verification_cannot_access_other_session">Użyj hasła odzyskiwania lub klucza</string>
     <string name="verification_use_passphrase">Użyj klucza odzyskiwania lub hasła</string>
@@ -1824,8 +1800,8 @@
     <string name="event_redacted_by_user_reason_with_reason">Wydarzenie usunięte przez użytkownika, przyczyna: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Wydarzenie moderowane przez administratora pokoju, przyczyna: %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Klucze są już aktualne!</string>
-    <string name="review">Sprawdź</string>
-    <string name="decline">Zrezygnuj</string>
+    <string name="action_review">Sprawdź</string>
+    <string name="action_decline">Zrezygnuj</string>
     <string name="sas_error_m_key_mismatch">Niezgodność klucza</string>
     <string name="sas_error_m_user_error">Niezgodność użytkowników</string>
     <string name="identity_server_not_defined">Nie korzystasz z serwera tożsamości</string>
@@ -1836,8 +1812,8 @@
     <string name="room_list_catchup_empty_body">Nie masz więcej nieprzeczytanych wiadomości</string>
     <string name="room_list_catchup_welcome_title">Witaj w domu!</string>
     <string name="title_activity_emoji_reaction_picker">Reakcje</string>
-    <string name="reactions_agree">Zgoda</string>
-    <string name="reactions_like">Lubię to</string>
+    <string name="action_agree">Zgoda</string>
+    <string name="action_like">Lubię to</string>
     <string name="message_view_reaction">Zobacz Reakcje</string>
     <string name="event_redacted_by_user_reason">Zdarzenie usunięte przez użytkownika</string>
     <string name="event_redacted_by_admin_reason">Zdarzenie moderowane przez administratora pokoju</string>
@@ -1868,9 +1844,9 @@
     <string name="refresh">Odśwież</string>
     <string name="verify_new_session_notice">Użyj tej sesji do weryfikacji nowej, nadając jej dostęp do zaszyfrowanych wiadomości.</string>
     <string name="verify_new_session_was_not_me">To nie ja</string>
-    <string name="dismiss">Zamknij</string>
-    <string name="pause_video">Wstrzymaj</string>
-    <string name="play_video">Odtwórz</string>
+    <string name="action_dismiss">Zamknij</string>
+    <string name="action_pause">Wstrzymaj</string>
+    <string name="action_play">Odtwórz</string>
     <string name="no_permissions_to_start_webrtc_call">Nie posiadasz wymaganych uprawnień do rozpoczęcia połączenia w tym pokoju</string>
     <string name="call_notification_answer">Odbierz</string>
     <string name="failed_to_remove_widget">Usuwanie widżetu nie powiodło się</string>
@@ -2061,7 +2037,7 @@
     <string name="action_add">Dodaj</string>
     <string name="action_copy">Kopiuj</string>
     <string name="call_notification_hangup">Zakończ rozmowę</string>
-    <string name="reset">Zresetuj</string>
+    <string name="action_reset">Zresetuj</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">Tryb samolotowy jest włączony</string>
     <string name="qr_code_scanned_by_other_notice">Prawie gotowe! Czy %s pokazuje tarczę\?</string>
     <string name="settings_hs_admin_e2e_disabled">Twój administrator serwera zablokował domyślne szyfrowanie punkt-punkt (e2e) w pokojach prywatnych w Wiadomościach Bezpośrednich.</string>
@@ -2077,7 +2053,6 @@
     <string name="direct_room_profile_not_encrypted_subtitle">Wiadomości tutaj nie są zaszyfrowane w trybie punkt-punkt (e2e).</string>
     <string name="sent_verification_conclusion">Weryfikacja wniosków</string>
     <string name="sent_a_reaction">Zareagowano: %s</string>
-    <string name="sent_a_bot_buttons">Przyciski botów</string>
     <string name="create_room_in_progress">Tworzenie pokoju…</string>
     <string name="create_room_alias_invalid">Niektóre znaki nie są dozwolone</string>
     <string name="create_room_alias_empty">Podaj adres pokoju</string>
@@ -2730,8 +2705,8 @@
     <string name="invite_to_space_with_name_desc">Będą w stanie przeglądać %s</string>
     <string name="invite_to_space_with_name">Zaproś do %s</string>
     <string name="invite_by_link">Udostępnij link</string>
-    <string name="invite_by_mxid_or_mail">Zaproś przez nazwę użytkownika lub email</string>
-    <string name="invite_by_mxid">Zaproś przez nazwę użytkownika</string>
+    <string name="invite_by_username_or_mail">Zaproś przez nazwę użytkownika lub email</string>
+    <string name="invite_by_username">Zaproś przez nazwę użytkownika</string>
     <string name="invite_by_email">Zaproś przez email</string>
     <string name="invite_people_to_your_space_desc">Aktualnie jesteś tylko Ty. %s będzie jeszcze lepsza kiedy dołączą inni.</string>
     <string name="invite_to_space">Zaproś do %s</string>
@@ -2871,7 +2846,7 @@
     <string name="feedback">Opinie</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Synchronizacja klucza samopodpisującego (Self Signing key)</string>
     <string name="cross_signing_verify_by_text">Weryfikacja ręczna poprzez tekst</string>
-    <string name="or_other_mx_capabale_client">lub innego klienta Matrix z krzyżową weryfikacją nowych sesji logowania</string>
+    <string name="or_other_mx_capable_client">lub innego klienta Matrix z krzyżową weryfikacją nowych sesji logowania</string>
     <string name="upgrade_room_no_power_to_manage">Nie masz uprawnień do zmiany poziomu pokoju</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Oczekiwanie na historię szyfrowania</string>
     <string name="room_using_unstable_room_version">Ten pokój pracuje na wersji pokoju %s, którą serwer domowy oznaczył jako niestabilną.</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 3d8295d70c..f0aa98ca56 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -39,24 +39,16 @@
     <string name="notice_room_third_party_invite">%1$s enviou um convite para %2$s para se juntar à sala</string>
     <string name="notice_room_third_party_registered_invite">%1$s aceitou o convite para %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Incapaz de decriptar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">O dispositivo do/da enviador(a) não nos enviou as chaves para esta mensagem.</string>
-    <!-- Room Screen -->
+    <string name="notice_crypto_error_unknown_inbound_session_id">O dispositivo do/da enviador(a) não nos enviou as chaves para esta mensagem.</string>
     <string name="could_not_redact">Não foi possível redigir</string>
     <string name="unable_to_send_message">Não foi possível enviar mensagem</string>
     <string name="message_failed_to_upload">Falha para fazer upload de imagem</string>
-    <!-- general errors -->
     <string name="network_error">Erro de rede</string>
     <string name="matrix_error">Erro de Matrix</string>
-    <!-- Home Screen -->
-    <!-- Last seen time -->
-    <!-- call events -->
-    <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Não é atualmente possível se re-juntar a uma sala vazia.</string>
-    <!-- medium friendly name -->
     <string name="medium_email">Endereço de email</string>
     <string name="medium_phone_number">Número de telefone</string>
     <string name="summary_user_sent_sticker">%1$s enviou um sticker.</string>
-    <!-- Room display name -->
     <string name="room_displayname_invite_from">Convite de %s</string>
     <string name="room_displayname_room_invite">Convite de Sala</string>
     <string name="room_displayname_two_members">%1$s e %2$s</string>
@@ -271,7 +263,6 @@
     <string name="notice_widget_jitsi_removed">Conferência de vídeo terminada por %1$s</string>
     <string name="notice_widget_jitsi_added_by_you">Você começou conferência de vídeo</string>
     <string name="notice_widget_jitsi_added">Conferência de vídeo começada por %1$s</string>
-    <!-- titles -->
     <string name="title_activity_home">Mensagens</string>
     <string name="title_activity_room">Sala</string>
     <string name="title_activity_settings">Configurações</string>
@@ -280,23 +271,22 @@
     <string name="call_notification_answer">Aceitar</string>
     <string name="call_notification_reject">Declinar</string>
     <string name="call_notification_hangup">Desligar</string>
-    <!-- button names -->
     <string name="ok">OK</string>
-    <string name="cancel">Cancelar</string>
-    <string name="save">Salvar</string>
-    <string name="leave">Sair</string>
-    <string name="send">Enviar</string>
-    <string name="resend">Reenviar</string>
-    <string name="redact">Remover</string>
-    <string name="quote">Citar</string>
-    <string name="share">Compartilhar</string>
+    <string name="action_cancel">Cancelar</string>
+    <string name="action_save">Salvar</string>
+    <string name="action_leave">Sair</string>
+    <string name="action_send">Enviar</string>
+    <string name="action_resend">Reenviar</string>
+    <string name="action_redact">Remover</string>
+    <string name="action_quote">Citar</string>
+    <string name="action_share">Compartilhar</string>
     <string name="later">Mais Tarde</string>
-    <string name="forward">Encaminhar</string>
+    <string name="action_forward">Encaminhar</string>
     <string name="permalink">Permalink</string>
     <string name="view_source">Visualizar Fonte</string>
     <string name="view_decrypted_source">Visualizar Fonte Decriptada</string>
-    <string name="delete">Deletar</string>
-    <string name="rename">Renomear</string>
+    <string name="action_delete">Deletar</string>
+    <string name="action_rename">Renomear</string>
     <string name="report_content">Reportar Conteúdo</string>
     <string name="active_call">Chamada ativa</string>
     <string name="ongoing_conference_call">Chamada de conferência em curso.
@@ -311,8 +301,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Chamadas de conferência não são suportadas em salas encriptadas</string>
     <string name="send_anyway">Enviar Mesmo Assim</string>
     <string name="or">ou</string>
-    <string name="invite">Convidar</string>
-    <!-- actions -->
+    <string name="action_invite">Convidar</string>
     <string name="action_sign_out">Fazer signout</string>
     <string name="action_voice_call">Chamar por Voz</string>
     <string name="action_video_call">Chamar por Vídeo</string>
@@ -323,31 +312,25 @@
     <string name="action_open">Abrir</string>
     <string name="action_close">Fechar</string>
     <string name="copied_to_clipboard">Copiado para clipboard</string>
-    <string name="disable">Desabilitar</string>
-    <!-- dialog titles -->
+    <string name="action_disable">Desabilitar</string>
     <string name="dialog_title_confirmation">Confirmação</string>
     <string name="dialog_title_warning">Aviso</string>
-    <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Home</string>
     <string name="bottom_action_favourites">Favoritos</string>
     <string name="bottom_action_people">Pessoas</string>
     <string name="bottom_action_rooms">Salas</string>
-    <!-- Home screen -->
     <string name="home_filter_placeholder_home">Filtrar nomes de salas</string>
     <string name="home_filter_placeholder_favorites">Filtrar favoritos</string>
     <string name="home_filter_placeholder_people">Filtrar pessoas</string>
     <string name="home_filter_placeholder_rooms">Filtrar nomes de salas</string>
-    <!-- Home fragment -->
     <string name="invitations_header">Convites</string>
     <string name="low_priority_header">Baixa prioridade</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">Conversas</string>
     <string name="local_address_book_header">Agenda de endereços local</string>
     <string name="matrix_only_filter">Contatos de Matrix somente</string>
     <string name="no_conversation_placeholder">Nenhuma conversa</string>
     <string name="template_no_contact_access_placeholder">Você não permitiu que ${app_name} acesse seus contatos locais</string>
     <string name="no_result_placeholder">Nenhum resultado</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">Salas</string>
     <string name="rooms_directory_header">Diretório de salas</string>
     <string name="no_room_placeholder">Nenhuma sala</string>
@@ -383,7 +366,6 @@
     <string name="start_video_call">Começar Chamada de Vídeo</string>
     <string name="option_send_files">Enviar arquivos</string>
     <string name="option_take_photo_video">Tirar foto ou vídeo</string>
-    <!-- Authentication -->
     <string name="auth_login">Fazer login</string>
     <string name="auth_register">Criar Conta</string>
     <string name="auth_submit">Submeter</string>
@@ -431,7 +413,6 @@
     <string name="auth_reset_password_success_message">Sua senha tem sido resettada.
 \n
 \nVocê tem sido feito logout de todas as sessões e não vai mais receber notificações push. Para re-habilitar notificações, re-faça login em cada dispositivo.</string>
-    <!-- Login Screen -->
     <string name="login_error_must_start_http">URL deve começar com http[s]://</string>
     <string name="login_error_network_error">Incapaz de fazer login: Erro de rede</string>
     <string name="login_error_unable_login">Incapaz de fazer login</string>
@@ -446,28 +427,20 @@
     <string name="login_error_limit_exceeded">Requisições demais tem sido enviadas</string>
     <string name="login_error_user_in_use">Este nome de usuária(o) já é usado</string>
     <string name="login_error_login_email_not_yet">O link de email que não tem sido clicado ainda</string>
-    <!-- crypto warnings -->
-    <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lista de Recibos de Leitura</string>
-    <!-- accounts list Screen -->
-    <!-- image size selection -->
     <string name="compression_options">Enviar como </string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Grande</string>
     <string name="compression_opt_list_medium">Médio</string>
     <string name="compression_opt_list_small">Pequeno</string>
-    <!-- media upload / download messages -->
     <string name="attachment_cancel_download">Cancelar o download?</string>
     <string name="attachment_cancel_upload">Cancelar o upload\?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
-    <!-- room creation dialog Screen -->
     <string name="yesterday">Ontem</string>
     <string name="today">Hoje</string>
-    <!-- room info dialog Screen -->
     <string name="room_info_room_name">Nome de sala</string>
     <string name="room_info_room_topic">Tópico de sala</string>
-    <!-- call string -->
     <string name="call_connected">Chamada conectada</string>
     <string name="call_connecting">Chamada conectando…</string>
     <string name="call_ended">Chamada terminada</string>
@@ -480,10 +453,8 @@
     <string name="call_error_ice_failed">Conexão de Mídia Falhou</string>
     <string name="call_error_camera_init_failed">Não é possível inicializar a câmera</string>
     <string name="call_error_answered_elsewhere">chamada atendida em algum outro lugar</string>
-    <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Tirar uma foto ou um vídeo</string>
     <string name="media_picker_cannot_record_video">Não é possível gravar vídeo</string>
-    <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informação</string>
     <string name="template_permissions_rationale_msg_storage">${app_name} precisa de permissão para acessar sua biblioteca de fotos e vídeos para enviar e salvar anexos.
 \n
@@ -504,31 +475,25 @@
 \n
 \nVocê concorda em compartilhar seu livro de endereços para este propósito\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Desculpe. Ação não performada, devido a permissões faltando</string>
-    <!-- medias slider string -->
     <string name="media_slider_saved">Salvo</string>
     <string name="media_slider_saved_message">Salvar em downloads\?</string>
     <string name="yes">SIM</string>
     <string name="no">NÃO</string>
     <string name="_continue">Continuar</string>
-    <!-- Actions -->
-    <string name="remove">Remover</string>
-    <string name="join">Juntar-se</string>
-    <string name="preview">Previsualizar</string>
-    <string name="reject">Rejeitar</string>
-    <!-- Room -->
+    <string name="action_remove">Remover</string>
+    <string name="action_join">Juntar-se</string>
+    <string name="action_preview">Previsualizar</string>
+    <string name="action_reject">Rejeitar</string>
     <string name="room_jump_to_first_unread">Pular para não-lida(s)</string>
-    <!-- Room Preview -->
     <string name="room_preview_invitation_format">Você tem sido convidada(o) para se juntar a esta sala por %s</string>
     <string name="room_preview_unlinked_email_warning">Este convite foi enviado para %s, que não está associada(o) com esta conta.
 \nVocê pode desejar fazer login com uma conta diferente, ou adicionar este email a sua conta.</string>
     <string name="room_preview_try_join_an_unknown_room">Você está tentando acessar %s. Você gostaria de se juntar a fim de participar na discussão\?</string>
     <string name="room_preview_try_join_an_unknown_room_default">uma sala</string>
     <string name="room_preview_room_interactions_disabled">Esta é uma previsualização desta sala. Interações de sala têm sido desabilitadas.</string>
-    <!-- Chat creation -->
     <string name="room_creation_title">Novo Chat</string>
     <string name="room_creation_add_member">Adicionar membro</string>
     <string name="room_title_one_member">1 membro</string>
-    <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Sair de sala</string>
     <string name="room_participants_leave_prompt_msg">Você tem certeza que você quer sair da sala\?</string>
     <string name="room_participants_remove_prompt_msg">Você tem certeza que você quer remover %s deste chat\?</string>
@@ -556,14 +521,12 @@
     <string name="room_participants_power_level_prompt">Você não vai ser capaz de desfazer esta mudança já que você está promovendo a(o) usuária(o) para ter o mesmo nível de poder que você.
 \nVocê tem certeza\?</string>
     <string name="room_participants_invite_prompt_msg">Você tem certeza você que quer convidar %s para este chat\?</string>
-    <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Convidar por ID</u></string>
     <string name="people_search_local_contacts">CONTATOS LOCAIS (%d)</string>
     <string name="people_search_filter_text">Usuárias(os) Matrix somente</string>
     <string name="people_search_invite_by_id_dialog_title">Convidar usuária(o) por ID</string>
     <string name="people_search_invite_by_id_dialog_description">Por favor entre um ou mais endereços de email ou ID Matrix</string>
     <string name="people_search_invite_by_id_dialog_hint">Email ou ID Matrix</string>
-    <!--  Chat -->
     <string name="room_menu_search">Pesquisar</string>
     <string name="room_one_user_is_typing">%s está digitando…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s estão digitando…</string>
@@ -579,7 +542,6 @@
     <string name="room_delete_unsent_messages">Deletar mensagens não-enviadas</string>
     <string name="room_message_file_not_found">Arquivo não encontrado</string>
     <string name="room_do_not_have_permission_to_post">Você não tem permissão para postar nesta sala.</string>
-    <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Confiar</string>
     <string name="ssl_do_not_trust">Não confiar</string>
     <string name="ssl_logout_account">Fazer logout</string>
@@ -591,7 +553,6 @@
     <string name="ssl_unexpected_existing_expl">O certificado tem mudado de um que era confiado por seu telefone. Isto é ALTAMENTE INCOMUM. É recomendado que você NÃO ACEITE este novo certificado.</string>
     <string name="ssl_expected_existing_expl">O certificado tem mudado de um previamente confiado para um que não é confiado. O servidor pode ter renovado seu certificado. Contacte o/a administrador(a) de servidor para a impressão digital esperada.</string>
     <string name="ssl_only_accept">Somente aceite o certificado se o/a administrador(a) de servidor tem publicado uma impressão digital que corresponde com a acima.</string>
-    <!-- Room Details -->
     <string name="room_details_title">Detalhes de Sala</string>
     <string name="room_details_people">Pessoas</string>
     <string name="room_details_files">Arquivos</string>
@@ -599,14 +560,12 @@
     <string name="malformed_id">ID malformada. Devia ser um endereço de email ou uma ID Matrix como \'@partlocal:dominio\'</string>
     <string name="room_details_people_invited_group_name">CONVIDADAS(OS)</string>
     <string name="room_details_people_present_group_name">SE JUNTARAM</string>
-    <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Razão por reportar este conteúdo</string>
     <string name="room_event_action_report_prompt_ignore_user">Você quer esconder todas as mensagens desta(e) usuária(o)\?
 \n
 \nNote que esta ação vai recomeçar o app e pode levar algum tempo.</string>
     <string name="room_event_action_cancel_upload">Cancelar Upload</string>
     <string name="room_event_action_cancel_download">Cancelar Download</string>
-    <!-- Search -->
     <string name="search_hint">Pesquisar</string>
     <string name="search_members_hint">Filtrar membros de sala</string>
     <string name="search_no_results">Nenhum resultado</string>
@@ -614,28 +573,13 @@
     <string name="tab_title_search_messages">MENSAGENS</string>
     <string name="tab_title_search_people">PESSOAS</string>
     <string name="tab_title_search_files">ARQUIVOS</string>
-    <!-- Room recents -->
-    <string name="room_recents_join">JUNTAR-SE</string>
-    <string name="room_recents_directory">DIRETÓRIO</string>
-    <string name="room_recents_favourites">FAVORITOS</string>
-    <string name="room_recents_conversations">SALAS</string>
-    <string name="room_recents_low_priority">BAIXA PRIORIDADE</string>
-    <string name="room_recents_invites">CONVITES</string>
-    <string name="room_recents_start_chat">Começar chat</string>
-    <string name="room_recents_create_room">Criar sala</string>
-    <string name="room_recents_join_room">Juntar-se a sala</string>
-    <string name="room_recents_join_room_title">Juntar-se a uma sala</string>
-    <string name="room_recents_join_room_prompt">Digite uma id de sala ou um alias de sala</string>
-    <!-- Directory -->
     <string name="directory_search_results_title">Navegar diretório</string>
     <string name="directory_searching_title">Pesquisando diretório…</string>
-    <!-- home room settings -->
     <string name="room_settings_favourite">Favoritar</string>
     <string name="room_settings_de_prioritize">Des-prioritizar</string>
     <string name="room_settings_direct_chat">Chat Direto</string>
     <string name="room_settings_leave_conversation">Sair de Conversa</string>
     <string name="room_settings_forget">Esquecer</string>
-    <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Mensagens</string>
     <string name="room_sliding_menu_settings">Configurações</string>
     <string name="room_sliding_menu_version">Versão</string>
@@ -643,7 +587,6 @@
     <string name="room_sliding_menu_third_party_notices">Notas de terceiros</string>
     <string name="room_sliding_menu_copyright">Copyright</string>
     <string name="room_sliding_menu_privacy_policy">Política de privacidade</string>
-    <!-- Vector Settings -->
     <string name="settings_profile_picture">Imagem de Perfil</string>
     <string name="settings_display_name">Nome de Exibição</string>
     <string name="settings_email_address">Email</string>
@@ -671,7 +614,6 @@
     <string name="settings_copyright">Copyright</string>
     <string name="settings_privacy_policy">Política de privacidade</string>
     <string name="settings_clear_cache">Limpar cache</string>
-    <!--string name="settings_room_privacy_label">Privacidade</string-->
     <string name="settings_user_settings">Configurações de usuária(o)</string>
     <string name="settings_notifications">Notificações</string>
     <string name="settings_ignored_users">Usuárias(os) ignoradas(os)</string>
@@ -727,37 +669,29 @@
     <string name="settings_phone_number_verification_error_empty_code">Entre um código de ativação</string>
     <string name="settings_phone_number_verification_error">Erro enquanto validando seu número de telefone</string>
     <string name="settings_phone_number_code">Código</string>
-    <!-- Room Settings -->
-    <!-- room global settings-->
     <string name="room_settings_room_photo">Foto da Sala</string>
     <string name="room_settings_room_name">Nome de Sala</string>
     <string name="room_settings_topic">Tópico</string>
     <string name="room_settings_room_tag">Etiqueta da Sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetada como:</string>
-    <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Favoritar</string>
     <string name="room_settings_tag_pref_entry_low_priority">Baixa prioridade</string>
     <string name="room_settings_tag_pref_entry_none">Nenhuma</string>
-    <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Acesso e visibilidade</string>
     <string name="room_settings_directory_visibility">Listar esta sala em diretório de salas</string>
     <string name="room_settings_room_access_rules_pref_title">Acesso a Sala</string>
     <string name="room_settings_room_read_history_rules_pref_title">Legibilidade de Histórico de Sala</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Quem pode ler o histórico\?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Quem pode acessar esta sala?</string>
-    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Qualquer pessoa</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Membros somente (desde o ponto no tempo de seleção desta opção)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Membros somente (desde que eles foram convidados)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Membros somente (desde que eles se juntaram)</string>
-    <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Para linkar a uma sala ela deve ter um endereço.</string>
     <string name="room_settings_room_access_entry_only_invited">Somente pessoas que têm sido convidadas</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Qualquer pessoa que sabe o link da sala, a parte de visitantes</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Qualquer pessoa que sabe o link da sala, incluindo visitantes</string>
-    <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Usuárias(os) banidas(os)</string>
-    <!-- advanced -->
     <string name="room_settings_category_advanced_title">Avançadas</string>
     <string name="room_settings_room_internal_id">ID interno desta sala</string>
     <string name="room_settings_addresses_pref_title">Endereços</string>
@@ -768,7 +702,6 @@
     <string name="room_settings_labs_end_to_end_warnings">Você precisa fazer logout para ser capaz de habilitar a encriptação.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Encriptar para sessões verificadas somente</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Nunca enviar mensagens encriptadas para sessões não-confirmadas nesta sala desta sessão.</string>
-    <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Esta sala não tem nenhum endereço local</string>
     <string name="room_settings_addresses_add_new_address">Novo endereço (e.g. #foo:matrix.org)</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Formato de alias inválido</string>
@@ -783,11 +716,8 @@
     <string name="room_settings_addresses_e2e_disabled">Encriptação está desabilitada nesta sala.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Habilitar encriptação
 \n(aviso: não pode ser desabilitada de novo!)</string>
-    <!-- Directory -->
     <string name="directory_title">Diretório</string>
-    <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s estava tentando carregar um ponto específico na timeline desta sala mas foi incapaz de encontrá-lo.</string>
-    <!-- encryption dialog -->
     <string name="encryption_information_title">Informação de encriptação ponta-a-ponta</string>
     <string name="encryption_information_device_info">Informação de evento</string>
     <string name="encryption_information_user_id">Id de usuária(o)</string>
@@ -831,21 +761,18 @@
     <string name="encryption_information_verify_device_warning">Confirme ao comparar o seguinte com as Configurações de Usuária(o) em sua outra sessão:</string>
     <string name="encryption_information_verify_device_warning2">Se não corresponderem, a segurança de sua comunicação pode estar comprometida.</string>
     <string name="encryption_information_verify_key_match">Eu verifico que as chaves correspondem</string>
-    <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Sala contém sessões desconhecidas</string>
     <string name="unknown_devices_alert_message">Esta sala contém sessões desconhecidas que não têm sido verificadas.
 \nIsto significa que não há nenhuma garantia que as sessões pertencem às/aos usuárias(os) às/aos quais elas clamam pertencer.
 \nNós recomendamos que você passe pelo processo de verificação para cada sessão antes de continuar, mas você pode reenviar a mensagem sem verificar se você preferir.
 \n
 \nSessões desconhecidas:</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">Selecionar um diretório de salas</string>
     <string name="directory_server_fail_to_retrieve_server">O servidor pode estar indisponível ou sobrecarregado</string>
     <string name="directory_server_type_homeserver">Digite um servidorcasa para de onde listar salas públicas</string>
     <string name="directory_server_placeholder">Nome de servidor</string>
     <string name="directory_server_all_rooms_on_server">Todas as salas em servidor %s</string>
     <string name="directory_server_native_rooms">Todas as salas nativas de %s</string>
-    <!-- historical -->
     <string name="historical_placeholder">Pesquisar por histórico</string>
     <string name="offline">Offline</string>
     <string name="user_directory_header">Diretório de usuárias(os)</string>
@@ -917,7 +844,6 @@
     <string name="widget_creation_failure">Criação de widget tem falhado</string>
     <string name="settings_labs_create_conference_with_jitsi">Criar chamadas de conferência com jitsi</string>
     <string name="widget_delete_message_confirmation">Você tem certeza que você quer deletar o widget desta sala\?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Incapaz de criar widget.</string>
     <string name="widget_integration_failed_to_send_request">Falha para enviar requisição.</string>
     <string name="widget_integration_positive_power_level">Nível de poder deve ser um inteiro positivo.</string>
@@ -928,30 +854,24 @@
     <string name="widget_integration_room_not_visible">Sala %s não está visível.</string>
     <string name="room_add_matrix_apps">Adicionar apps Matrix</string>
     <string name="settings_labs_native_camera">Usar câmera nativa</string>
-    <!-- share keys -->
     <string name="you_added_a_new_device">Você adicionou uma nova sessão \'%s\', que está requisitando chaves de encriptação.</string>
     <string name="your_unverified_device_requesting">Sua sessão não-verificada \'%s\' está requisitando chaves de encriptação.</string>
     <string name="start_verification">Começar verificação</string>
     <string name="share_without_verifying">Compartilhar sem verificar</string>
     <string name="ignore_request">Ignorar requisição</string>
-    <!-- conference call -->
     <string name="conference_call_warning_title">Aviso!</string>
     <string name="conference_call_warning_message">Chamamento de conferência está em desenvolvimento e pode não ser estável.</string>
-    <!-- slash commands -->
     <string name="command_error">Erro de comando</string>
     <string name="unrecognized_command">Comando irreconhecido: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Desativada</string>
     <string name="notification_noisy">Barulhenta</string>
     <string name="encrypted_message">Mensagem encriptada</string>
-    <!-- groups creation -->
     <string name="create">Criar</string>
     <string name="create_community">Criar Comunidade</string>
     <string name="community_name">Nome da comunidade</string>
     <string name="community_name_hint">Exemplo</string>
     <string name="community_id">ID de comunidade</string>
     <string name="community_id_hint">exemplo</string>
-    <!-- group details -->
     <string name="group_details_home">Home</string>
     <string name="group_details_people">Pessoas</string>
     <string name="group_details_rooms">Salas</string>
@@ -1012,7 +932,6 @@
         <item quantity="one">%d widget ativo</item>
         <item quantity="other">%d widgets ativos</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="receipt_avatar">Avatar de recibo</string>
     <string name="notice_avatar">Avatar de nota</string>
     <string name="avatar">Avatar</string>
@@ -1022,9 +941,9 @@
     <string name="settings_notification_privacy_need_permission">O app precisa de permissão para rodar no background</string>
     <string name="title_activity_choose_sticker">Enviar um sticker</string>
     <string name="dialog_title_third_party_licences">Licenças de terceiros</string>
-    <string name="download">Fazer Download</string>
-    <string name="speak">Falar</string>
-    <string name="clear">Limpar</string>
+    <string name="action_download">Fazer Download</string>
+    <string name="action_speak">Falar</string>
+    <string name="action_clear">Limpar</string>
     <string name="missing_permissions_error">Devido a permissões faltando, esta ação não é possível.</string>
     <string name="system_alerts_header">Alertas de Sistema</string>
     <string name="send_bug_report_description_in_english">Se possível, por favor escreva a descrição em Inglês.</string>
@@ -1136,7 +1055,7 @@
     <string name="resource_limit_soft_contact">Por favor %s para ter este limite aumentado.</string>
     <string name="resource_limit_hard_contact">Por favor %s para continuar usando este serviço.</string>
     <string name="encryption_export_notice">Por favor crie uma frasepasse para encriptar as chaves exportadas. Você vai precisar entrar a mesma frasepasse para ser capaz de importar as chaves.</string>
-    <string name="accept">Aceitar</string>
+    <string name="action_accept">Aceitar</string>
     <string name="dialog_title_error">Erro</string>
     <string name="auth_accept_policies">Por favor revise e aceite as políticas deste servidorcasa:</string>
     <string name="settings_call_category">Chamadas</string>
@@ -1261,10 +1180,10 @@
     <string name="backup">Fazer backup</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Você vai perder acesso a suas mensagens encriptadas a menos que faça backup de suas chaves antes de fazer signout.</string>
     <string name="keys_backup_info_title_signature">Assinatura</string>
-    <string name="stay">Ficar</string>
-    <string name="skip">Pular</string>
+    <string name="action_stay">Ficar</string>
+    <string name="action_skip">Pular</string>
     <string name="done">Feito</string>
-    <string name="abort">Abortar</string>
+    <string name="action_abort">Abortar</string>
     <string name="action_sign_out_confirmation_simple">Você tem certeza que você quer fazer sign out\?</string>
     <string name="settings_notification_advanced">Configurações de Notificações Avançadas</string>
     <string name="settings_notification_by_event">Importância de notificação por evento</string>
@@ -1275,7 +1194,7 @@
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Checar Configurações</string>
     <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nEste erro está fora de controle de ${app_name} e de acordo com Google, este erro indica que o dispositivo tem apps demais registrados com FCM. O erro somente ocorre em casos onde há números extremos de apps, então isso não devia afetar a/o usuária(o) média(o).</string>
-    <string name="ignore">Ignorar</string>
+    <string name="action_ignore">Ignorar</string>
     <string name="auth_login_sso">Fazer sign-in com sign-on único</string>
     <string name="login_error_unknown_host">Este URL não é alcançável, por favor cheque-o</string>
     <string name="login_error_ssl_handshake">Seu dispositivo está usando um protocolo de segurança TLS desatualizado, vulnerável a ataque, para sua segurança você não vai ser capaz de se conectar</string>
@@ -1293,16 +1212,16 @@
     <string name="settings_send_message_with_enter">Enviar mensagem com enter</string>
     <string name="title_activity_verify_device">Verificar sessão</string>
     <string name="none">Nenhum</string>
-    <string name="revoke">Revogar</string>
-    <string name="disconnect">Desconectar</string>
-    <string name="review">Revisar</string>
-    <string name="decline">Declinar</string>
+    <string name="action_revoke">Revogar</string>
+    <string name="action_disconnect">Desconectar</string>
+    <string name="action_review">Revisar</string>
+    <string name="action_decline">Declinar</string>
     <string name="action_mark_room_read">Marcar como lida</string>
     <string name="people_no_identity_server">Nenhum servidor de identidade configurado.</string>
     <string name="call_failed_no_ice_title">Chamada falhou devido a servidor malconfigurado</string>
-    <string name="play_video">Tocar</string>
-    <string name="pause_video">Pausar</string>
-    <string name="dismiss">Descartar</string>
+    <string name="action_play">Tocar</string>
+    <string name="action_pause">Pausar</string>
+    <string name="action_dismiss">Descartar</string>
     <string name="action_copy">Copiar</string>
     <string name="dialog_title_success">Sucesso</string>
     <string name="bottom_action_notification">Notificações</string>
@@ -1645,8 +1564,8 @@
     <string name="room_list_rooms_empty_title">Salas</string>
     <string name="room_list_rooms_empty_body">Suas salas vão ser exibidas aqui. Toque no + à direita fundo para encontrar umas existentes ou começar algumas propriamente suas.</string>
     <string name="title_activity_emoji_reaction_picker">Reações</string>
-    <string name="reactions_agree">Concordo</string>
-    <string name="reactions_like">Curtir</string>
+    <string name="action_agree">Concordo</string>
+    <string name="action_like">Curtir</string>
     <string name="message_add_reaction">Adicionar Reação</string>
     <string name="message_view_reaction">Visualizar Reações</string>
     <string name="reactions">Reações</string>
@@ -2129,15 +2048,6 @@
     <string name="no_connectivity_to_the_server_indicator_airplane">Modo avião está ligado</string>
     <string name="settings_dev_tools">Ferramentas Dev</string>
     <string name="settings_account_data">Dados de Conta</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d voto</item>
-        <item quantity="other">%d votos</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d voto - Resultados finais</item>
-        <item quantity="other">%d votos - Resultados finais</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Opção Selecionada</string>
     <string name="command_description_poll">Cria uma sondagem simples</string>
     <string name="verification_cannot_access_other_session">Use uma Chave ou a Frasepasse de Recuperação</string>
     <string name="verification_use_passphrase">Se você não pode acessar uma sessão existente</string>
@@ -2273,7 +2183,7 @@
 \n${app_name} Desktop</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">ou um outro cliente Matrix capaz de assinatura cruzada</string>
+    <string name="or_other_mx_capable_client">ou um outro cliente Matrix capaz de assinatura cruzada</string>
     <string name="template_use_latest_app">Use o ${app_name} mais recente em seus outros dispositivos:</string>
     <string name="command_description_discard_session">Força a atual sessão de grupo de saída em uma sala encriptada a ser descartada</string>
     <string name="command_description_discard_session_not_handled">Somente suportado em salas encriptadas</string>
@@ -2443,7 +2353,6 @@
     <string name="auth_msisdn_already_defined">Este número de telefone já está definido.</string>
     <string name="settings_show_room_member_state_events">Mostrar eventos de estado de membros de sala</string>
     <string name="sent_a_poll">Sondagem</string>
-    <string name="sent_a_bot_buttons">Botões de Bot</string>
     <string name="sent_a_reaction">Reagiu com: %s</string>
     <string name="sent_verification_conclusion">Conclusão de Verificação</string>
     <string name="delete_account_data_warning">Deletar os dados de conta de tipo %1$s\?
@@ -2492,7 +2401,7 @@
     <string name="search_is_not_supported_in_e2e_room">Pesquisar em salas encriptadas não é suportado ainda.</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Você não tem permissão para começar uma chamada</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Você não tem permissão para começar uma chamada de conferência</string>
-    <string name="reset">Resettar</string>
+    <string name="action_reset">Resettar</string>
     <string name="direct_room_join_rules_invite">%1$s fez isto somente convite.</string>
     <string name="direct_room_join_rules_invite_by_you">Você fez isto somente convite.</string>
     <string name="direct_room_created_summary_item">%s juntou-se.</string>
@@ -2787,7 +2696,7 @@
     <string name="invite_just_to_this_room_desc">Elas não vão fazer parte de %s</string>
     <string name="invite_just_to_this_room">Só a esta sala</string>
     <string name="invite_by_link">Compartilhar link</string>
-    <string name="invite_by_mxid">Convidar por nome de usuária(o)</string>
+    <string name="invite_by_username">Convidar por nome de usuária(o)</string>
     <string name="invite_by_email">Convidar por email</string>
     <string name="invite_people_menu">Convidar pessoas</string>
     <string name="suggested_rooms_pills_on_empty_header">Boas-vindas a %1$s, %2$s.</string>
@@ -3029,7 +2938,7 @@
     <string name="discovery_invite">Convidar por email, encontrar contatos e mais…</string>
     <string name="finish_setting_up_discovery">Termine de configurar descoberta.</string>
     <string name="create_space_identity_server_info_none">Você não está atualmente usando um servidor de identidade. A fim de convidar colegas e ser descobertável por elas(es), configure um abaixo.</string>
-    <string name="invite_by_mxid_or_mail">Convidar por nome de usuária(o) ou mail</string>
+    <string name="invite_by_username_or_mail">Convidar por nome de usuária(o) ou mail</string>
     <string name="create_spaces_invite_public_header_desc">Assegure que as pessoas certas têm acesso a companhia %s. Você pode convidar outras mais tarde.</string>
     <string name="create_spaces_invite_public_header">Quem são suas/seus colegas\?</string>
     <string name="command_description_add_to_space">Adicionar ao dado Espaço</string>
diff --git a/vector/src/main/res/values-pt/strings.xml b/vector/src/main/res/values-pt/strings.xml
index b4aa314cba..76d5aa1ebe 100644
--- a/vector/src/main/res/values-pt/strings.xml
+++ b/vector/src/main/res/values-pt/strings.xml
@@ -39,23 +39,15 @@
     <string name="notice_room_third_party_invite">%1$s enviou um convite para que %2$s se junte à sala</string>
     <string name="notice_room_third_party_registered_invite">%1$s aceitou o convite para %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Impossível decifrar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">O dispositivo de quem enviou a mensagem não nos enviou as chaves para esta mensagem.</string>
-    <!-- Room Screen -->
+    <string name="notice_crypto_error_unknown_inbound_session_id">O dispositivo de quem enviou a mensagem não nos enviou as chaves para esta mensagem.</string>
     <string name="could_not_redact">Não foi possível apagar</string>
     <string name="unable_to_send_message">Não foi possível enviar a mensagem</string>
     <string name="message_failed_to_upload">O envio da imagem falhou</string>
-    <!-- general errors -->
     <string name="network_error">Erro de conexão à Internet</string>
     <string name="matrix_error">Erro do Matrix</string>
-    <!-- Home Screen -->
-    <!-- Last seen time -->
-    <!-- call events -->
-    <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Ainda não é possível voltar a entrar numa sala vazia.</string>
-    <!-- medium friendly name -->
     <string name="medium_email">Endereço de e-mail</string>
     <string name="medium_phone_number">Número de telefone</string>
-    <!-- Room display name -->
     <string name="room_displayname_invite_from">Convite de %s</string>
     <string name="room_displayname_room_invite">Convite para sala</string>
     <string name="room_displayname_two_members">%1$s e %2$s</string>
@@ -64,29 +56,27 @@
     <string name="notice_room_update">%s fez o upgrade da sala.</string>
     <string name="notice_event_redacted">Mensagem removida</string>
     <string name="notice_event_redacted_by">Mensagem removida por %1$s</string>
-    <!-- titles -->
     <string name="title_activity_home">Mensagens</string>
     <string name="title_activity_room">Sala</string>
     <string name="title_activity_settings">Definições</string>
     <string name="title_activity_member_details">Detalhes dos Membros</string>
     <string name="title_activity_historical">Histórico</string>
-    <!-- button names -->
     <string name="ok">OK</string>
-    <string name="cancel">Cancelar</string>
-    <string name="save">Guardar</string>
-    <string name="leave">Sair</string>
-    <string name="send">Enviar</string>
-    <string name="resend">Reenviar</string>
-    <string name="redact">Apagar</string>
-    <string name="quote">Citar</string>
-    <string name="share">Partilhar</string>
+    <string name="action_cancel">Cancelar</string>
+    <string name="action_save">Guardar</string>
+    <string name="action_leave">Sair</string>
+    <string name="action_send">Enviar</string>
+    <string name="action_resend">Reenviar</string>
+    <string name="action_redact">Apagar</string>
+    <string name="action_quote">Citar</string>
+    <string name="action_share">Partilhar</string>
     <string name="later">Depois</string>
-    <string name="forward">Encaminhar</string>
+    <string name="action_forward">Encaminhar</string>
     <string name="permalink">Link permanente</string>
     <string name="view_source">Ver fonte</string>
     <string name="view_decrypted_source">Ver o original decifrado</string>
-    <string name="delete">Apagar</string>
-    <string name="rename">Renomear</string>
+    <string name="action_delete">Apagar</string>
+    <string name="action_rename">Renomear</string>
     <string name="report_content">Denunciar conteúdo</string>
     <string name="active_call">Chamada ativa</string>
     <string name="ongoing_conference_call">Chamada de grupo em curso.\nJunte-se por %1$s ou %2$s.</string>
@@ -100,8 +90,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Chamadas de conferência não são suportadas em salas cifradas</string>
     <string name="send_anyway">Enviar na mesma</string>
     <string name="or">ou</string>
-    <string name="invite">Convidar</string>
-    <!-- actions -->
+    <string name="action_invite">Convidar</string>
     <string name="action_sign_out">Sair</string>
     <string name="action_voice_call">Chamada de voz</string>
     <string name="action_video_call">Chamada de vídeo</string>
@@ -112,31 +101,25 @@
     <string name="action_open">Abrir</string>
     <string name="action_close">Fechar</string>
     <string name="copied_to_clipboard">Copiado para a área de transferência</string>
-    <string name="disable">Desativar</string>
-    <!-- dialog titles -->
+    <string name="action_disable">Desativar</string>
     <string name="dialog_title_confirmation">Confirmação</string>
     <string name="dialog_title_warning">Aviso</string>
-    <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Início</string>
     <string name="bottom_action_favourites">Favoritos</string>
     <string name="bottom_action_people">Pessoas</string>
     <string name="bottom_action_rooms">Salas</string>
-    <!-- Home screen -->
     <string name="home_filter_placeholder_home">Pesquisar salas</string>
     <string name="home_filter_placeholder_favorites">Pesquisar favoritos</string>
     <string name="home_filter_placeholder_people">Pesquisar pessoas</string>
     <string name="home_filter_placeholder_rooms">Pesquisar salas</string>
-    <!-- Home fragment -->
     <string name="invitations_header">Convites</string>
     <string name="low_priority_header">Prioridade baixa</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">Conversas</string>
     <string name="local_address_book_header">Lista de endereços local</string>
     <string name="matrix_only_filter">Apenas contactos do Matrix</string>
     <string name="no_conversation_placeholder">Não há conversas</string>
     <string name="template_no_contact_access_placeholder">Não permitiu ao ${app_name} aceder aos seus contactos locais</string>
     <string name="no_result_placeholder">Sem resultados</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">Salas</string>
     <string name="rooms_directory_header">Lista de salas</string>
     <string name="no_room_placeholder">Sem salas</string>
@@ -172,7 +155,6 @@
     <string name="start_video_call">Iniciar chamada de vídeo</string>
     <string name="option_send_files">Enviar ficheiros</string>
     <string name="option_take_photo_video">Capturar foto ou vídeo</string>
-    <!-- Authentication -->
     <string name="auth_login">Iniciar sessão</string>
     <string name="auth_register">Registar</string>
     <string name="auth_submit">Enviar</string>
@@ -220,7 +202,6 @@ Poderá adicionar o seu email ao seu perfil nas definições.</string>
     <string name="auth_reset_password_success_message">A sua senha foi redefinida.
 
 A sessão foi terminada em todos os dispositivos e não receberá mais notificações. Para reactivar as notificações, inicie sessão novamente em cada um dos dispositivos.</string>
-    <!-- Login Screen -->
     <string name="login_error_must_start_http">URL tem que começar com http[s]://</string>
     <string name="login_error_network_error">Não foi possível iniciar sessão: Erro de rede</string>
     <string name="login_error_unable_login">Não foi possível iniciar sessão</string>
@@ -235,28 +216,20 @@ A sessão foi terminada em todos os dispositivos e não receberá mais notifica
     <string name="login_error_limit_exceeded">Foram enviados demasiados pedidos</string>
     <string name="login_error_user_in_use">Este nome de utilizador já está a ser usado</string>
     <string name="login_error_login_email_not_yet">O link no email ainda não foi clicado</string>
-    <!-- crypto warnings -->
-    <!-- read receipts list Screen -->
     <string name="read_receipts_list">Ler lista de recibos de leitura</string>
-    <!-- accounts list Screen -->
-    <!-- image size selection -->
     <string name="compression_options">Enviar como </string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Grande</string>
     <string name="compression_opt_list_medium">Média</string>
     <string name="compression_opt_list_small">Pequena</string>
-    <!-- media upload / download messages -->
     <string name="attachment_cancel_download">Cancelar a transferência?</string>
     <string name="attachment_cancel_upload">Cancelar o envio?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
-    <!-- room creation dialog Screen -->
     <string name="yesterday">Ontem</string>
     <string name="today">Hoje</string>
-    <!-- room info dialog Screen -->
     <string name="room_info_room_name">Nome da sala</string>
     <string name="room_info_room_topic">Tópico da sala</string>
-    <!-- call string -->
     <string name="call_connected">Chamada estabelecida</string>
     <string name="call_connecting">A estabelecer a chamada…</string>
     <string name="call_ended">Chamada terminada</string>
@@ -269,10 +242,8 @@ A sessão foi terminada em todos os dispositivos e não receberá mais notifica
     <string name="call_error_ice_failed">A ligação multimédia falhou</string>
     <string name="call_error_camera_init_failed">Não foi possível iniciar a câmara</string>
     <string name="call_error_answered_elsewhere">chamada respondida noutro sítio</string>
-    <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Tirar fotografia ou gravar um vídeo</string>
     <string name="media_picker_cannot_record_video">Não foi possível gravar vídeo</string>
-    <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informação</string>
     <string name="template_permissions_rationale_msg_storage">O ${app_name} necessita de permissão para aceder ao seu armazenamento de fotos e vídeos para poder enviar e guardar anexos.
 
@@ -295,31 +266,25 @@ Por favor, permita o acesso na próxima janela para poder encontrar utilizadores
 
 Permitir ao ${app_name} aceder aos seus contactos?</string>
     <string name="permissions_action_not_performed_missing_permissions">Desculpe… A ação não foi realizada, por falta de permissões</string>
-    <!-- medias slider string -->
     <string name="media_slider_saved">Guardado</string>
     <string name="media_slider_saved_message">Guardar nas transferências?</string>
     <string name="yes">SIM</string>
     <string name="no">NÃO</string>
     <string name="_continue">Continuar</string>
-    <!-- Actions -->
-    <string name="remove">Remover</string>
-    <string name="join">Entrar</string>
-    <string name="preview">Visualizar</string>
-    <string name="reject">Rejeitar</string>
-    <!-- Room -->
+    <string name="action_remove">Remover</string>
+    <string name="action_join">Entrar</string>
+    <string name="action_preview">Visualizar</string>
+    <string name="action_reject">Rejeitar</string>
     <string name="room_jump_to_first_unread">Ir para a primeira mensagem não lida.</string>
-    <!-- Room Preview -->
     <string name="room_preview_invitation_format">Foi convidado para entrar nesta sala por %s</string>
     <string name="room_preview_unlinked_email_warning">Este convite foi enviado para %s, que não está associado com esta conta.
 Pode querer iniciar sessão com uma conta diferente, ou adicionar este email à sua conta.</string>
     <string name="room_preview_try_join_an_unknown_room">Está a tentar aceder a %s. Quer entrar na sala para poder participar na conversa?</string>
     <string name="room_preview_try_join_an_unknown_room_default">uma sala</string>
     <string name="room_preview_room_interactions_disabled">Isto é uma pré-visualização desta sala. As interações com a sala foram desativadas.</string>
-    <!-- Chat creation -->
     <string name="room_creation_title">Nova conversa</string>
     <string name="room_creation_add_member">Adicionar membro</string>
     <string name="room_title_one_member">1 membro</string>
-    <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Sair da sala</string>
     <string name="room_participants_leave_prompt_msg">Tem a certeza que quer sair da sala?</string>
     <string name="room_participants_remove_prompt_msg">Tem certeza que quer remover %s desta conversa?</string>
@@ -347,14 +312,12 @@ Pode querer iniciar sessão com uma conta diferente, ou adicionar este email à
     <string name="room_participants_power_level_prompt">Não poderá reverter esta alteração visto que está a promover este utilizador para ter o mesmo nível de permissões que você.
 Tem a certeza?</string>
     <string name="room_participants_invite_prompt_msg">Tem a certeza que quer convidar %s para esta conversa?</string>
-    <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Invite by ID</u></string>
     <string name="people_search_local_contacts">CONTACTOS LOCAIS (%d)</string>
     <string name="people_search_filter_text">Apenas utilizadores Matrix</string>
     <string name="people_search_invite_by_id_dialog_title">Convidar utilizador por ID</string>
     <string name="people_search_invite_by_id_dialog_description">Insira um ou mais endereços de e-mail ou IDs Matrix</string>
     <string name="people_search_invite_by_id_dialog_hint">E-mail ou ID Matrix</string>
-    <!--  Chat -->
     <string name="room_menu_search">Pesquisar</string>
     <string name="room_one_user_is_typing">%s está a escrever…</string>
     <string name="room_two_users_are_typing">%1$s e %2$s estão a escrever…</string>
@@ -370,7 +333,6 @@ Tem a certeza?</string>
     <string name="room_delete_unsent_messages">Apagar mensagens não enviadas</string>
     <string name="room_message_file_not_found">Ficheiro não encontrado</string>
     <string name="room_do_not_have_permission_to_post">Não tem permissão para enviar mensagens nesta sala</string>
-    <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Confiar</string>
     <string name="ssl_do_not_trust">Não confiar</string>
     <string name="ssl_logout_account">Sair</string>
@@ -382,7 +344,6 @@ Tem a certeza?</string>
     <string name="ssl_unexpected_existing_expl">O certificado mudou de um que era confiado pelo seu telefone. Isto é ALTAMENTE INVULGAR. Recomendamos que NÃO ACEITE este novo certificado.</string>
     <string name="ssl_expected_existing_expl">O certificado mudou de um que era anteriormente confiável para um que não é confiável. O servidor pode ter renovado o seu certificado. Contacte o administrador do servidor para obter a impressão digital expectável.</string>
     <string name="ssl_only_accept">Apenas aceite o certificado se o administrador do servidor publicou uma impressão digital que corresponde à impressão digital acima.</string>
-    <!-- Room Details -->
     <string name="room_details_title">Detalhes da sala</string>
     <string name="room_details_people">Pessoas</string>
     <string name="room_details_files">Ficheiros</string>
@@ -390,14 +351,12 @@ Tem a certeza?</string>
     <string name="malformed_id">ID mal formatado. Tem que ser um endereço de e-mail ou um ID Matrix como por exemplo \'@utilizador:domínio\'</string>
     <string name="room_details_people_invited_group_name">CONVIDADOS</string>
     <string name="room_details_people_present_group_name">ENTRARAM</string>
-    <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Motivos para denunciar este conteúdo</string>
     <string name="room_event_action_report_prompt_ignore_user">Deseja ocultar todas as mensagens deste utilizador?
 
 Note que esta acção irá reiniciar a aplicação e poderá levar algum tempo.</string>
     <string name="room_event_action_cancel_upload">Cancelar envio</string>
     <string name="room_event_action_cancel_download">Cancelar transferência</string>
-    <!-- Search -->
     <string name="search_hint">Pesquisar</string>
     <string name="search_members_hint">Filtrar membros da sala</string>
     <string name="search_no_results">Nenhum resultado</string>
@@ -405,28 +364,13 @@ Note que esta acção irá reiniciar a aplicação e poderá levar algum tempo.<
     <string name="tab_title_search_messages">MENSAGENS</string>
     <string name="tab_title_search_people">PESSOAS</string>
     <string name="tab_title_search_files">FICHEIROS</string>
-    <!-- Room recents -->
-    <string name="room_recents_join">ENTRAR</string>
-    <string name="room_recents_directory">LISTAGEM</string>
-    <string name="room_recents_favourites">FAVORITOS</string>
-    <string name="room_recents_conversations">SALAS</string>
-    <string name="room_recents_low_priority">BAIXA PRIORIDADE</string>
-    <string name="room_recents_invites">CONVITES</string>
-    <string name="room_recents_start_chat">Iniciar conversa</string>
-    <string name="room_recents_create_room">Criar sala</string>
-    <string name="room_recents_join_room">Entrar na sala</string>
-    <string name="room_recents_join_room_title">Entrar numa sala</string>
-    <string name="room_recents_join_room_prompt">Insira o id ou o pseudónimo da sala</string>
-    <!-- Directory -->
     <string name="directory_search_results_title">Navegar diretório</string>
     <string name="directory_searching_title">A pesquisar o directório…</string>
-    <!-- home room settings -->
     <string name="room_settings_favourite">Adicionar aos favoritos</string>
     <string name="room_settings_de_prioritize">Baixa prioridade</string>
     <string name="room_settings_direct_chat">Conversa direta</string>
     <string name="room_settings_leave_conversation">Deixar a conversa</string>
     <string name="room_settings_forget">Esquecer</string>
-    <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Mensagens</string>
     <string name="room_sliding_menu_settings">Definições</string>
     <string name="room_sliding_menu_version">Versão</string>
@@ -434,7 +378,6 @@ Note que esta acção irá reiniciar a aplicação e poderá levar algum tempo.<
     <string name="room_sliding_menu_third_party_notices">Licenças de terceiros</string>
     <string name="room_sliding_menu_copyright">Direitos de autor</string>
     <string name="room_sliding_menu_privacy_policy">Política de privacidade</string>
-    <!-- Vector Settings -->
     <string name="settings_profile_picture">Imagem do perfil</string>
     <string name="settings_display_name">Nome a apresentar</string>
     <string name="settings_email_address">E-mail</string>
@@ -462,7 +405,6 @@ Note que esta acção irá reiniciar a aplicação e poderá levar algum tempo.<
     <string name="settings_copyright">Direitos de autor</string>
     <string name="settings_privacy_policy">Política de privacidade</string>
     <string name="settings_clear_cache">Limpar cache</string>
-    <!--string name="settings_room_privacy_label">Privacidade</string-->
     <string name="settings_user_settings">Definições de utilizador</string>
     <string name="settings_notifications">Notificações</string>
     <string name="settings_ignored_users">Utilizadores ignorados</string>
@@ -518,37 +460,29 @@ Note que esta acção irá reiniciar a aplicação e poderá levar algum tempo.<
     <string name="settings_phone_number_verification_error_empty_code">Insira o código de ativação</string>
     <string name="settings_phone_number_verification_error">Erro ao validar o seu número de telefone</string>
     <string name="settings_phone_number_code">Código</string>
-    <!-- Room Settings -->
-    <!-- room global settings-->
     <string name="room_settings_room_photo">Foto da sala</string>
     <string name="room_settings_room_name">Nome da sala</string>
     <string name="room_settings_topic">Tópico</string>
     <string name="room_settings_room_tag">Etiqueta da sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetada como:</string>
-    <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Adicionar aos favoritos</string>
     <string name="room_settings_tag_pref_entry_low_priority">Baixa prioridade</string>
     <string name="room_settings_tag_pref_entry_none">Nenhum</string>
-    <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Acesso e visibilidade</string>
     <string name="room_settings_directory_visibility">Listar esta sala no diretório público de salas</string>
     <string name="room_settings_room_access_rules_pref_title">Acesso à sala</string>
     <string name="room_settings_room_read_history_rules_pref_title">Acesso ao histórico da sala</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Quem pode ler o histórico?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Quem pode aceder a esta sala?</string>
-    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Qualquer pessoa</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Apenas membros (a partir do momento em que esta opção foi escolhida)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Apenas membros (desde que foram convidados)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Apenas membros (desde que entraram)</string>
-    <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Para referenciar uma sala, ela necessita de ter um endereço.</string>
     <string name="room_settings_room_access_entry_only_invited">Apenas as pessoas que foram convidadas</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Qualquer pessoa que saiba o endereço da sala, exceto visitantes</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Qualquer pessoa que saiba o endereço da sala, incluindo visitantes</string>
-    <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Utilizadores banidos</string>
-    <!-- advanced -->
     <string name="room_settings_category_advanced_title">Avançadas</string>
     <string name="room_settings_room_internal_id">ID interno desta sala</string>
     <string name="room_settings_addresses_pref_title">Endereços</string>
@@ -559,7 +493,6 @@ Note que esta acção irá reiniciar a aplicação e poderá levar algum tempo.<
     <string name="room_settings_labs_end_to_end_warnings">Precisa sair da sua conta para poder ativar a criptografia.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Cifrar apenas para dispositivos verificados</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Nunca enviar mensagens cifradas para dispositivos não verificados nesta sala a partir deste dispositivo.</string>
-    <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Esta sala não tem endereços locais</string>
     <string name="room_settings_addresses_add_new_address">Novo endereço (por exemplo: #foo:matrix.org)</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Formato inválido de endereço (alias)</string>
@@ -574,11 +507,8 @@ Note que esta acção irá reiniciar a aplicação e poderá levar algum tempo.<
     <string name="room_settings_addresses_e2e_disabled">Criptografia está desativada nesta sala.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Ativar criptografia 
 (atenção: não é possível desativar novamente!)</string>
-    <!-- Directory -->
     <string name="directory_title">Diretório</string>
-    <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s estava a tentar carregar um ponto específico do histórico da sala mas não foi possível encontrá-lo.</string>
-    <!-- encryption dialog -->
     <string name="encryption_information_title">Informação sobre criptografia ponta-a-ponta</string>
     <string name="encryption_information_device_info">Informação do evento</string>
     <string name="encryption_information_user_id">ID do utilizador</string>
@@ -622,21 +552,18 @@ Atenção: este ficheiro poderá ser apagado se a aplicação for desinstalada.<
     <string name="encryption_information_verify_device_warning">Para confirmar que este dispositivo pode ser considerado confiável, entre em contacto com o seu dono usando outros meios (p. ex. pessoalmente ou através de uma chamada telefónica) e pergunte-lhe se a chave que ele vê nas suas Definições de Utilizador para este dispositivo é igual à chave abaixo:</string>
     <string name="encryption_information_verify_device_warning2">Se é igual, clique no botão verificar, abaixo. Se não é igual, então alguém está a interceptar este dispositivo e você poderá querer colocá-lo na lista negra. No futuro, este processo de verificação irá ser mais sofisticado.</string>
     <string name="encryption_information_verify_key_match">Eu confirmo que as chaves são iguais</string>
-    <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">A sala contém dispositivos desconhecidos</string>
     <string name="unknown_devices_alert_message">Esta sala contém dispositivos desconhecidos que não foram verificados.
 Isso significa que não existe a garantia de que estes dispositivos pertencem a quem dizem pertencer.
 Recomendamos que faça o processo de verificação para cada dispositivo antes de continuar, mas você pode reenviar a mensagem sem efetuar a verificação se preferir.
 
 Dispositivos desconhecidos:</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">Selecione um diretório de salas</string>
     <string name="directory_server_fail_to_retrieve_server">O servidor pode estar indisponível ou sobrecarregado</string>
     <string name="directory_server_type_homeserver">Insira um servidor a partir do qual listar as suas salas públicas</string>
     <string name="directory_server_placeholder">URL do servidor (Homeserver)</string>
     <string name="directory_server_all_rooms_on_server">Todas as salas no servidor %s</string>
     <string name="directory_server_native_rooms">Todas as nativas de %s</string>
-    <!-- historical -->
     <string name="historical_placeholder">Procurar histórico</string>
     <string name="settings_keep_media">Manter ficheiros multimédia</string>
     <string name="settings_always_show_timestamps">Mostrar sempre a hora das mensagens</string>
@@ -671,7 +598,6 @@ Dispositivos desconhecidos:</string>
     <string name="widget_creation_failure">Criação de widget falhou</string>
     <string name="settings_labs_create_conference_with_jitsi">Criar chamadas de conferência com o jitsi</string>
     <string name="widget_delete_message_confirmation">Tem a certeza que quer remover o widget?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Não foi possível criar o widget.</string>
     <string name="widget_integration_failed_to_send_request">O envio do pedido falhou.</string>
     <string name="widget_integration_positive_power_level">Nível de utilizador tem que ser um inteiro positivo.</string>
@@ -690,9 +616,9 @@ Dispositivos desconhecidos:</string>
     <string name="title_activity_choose_sticker">Enviar um autocolante</string>
     <string name="dialog_title_third_party_licences">Licenças de terceiros</string>
     <string name="loading">A carregar…</string>
-    <string name="download">Descarregar</string>
-    <string name="speak">Falar</string>
-    <string name="clear">Limpar</string>
+    <string name="action_download">Descarregar</string>
+    <string name="action_speak">Falar</string>
+    <string name="action_clear">Limpar</string>
     <string name="missing_permissions_error">Esta acção não é possível por falta de permissões.</string>
     <string name="action_exit">Sair</string>
     <string name="actions">Acções</string>
@@ -946,7 +872,7 @@ A visibilidade das mensagens no Matrix é parecida com a dos emails. O nosso esq
     <string name="are_you_sure">Tem a certeza?</string>
     <string name="backup">Fazer Backup</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Irá perder acesso as suas mensagens encriptadas, se não fizer backup de suas chaves, antes de abandonar esta página.</string>
-    <string name="stay">Ficar</string>
+    <string name="action_stay">Ficar</string>
     <string name="title_activity_keys_backup_restore">Utilize Backup de chaves</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Se sair desta página, irá perder as suas mensagens encriptadas</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Não quero as minhas mensagens encriptadas</string>
@@ -968,10 +894,10 @@ A visibilidade das mensagens no Matrix é parecida com a dos emails. O nosso esq
     <string name="new_recovery_method_popup_title">Novo Backup de Chaves</string>
     <string name="keys_backup_settings_deleting_backup">Apagando Backup …</string>
     <string name="call_anyway">Ligar na mesma</string>
-    <string name="skip">Passar</string>
+    <string name="action_skip">Passar</string>
     <string name="done">Terminado</string>
-    <string name="abort">Abortar</string>
-    <string name="accept">Aceitar</string>
+    <string name="action_abort">Abortar</string>
+    <string name="action_accept">Aceitar</string>
     <string name="action_sign_out_confirmation_simple">Tem a certeza que quer Sair?</string>
     <string name="keys_backup_settings_delete_confirm_title">Apagar Backup</string>
     <string name="auth_accept_policies">Por favor veja e aceite, apolice para este servidor</string>
diff --git a/vector/src/main/res/values-ro/strings.xml b/vector/src/main/res/values-ro/strings.xml
index 464a590f62..963cd405c0 100644
--- a/vector/src/main/res/values-ro/strings.xml
+++ b/vector/src/main/res/values-ro/strings.xml
@@ -183,12 +183,10 @@
         <item quantity="few">%d camere</item>
         <item quantity="other">%d de camere</item>
     </plurals>
-    <string name="room_recents_conversations">CAMERE</string>
     <string name="tab_title_search_rooms">CAMERE</string>
     <string name="rooms_header">Camere</string>
     <string name="suggested_header">Camere sugerate</string>
     <string name="bottom_action_rooms">Camere</string>
-    <string name="room_recents_favourites">FAVORITE</string>
     <string name="bottom_action_favourites">Favorite</string>
     <string name="settings_preferences">Preferințe</string>
     <string name="medium_email">Adresă de e-mail</string>
@@ -335,10 +333,10 @@
     <string name="space_settings_manage_rooms">Administrează camerele</string>
     <string name="room_participants_action_unignore_title">Revocați ignorarea utilizatorului</string>
     <string name="ongoing_conference_call_video">Video</string>
-    <string name="delete">Șterge</string>
-    <string name="leave">Părăsește</string>
-    <string name="save">Salvează</string>
-    <string name="cancel">Anulează</string>
+    <string name="action_delete">Șterge</string>
+    <string name="action_leave">Părăsește</string>
+    <string name="action_save">Salvează</string>
+    <string name="action_cancel">Anulează</string>
     <string name="title_activity_verify_device">Verificați sesiunea</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Invitația ta. Motivul: %1$s</string>
     <string name="notice_room_invite_no_invitee_with_reason">Invitația trimisă de %1$s. Motivul: %2$s</string>
@@ -389,7 +387,7 @@
     <string name="message_failed_to_upload">A apărut o eroare în timpul incărcării imaginii</string>
     <string name="unable_to_send_message">Nu s-a putut trimite mesajul</string>
     <string name="could_not_redact">Nu se poate redacta</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Dispozitivul expeditorului nu a trimis cheile de decriptare pentru acest mesaj.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Dispozitivul expeditorului nu a trimis cheile de decriptare pentru acest mesaj.</string>
     <string name="notice_room_server_acl_updated_ip_literals_not_allowed">Acum sunt blocate serverele ce au adrese IP ce se potrivesc.</string>
     <string name="notice_room_server_acl_updated_ip_literals_allowed">Acum sunt permise serverele ce au adrese IP ce se potrivesc.</string>
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">Sunt blocate serverele ce au adrese IP ce se potrivesc.</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index ad395de686..20bd6fd55a 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -39,24 +39,16 @@
     <string name="notice_room_third_party_invite">%1$s отправил(а) приглашение %2$s присоединиться к комнате</string>
     <string name="notice_room_third_party_registered_invite">%1$s принял(а) приглашение от %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Невозможно расшифровать: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Устройство отправителя не предоставило нам ключ для расшифровки этого сообщения.</string>
-    <!-- Room Screen -->
+    <string name="notice_crypto_error_unknown_inbound_session_id">Устройство отправителя не предоставило нам ключ для расшифровки этого сообщения.</string>
     <string name="could_not_redact">Не удалось изменить</string>
     <string name="unable_to_send_message">Не удалось отправить сообщение</string>
     <string name="message_failed_to_upload">Не удалось загрузить изображение</string>
-    <!-- general errors -->
     <string name="network_error">Сетевая ошибка</string>
     <string name="matrix_error">Ошибка Matrix</string>
-    <!-- Home Screen -->
-    <!-- Last seen time -->
-    <!-- call events -->
-    <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">В настоящее время невозможно вновь присоединиться к пустой комнате.</string>
-    <!-- medium friendly name -->
     <string name="medium_email">Адрес электронной почты</string>
     <string name="medium_phone_number">Номер телефона</string>
     <string name="summary_user_sent_sticker">%1$s отправил стикер.</string>
-    <!-- Room display name -->
     <string name="room_displayname_invite_from">Приглашение от %s</string>
     <string name="room_displayname_room_invite">Приглашение в комнату</string>
     <string name="room_displayname_two_members">%1$s и %2$s</string>
@@ -286,7 +278,6 @@
     <string name="notice_widget_jitsi_removed">%1$s завершил(а) видеоконференцию</string>
     <string name="notice_widget_jitsi_added_by_you">Вы начали видеоконференцию</string>
     <string name="notice_widget_jitsi_added">%1$s начал(а) видеоконференцию</string>
-    <!-- titles -->
     <string name="title_activity_home">Сообщения</string>
     <string name="title_activity_room">Комната</string>
     <string name="title_activity_settings">Настройки</string>
@@ -295,23 +286,22 @@
     <string name="call_notification_answer">Принять</string>
     <string name="call_notification_reject">Отклонить</string>
     <string name="call_notification_hangup">Завершить звонок</string>
-    <!-- button names -->
     <string name="ok">OK</string>
-    <string name="cancel">Отмена</string>
-    <string name="save">Сохранить</string>
-    <string name="leave">Покинуть</string>
-    <string name="send">Отправить</string>
-    <string name="resend">Повторить отправку</string>
-    <string name="redact">Удалить</string>
-    <string name="quote">Цитировать</string>
-    <string name="share">Поделиться</string>
+    <string name="action_cancel">Отмена</string>
+    <string name="action_save">Сохранить</string>
+    <string name="action_leave">Покинуть</string>
+    <string name="action_send">Отправить</string>
+    <string name="action_resend">Повторить отправку</string>
+    <string name="action_redact">Удалить</string>
+    <string name="action_quote">Цитировать</string>
+    <string name="action_share">Поделиться</string>
     <string name="later">Позже</string>
-    <string name="forward">Переслать</string>
+    <string name="action_forward">Переслать</string>
     <string name="permalink">Копировать ссылку</string>
     <string name="view_source">Просмотр исходного кода</string>
     <string name="view_decrypted_source">Просмотр расшифрованного исходного кода</string>
-    <string name="delete">Удалить</string>
-    <string name="rename">Переименовать</string>
+    <string name="action_delete">Удалить</string>
+    <string name="action_rename">Переименовать</string>
     <string name="report_content">Пожаловаться на содержимое</string>
     <string name="active_call">Активный вызов</string>
     <string name="ongoing_conference_call">Ongoing conference call.
@@ -326,8 +316,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Конференц звонки не поддерживаются в зашифрованных комнатах</string>
     <string name="send_anyway">Все равно отправить</string>
     <string name="or">или</string>
-    <string name="invite">Приглашение</string>
-    <!-- actions -->
+    <string name="action_invite">Приглашение</string>
     <string name="action_sign_out">Выйти из учётной записи</string>
     <string name="action_voice_call">Голосовой вызов</string>
     <string name="action_video_call">Видео вызов</string>
@@ -338,31 +327,25 @@
     <string name="action_open">Открыть</string>
     <string name="action_close">Закрыть</string>
     <string name="copied_to_clipboard">Скопировано в буфер</string>
-    <string name="disable">Отключить</string>
-    <!-- dialog titles -->
+    <string name="action_disable">Отключить</string>
     <string name="dialog_title_confirmation">Подтверждение</string>
     <string name="dialog_title_warning">Предупреждение</string>
-    <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Начало</string>
     <string name="bottom_action_favourites">Избранные</string>
     <string name="bottom_action_people">Люди</string>
     <string name="bottom_action_rooms">Комнаты</string>
-    <!-- Home screen -->
     <string name="home_filter_placeholder_home">Фильтр названия комнаты</string>
     <string name="home_filter_placeholder_favorites">Фильтр избранного</string>
     <string name="home_filter_placeholder_people">Фильтр людей</string>
     <string name="home_filter_placeholder_rooms">Фильтр названия комнаты</string>
-    <!-- Home fragment -->
     <string name="invitations_header">Приглашения</string>
     <string name="low_priority_header">Маловажные</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">Беседы</string>
     <string name="local_address_book_header">Локальные контакты</string>
     <string name="matrix_only_filter">Только Matrix контакты</string>
     <string name="no_conversation_placeholder">Нет диалогов</string>
     <string name="template_no_contact_access_placeholder">Вы не дали доступ ${app_name} к внутренним контактам</string>
     <string name="no_result_placeholder">Нет результатов</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">Комнаты</string>
     <string name="rooms_directory_header">Список комнат</string>
     <string name="no_room_placeholder">Нет комнат</string>
@@ -400,7 +383,6 @@
     <string name="start_video_call">Начать видеовызов</string>
     <string name="option_send_files">Отправить файлы</string>
     <string name="option_take_photo_video">Камера</string>
-    <!-- Authentication -->
     <string name="auth_login">Вход</string>
     <string name="auth_register">Создать аккаунт</string>
     <string name="auth_submit">Отправить</string>
@@ -448,7 +430,6 @@
     <string name="auth_reset_password_success_message">Ваш пароль сброшен. 
 \n
 \nОсуществлен выход на всех сессиях - вы не будете получать push уведомления. Для включения push уведомлений заново войдите на каждом из ваших устройств.</string>
-    <!-- Login Screen -->
     <string name="login_error_must_start_http">URL должен начинаться с http[s]://</string>
     <string name="login_error_network_error">Сбой входа: сетевая ошибка</string>
     <string name="login_error_unable_login">Сбой входа</string>
@@ -463,28 +444,20 @@
     <string name="login_error_limit_exceeded">Отправлено слишком много запросов</string>
     <string name="login_error_user_in_use">Логин уже используется</string>
     <string name="login_error_login_email_not_yet">Вы не перешли по высланной в email ссылке</string>
-    <!-- crypto warnings -->
-    <!-- read receipts list Screen -->
     <string name="read_receipts_list">Чтение списка вступивших</string>
-    <!-- accounts list Screen -->
-    <!-- image size selection -->
     <string name="compression_options">Отправить как</string>
     <string name="compression_opt_list_original">Оригинал</string>
     <string name="compression_opt_list_large">Крупный</string>
     <string name="compression_opt_list_medium">Средний</string>
     <string name="compression_opt_list_small">Мелкий</string>
-    <!-- media upload / download messages -->
     <string name="attachment_cancel_download">"Отменить загрузку?</string>
     <string name="attachment_cancel_upload">Отменить загрузку?</string>
     <string name="attachment_remaining_time_seconds">%d с</string>
     <string name="attachment_remaining_time_minutes">%1$dм %2$dс</string>
-    <!-- room creation dialog Screen -->
     <string name="yesterday">Вчера</string>
     <string name="today">Сегодня</string>
-    <!-- room info dialog Screen -->
     <string name="room_info_room_name">Название комнаты</string>
     <string name="room_info_room_topic">Тема комнаты</string>
-    <!-- call string -->
     <string name="call_connected">Вызов соединён</string>
     <string name="call_connecting">Устанавливается соединение…</string>
     <string name="call_ended">Вызов закончен</string>
@@ -497,10 +470,8 @@
     <string name="call_error_ice_failed">Медиавызов не удался</string>
     <string name="call_error_camera_init_failed">Невозможно инициализировать камеру</string>
     <string name="call_error_answered_elsewhere">Звонок принят на другом устройстве</string>
-    <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Снять фото или видео"</string>
     <string name="media_picker_cannot_record_video">Не удалось записать видео"</string>
-    <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Element Информация</string>
     <string name="template_permissions_rationale_msg_storage">${app_name} нуждается в разрешении на доступ к вашей фото-и видеотеке для отправки и сохранения вложений.
 \n
@@ -517,31 +488,25 @@
 \n
 \nСогласны ли вы поделиться своей адресной книгой для этой цели\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Извините. Действие не выполнено из-за недостаточных разрешений</string>
-    <!-- medias slider string -->
     <string name="media_slider_saved">Сохранено</string>
     <string name="media_slider_saved_message">Сохранить в загрузки?</string>
     <string name="yes">ДА</string>
     <string name="no">НЕТ</string>
     <string name="_continue">Продолжить</string>
-    <!-- Actions -->
-    <string name="remove">Удалить</string>
-    <string name="join">Присоединиться</string>
-    <string name="preview">Просмотр</string>
-    <string name="reject">Отклонить</string>
-    <!-- Room -->
+    <string name="action_remove">Удалить</string>
+    <string name="action_join">Присоединиться</string>
+    <string name="action_preview">Просмотр</string>
+    <string name="action_reject">Отклонить</string>
     <string name="room_jump_to_first_unread">Перейти к непрочитанному</string>
-    <!-- Room Preview -->
     <string name="room_preview_invitation_format">%s пригласил вас присоединиться к этой комнате</string>
     <string name="room_preview_unlinked_email_warning">Приглашение пришло на адрес %s, который не связан с этим аккаунтом.
 \nВозможно, вы захотите войти в систему с другим аккаунтом или добавить этот email в свою учетную запись.</string>
     <string name="room_preview_try_join_an_unknown_room">Вы пытаетесь получить доступ к %s. Хотите присоединиться к обсуждению?</string>
     <string name="room_preview_try_join_an_unknown_room_default">комната</string>
     <string name="room_preview_room_interactions_disabled">Это пред. просмотр комнаты. Вы в режиме только чтения.</string>
-    <!-- Chat creation -->
     <string name="room_creation_title">Новый чат</string>
     <string name="room_creation_add_member">Добавить участника</string>
     <string name="room_title_one_member">1 пользователь</string>
-    <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Покинуть комнату</string>
     <string name="room_participants_leave_prompt_msg">Вы уверены, что хотите выйти из комнаты\?</string>
     <string name="room_participants_remove_prompt_msg">Вы уверены, что хотите исключить %s из чата?</string>
@@ -569,14 +534,12 @@
     <string name="room_participants_power_level_prompt">Вы не сможете отменить это действие, поскольку пользователь получит такой же уровень доступа, как и у вас. 
 \nВы уверены\?</string>
     <string name="room_participants_invite_prompt_msg">"Вы уверены что хотите пригласить %s в этот чат?"</string>
-    <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Пригласить по ID</u></string>
     <string name="people_search_local_contacts">Локальные Контакты (%d)</string>
     <string name="people_search_filter_text">Только зарегистрированные</string>
     <string name="people_search_invite_by_id_dialog_title">Пригласить пользователя по ID</string>
     <string name="people_search_invite_by_id_dialog_description">Пожалуйста, введите один или несколько адресов email или Matrix ID</string>
     <string name="people_search_invite_by_id_dialog_hint">Email или Matrix ID</string>
-    <!--  Chat -->
     <string name="room_menu_search">Поиск</string>
     <string name="room_one_user_is_typing">%s печатает…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s печатают…</string>
@@ -592,7 +555,6 @@
     <string name="room_delete_unsent_messages">Удалить неотправленные сообщения</string>
     <string name="room_message_file_not_found">Файл не найден</string>
     <string name="room_do_not_have_permission_to_post">У вас нет прав писать сообщения в этом чате.</string>
-    <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Доверять</string>
     <string name="ssl_do_not_trust">Не доверять</string>
     <string name="ssl_logout_account">Выйти</string>
@@ -604,7 +566,6 @@
     <string name="ssl_unexpected_existing_expl">Сертификат сервера изменился и ваш телефон теперь ему не доверяет. Это ОЧЕНЬ ПОДОЗРИТЕЛЬНО. Рекомендуется, НЕ ДОВЕРЯТЬ этому новому сертификату.</string>
     <string name="ssl_expected_existing_expl">Сертификат изменился с ранее доверенного на недействительный. Возможно, сервер обновил свой сертификат. Свяжитесь с администратором сервера для получения ожидаемого отпечатка сертификата.</string>
     <string name="ssl_only_accept">Примите сертификат только если администратор сервера опубликовал отпечаток сертификата, который соответствует указанному выше.</string>
-    <!-- Room Details -->
     <string name="room_details_title">Подробности комнаты</string>
     <string name="room_details_people">Люди</string>
     <string name="room_details_files">Файлы</string>
@@ -612,14 +573,12 @@
     <string name="malformed_id">Некорректный ID. Используйте email или Matrix ID вида \'@localpart:domain\'</string>
     <string name="room_details_people_invited_group_name">ПРИГЛАШЕНЫ</string>
     <string name="room_details_people_present_group_name">ПРИСОЕДИНИЛИСЬ</string>
-    <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Причина отчета о контенте</string>
     <string name="room_event_action_report_prompt_ignore_user">Вы хотите скрыть все сообщения этого пользователя\? 
 \n
 \nУчтите, что это действие перезапустит приложение и может занять некоторое время.</string>
     <string name="room_event_action_cancel_upload">Отменить загрузку</string>
     <string name="room_event_action_cancel_download">Отменить загрузку</string>
-    <!-- Search -->
     <string name="search_hint">Поиск</string>
     <string name="search_members_hint">Фильтр списка пользователей</string>
     <string name="search_no_results">Нет результатов</string>
@@ -627,28 +586,13 @@
     <string name="tab_title_search_messages">СООБЩЕНИЯ</string>
     <string name="tab_title_search_people">ЛЮДИ</string>
     <string name="tab_title_search_files">ФАЙЛЫ</string>
-    <!-- Room recents -->
-    <string name="room_recents_join">ПРИСОЕДИНИЛИСЬ</string>
-    <string name="room_recents_directory">КАТАЛОГ</string>
-    <string name="room_recents_favourites">ИЗБРАННОЕ</string>
-    <string name="room_recents_conversations">КОМНАТЫ</string>
-    <string name="room_recents_low_priority">МАЛОВАЖНЫЕ</string>
-    <string name="room_recents_invites">ПРИГЛАШЕНИЯ</string>
-    <string name="room_recents_start_chat">Начать чат</string>
-    <string name="room_recents_create_room">Создать комнату</string>
-    <string name="room_recents_join_room">Войти в комнату</string>
-    <string name="room_recents_join_room_title">Войти в комнату</string>
-    <string name="room_recents_join_room_prompt">Введите ID комнаты или псевдоним</string>
-    <!-- Directory -->
     <string name="directory_search_results_title">Просмотр каталога</string>
     <string name="directory_searching_title">Поиск в каталоге…</string>
-    <!-- home room settings -->
     <string name="room_settings_favourite">Избранное</string>
     <string name="room_settings_de_prioritize">Уменьшить приоритет</string>
     <string name="room_settings_direct_chat">Прямой чат</string>
     <string name="room_settings_leave_conversation">Покинуть обсуждение</string>
     <string name="room_settings_forget">Забыть</string>
-    <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Сообщения</string>
     <string name="room_sliding_menu_settings">Настройки</string>
     <string name="room_sliding_menu_version">Версия</string>
@@ -656,7 +600,6 @@
     <string name="room_sliding_menu_third_party_notices">Прочие уведомления</string>
     <string name="room_sliding_menu_copyright">Авторские права</string>
     <string name="room_sliding_menu_privacy_policy">Политика конфиденциальности</string>
-    <!-- Vector Settings -->
     <string name="settings_profile_picture">Аватар</string>
     <string name="settings_display_name">Отображаемое имя</string>
     <string name="settings_email_address">Email</string>
@@ -684,7 +627,6 @@
     <string name="settings_copyright">Авторские права</string>
     <string name="settings_privacy_policy">Политика конфиденциальности</string>
     <string name="settings_clear_cache">Очистить весь кэш</string>
-    <!--string name="settings_room_privacy_label">Privacy</string-->
     <string name="settings_user_settings">Параметры пользователя</string>
     <string name="settings_notifications">Уведомления</string>
     <string name="settings_ignored_users">Игнорируемые</string>
@@ -740,37 +682,29 @@
     <string name="settings_phone_number_verification_error_empty_code">Введите код активации</string>
     <string name="settings_phone_number_verification_error">Ошибка проверки телефона</string>
     <string name="settings_phone_number_code">Код</string>
-    <!-- Room Settings -->
-    <!-- room global settings-->
     <string name="room_settings_room_photo">Аватар комнаты</string>
     <string name="room_settings_room_name">Название комнаты</string>
     <string name="room_settings_topic">Тема</string>
     <string name="room_settings_room_tag">Метки комнаты</string>
     <string name="room_settings_tag_pref_dialog_title">Отмечено как:</string>
-    <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Избранное</string>
     <string name="room_settings_tag_pref_entry_low_priority">Маловажные</string>
     <string name="room_settings_tag_pref_entry_none">Нет</string>
-    <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Доступность и видимость</string>
     <string name="room_settings_directory_visibility">Отображать комнату в каталоге</string>
     <string name="room_settings_room_access_rules_pref_title">Доступ к комнате</string>
     <string name="room_settings_room_read_history_rules_pref_title">Доступ к истории комнаты</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Кто может читать историю?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Кто имеет доступ к комнате?</string>
-    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Все</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Только участники (с момента выбора этой опции)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Только участники (с момента приглашения)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Только участники (с момента присоединения)</string>
-    <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Для генерации ссылки команда должна иметь адрес.</string>
     <string name="room_settings_room_access_entry_only_invited">Только приглашенные</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Все у кого есть ссылка на комнату, кроме гостей</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Все у кого есть ссылка на комнату, включая гостей</string>
-    <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Забаненные пользователи</string>
-    <!-- advanced -->
     <string name="room_settings_category_advanced_title">Дополнительно</string>
     <string name="room_settings_room_internal_id">Внутренний ID комнаты</string>
     <string name="room_settings_addresses_pref_title">Адреса</string>
@@ -781,7 +715,6 @@
     <string name="room_settings_labs_end_to_end_warnings">Вам необходимо выйти, чтобы включить шифрование.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Шифровать сообщения только для проверенных сессий</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Никогда не отправлять шифрованное сообщение на непроверенные сессии в этой комнате с этой сессии.</string>
-    <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">У этой комнаты еще нет локального адреса</string>
     <string name="room_settings_addresses_add_new_address">Новый адрес (например #foo:matrix.org")</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Неверный формат псевдонима</string>
@@ -796,11 +729,8 @@
     <string name="room_settings_addresses_e2e_disabled">В этой комнате выключено шифрование.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Включить шифрование
 \n(внимание: не может быть снова отключено!)</string>
-    <!-- Directory -->
     <string name="directory_title">Каталог</string>
-    <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s пытается загрузить историю комнаты, но не может ее найти.</string>
-    <!-- encryption dialog -->
     <string name="encryption_information_title">Информация о сквозном шифровании</string>
     <string name="encryption_information_device_info">Информация о событии</string>
     <string name="encryption_information_user_id">ID пользователя</string>
@@ -844,21 +774,18 @@
     <string name="encryption_information_verify_device_warning">Чтобы убедиться, что этой сессии можно доверять, обратитесь к его владельцу, используя другие способы (например, лично или по телефону), и спросите, соответствует ли ключ, который он видит в настройках для этой сессии:</string>
     <string name="encryption_information_verify_device_warning2">Если совпадает, то нажмите кнопку подтвердить ниже. Если не совпадает, возможно кто-то пытается перехватить сессию и вы захотите добавить его в черный список. В будущем данный процесс будет улучшен.</string>
     <string name="encryption_information_verify_key_match">Я проверил, что ключи совпадают</string>
-    <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Комната содержит неизвестные сессии</string>
     <string name="unknown_devices_alert_message">Эта комната содержит неизвестные сессии, которые не были подтверждены. 
 \nЭто означает, что эти сессии могут не принадлежать тем пользователям, на которых они претендуют. 
 \nПеред продолжением рекомендуем вам пройти процесс проверки для каждой сессии, но вы можете отправить сообщение повторно, не проверяя.
 \n
 \nНеизвестные сессии:</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">Выбор списка комнат</string>
     <string name="directory_server_fail_to_retrieve_server">Сервер возможно недоступен или перегружен</string>
     <string name="directory_server_type_homeserver">Введите домашний сервер для отображения списка публичных комнат</string>
     <string name="directory_server_placeholder">Имя сервера</string>
     <string name="directory_server_all_rooms_on_server">Все комнаты на сервере %s</string>
     <string name="directory_server_native_rooms">Все местные комнаты %s</string>
-    <!-- historical -->
     <string name="historical_placeholder">Поиск в истории</string>
     <string name="settings_user_interface">Пользовательский интерфейс</string>
     <string name="settings_interface_language">Язык</string>
@@ -893,7 +820,6 @@
     <string name="widget_creation_failure">Создание виджета не удалось</string>
     <string name="settings_labs_create_conference_with_jitsi">Осуществлять конференц звонки через Jitsi</string>
     <string name="widget_delete_message_confirmation">Вы уверены, что хотите удалить виджет из этой комнаты?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Не удалось создать виджет.</string>
     <string name="widget_integration_failed_to_send_request">Не удалось отправить запрос.</string>
     <string name="widget_integration_positive_power_level">Уровень доступа должен быть числом больше 0.</string>
@@ -919,14 +845,11 @@
     <string name="option_take_video">Снять видео</string>
     <string name="settings_analytics">Аналитика</string>
     <string name="settings_labs_native_camera">Использовать встроенную камеру</string>
-    <!-- share keys -->
     <string name="title_activity_bug_report">Сообщить об ошибке</string>
     <string name="conference_call_warning_title">Внимание!</string>
     <string name="conference_call_warning_message">Конференц-связь находится в разработке и может быть ненадежной.</string>
-    <!-- slash commands -->
     <string name="command_error">Ошибка команды</string>
     <string name="unrecognized_command">Нераспознанная команда: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Выкл</string>
     <string name="notification_noisy">Громко</string>
     <string name="encrypted_message">Зашифрованное сообщение</string>
@@ -960,7 +883,6 @@
     <string name="community_name_hint">Пример</string>
     <string name="community_id">ID сообщества</string>
     <string name="community_id_hint">пример</string>
-    <!-- group details -->
     <string name="group_details_home">Начало</string>
     <string name="group_details_people">Люди</string>
     <string name="group_details_rooms">Комнаты</string>
@@ -1000,7 +922,6 @@
         <item quantity="many">%d активных виджетов</item>
         <item quantity="other"/>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="avatar">Аватар</string>
     <plurals name="room_header_active_members_count">
         <item quantity="one">%d активный участник</item>
@@ -1086,9 +1007,9 @@
 \n
 \nВидимость сообщений в Matrix похожа на электронную почту. Удаление ваших сообщений означает, что отправленные вами сообщения не будут показаны новым или не зарегистрированным пользователям, но те пользователи, которые уже получили эти сообщения - по прежнему будут их видеть.</string>
     <string name="dialog_title_third_party_licences">Лицензии сторонних производителей</string>
-    <string name="download">Скачать</string>
-    <string name="speak">Говорить</string>
-    <string name="clear">Очистить</string>
+    <string name="action_download">Скачать</string>
+    <string name="action_speak">Говорить</string>
+    <string name="action_clear">Очистить</string>
     <string name="e2e_re_request_encryption_key">Перезапросить ключи шифрования у других ваших сессий.</string>
     <string name="e2e_re_request_encryption_key_sent">Отправлен запрос ключа.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Запрос отправлен</string>
@@ -1216,7 +1137,7 @@
     <string name="show_info_area_always">Всегда</string>
     <string name="show_info_area_messages_and_errors">Для сообщений и ошибок</string>
     <string name="show_info_area_only_errors">Только для ошибок</string>
-    <string name="accept">Принимаю</string>
+    <string name="action_accept">Принимаю</string>
     <string name="settings_troubleshoot_diagnostic">Результаты диагностики</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Запустить тесты</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Выполняется… (%1$d из %2$d)</string>
@@ -1296,7 +1217,7 @@
     <string name="title_activity_keys_backup_setup">Резервное копирование ключей</string>
     <string name="title_activity_keys_backup_restore">Используйте резервную копию ключа</string>
     <string name="keys_backup_is_not_finished_please_wait">Резервное копирование ключей не завершено, пожалуйста, подождите…</string>
-    <string name="skip">Пропустить</string>
+    <string name="action_skip">Пропустить</string>
     <string name="done">Готово</string>
     <string name="settings_notification_advanced">Расширенные настройки уведомлений</string>
     <string name="settings_notification_by_event">Значение уведомления по событию</string>
@@ -1396,8 +1317,8 @@
     <string name="are_you_sure">Уверены?</string>
     <string name="backup">Создание резервной копии</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Сделайте резервную копию ваших ключей или потеряете доступ к вашим зашифрованным сообщениям.</string>
-    <string name="stay">Остаться</string>
-    <string name="abort">Прервать</string>
+    <string name="action_stay">Остаться</string>
+    <string name="action_abort">Прервать</string>
     <string name="action_sign_out_confirmation_simple">Уверены, что хотите выйти?</string>
     <string name="error_empty_field_enter_user_name">Пожалуйста, введите имя пользователя.</string>
     <string name="keys_backup_setup_step1_advanced">(Расширенный)</string>
@@ -1445,7 +1366,7 @@
     <string name="keys_backup_restoring_importing_keys_waiting_message">Импортирование ключей…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Скачивание ключей…</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Вычисление ключа восстановления…</string>
-    <string name="ignore">Игнорировать</string>
+    <string name="action_ignore">Игнорировать</string>
     <string name="notification_sync_init">Инициализация сервиса</string>
     <string name="action_mark_room_read">Отметить как прочитанное</string>
     <string name="auth_login_sso">Войти с помощью единого входа</string>
@@ -1558,8 +1479,8 @@
     <string name="room_list_rooms_empty_title">Комнаты</string>
     <string name="room_list_rooms_empty_body">Здесь будут отображаться ваши комнаты. Коснитесь + внизу справа, чтобы найти существующие или создать свои.</string>
     <string name="title_activity_emoji_reaction_picker">Реакции</string>
-    <string name="reactions_agree">Принять</string>
-    <string name="reactions_like">Нравиться</string>
+    <string name="action_agree">Принять</string>
+    <string name="action_like">Нравиться</string>
     <string name="message_add_reaction">Добавить реакцию</string>
     <string name="message_view_reaction">Просмотреть реакции</string>
     <string name="settings_integration_manager">Менеджер интеграции</string>
@@ -1639,8 +1560,8 @@
     <string name="direct_room_filter_hint">Фильтр по имени пользователя или ID…</string>
     <string name="joining_room">Присоединение к комнате…</string>
     <string name="message_view_edit_history">История изменений</string>
-    <string name="review">Обзор</string>
-    <string name="decline">Отклонить</string>
+    <string name="action_review">Обзор</string>
+    <string name="action_decline">Отклонить</string>
     <string name="widget_integration_review_terms">Для продолжения Вам необходимо принять Условия данного сервиса.</string>
     <string name="settings_push_rules_no_rules">Правила push-уведомлений не определены</string>
     <string name="settings_push_gateway_no_pushers">Нет зарегистрированных push-шлюзов</string>
@@ -1650,8 +1571,8 @@
     <string name="terms_description_for_integration_manager">Используйте ботов, мосты, виджеты и стикеры</string>
     <string name="read_at">Читать в</string>
     <string name="none">Никто</string>
-    <string name="revoke">Отмена</string>
-    <string name="disconnect">Отключить</string>
+    <string name="action_revoke">Отмена</string>
+    <string name="action_disconnect">Отключить</string>
     <string name="people_no_identity_server">Сервер идентификации не настроен.</string>
     <string name="call_failed_no_ice_title">Звонок не состоялся из-за неправильно настроенного сервера</string>
     <string name="call_failed_no_ice_description">Попросите администратора вашего домашнего сервера (%1$s) настроить TURN сервер, чтобы звонки работали надежно.
@@ -1996,8 +1917,8 @@
 \n
 \nПожалуйста, разрешите доступ в следующем всплывающем окне, чтобы экспортировать ключи вручную.</string>
     <string name="no_network_indicator">Нет подключения к сети</string>
-    <string name="play_video">Воспроизвести</string>
-    <string name="pause_video">Приостановить</string>
+    <string name="action_play">Воспроизвести</string>
+    <string name="action_pause">Приостановить</string>
     <string name="action_copy">Копировать</string>
     <string name="dialog_title_success">Выполнено</string>
     <string name="bottom_action_notification">Уведомления</string>
@@ -2020,7 +1941,7 @@
     <string name="return_to_call">Вернуться к звонку</string>
     <string name="room_participants_action_cancel_invite">Отменить приглашение</string>
     <string name="room_participants_power_level_demote_warning_title">Снизить собственные полномочия\?</string>
-    <string name="dismiss">Отклонить</string>
+    <string name="action_dismiss">Отклонить</string>
     <string name="room_participants_power_level_demote_warning_prompt">Вы не сможете отменить это изменение, поскольку вы понижаете себя в должности, а если вы последний привилегированный пользователь в комнате, то восстановить привилегии будет невозможно.</string>
     <string name="room_participants_power_level_demote">Понизить</string>
     <string name="room_participants_action_ignore_title">Игнорировать пользователя</string>
@@ -2232,17 +2153,6 @@
     <string name="not_trusted">Недоверенные</string>
     <string name="verification_profile_device_verified_because">Эта сессия является доверенной для безопасного обмена сообщениями, так как %1$s (%2$s) проверил(а) его:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) вошел(ла), используя новую сессию:</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d голос</item>
-        <item quantity="few">%d голоса</item>
-        <item quantity="many">%d голосов</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d голос - финальные результаты</item>
-        <item quantity="few">%d голоса - финальные результаты</item>
-        <item quantity="many">%d голосов - финальные результаты</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Выберите вариант</string>
     <string name="command_description_poll">Создать простой опрос</string>
     <string name="new_signin">Новый вход</string>
     <string name="verification_profile_device_untrust_info">Пока этот пользователь не доверяет этой сессии, сообщения, отправленные в обе стороны, помечаются предупреждениями. Кроме того, вы можете подтвердить сессию вручную.</string>
@@ -2346,7 +2256,7 @@
 \n${app_name} для ПК</string>
     <string name="template_app_ios_android">${app_name} для iOS
 \n${app_name} для Android</string>
-    <string name="or_other_mx_capabale_client">или другой, поддерживаемый кросс-подпись Matrix клиент</string>
+    <string name="or_other_mx_capable_client">или другой, поддерживаемый кросс-подпись Matrix клиент</string>
     <string name="command_description_discard_session">Принудительно отбрасывает текущую групповую сессию для отправки сообщений в зашифрованную комнату</string>
     <string name="enter_secret_storage_passphrase_or_key">Чтобы продолжить, используйте ваш %1$s или используйте ваш %2$s.</string>
     <string name="use_recovery_key">Используйте ключ восстановления</string>
@@ -2508,7 +2418,6 @@
     <string name="settings_show_room_member_state_events">Показать события статуса участников комнаты</string>
     <string name="settings_show_room_member_state_events_summary">Включает в себя события приглашения/ присоединения/выхода/исключения/бана и изменение аватара/отображаемого имени.</string>
     <string name="sent_a_poll">Голосование</string>
-    <string name="sent_a_bot_buttons">Кнопки бота</string>
     <string name="sent_a_reaction">Отреагировал: %s</string>
     <string name="sent_verification_conclusion">Результат проверки</string>
     <string name="universal_link_malformed">Ссылка была искажена</string>
@@ -2558,7 +2467,7 @@
     <string name="search_banned_user_hint">Фильтр заблокированных пользователей</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">У вас нет разрешения на запуск звонка</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">У вас нет разрешения на запуск конференции</string>
-    <string name="reset">Сброс</string>
+    <string name="action_reset">Сброс</string>
     <plurals name="secure_backup_reset_devices_you_can_verify">
         <item quantity="one">Показать устройство, которое вы можете проверить сейчас</item>
         <item quantity="few">Показать %d устройства, которые вы можете проверить сейчас</item>
@@ -2890,7 +2799,7 @@
     <string name="invite_to_space_with_name_desc">Они смогут изучить %s</string>
     <string name="invite_to_space_with_name">Пригласить в %s</string>
     <string name="invite_by_link">Поделиться ссылкой</string>
-    <string name="invite_by_mxid">Пригласить по имени пользователя</string>
+    <string name="invite_by_username">Пригласить по имени пользователя</string>
     <string name="invite_by_email">Пригласить по электронной почте</string>
     <string name="invite_people_to_your_space_desc">На данный момент здесь только вы. С другими в %s будет ещё лучше.</string>
     <string name="invite_to_space">Пригласить в %s</string>
@@ -3116,7 +3025,7 @@
     <string name="discovery_invite">Приглашение по электронной почте, поиск контактов и многое другое…</string>
     <string name="finish_setting_up_discovery">Завершите настройку обнаружения.</string>
     <string name="create_space_identity_server_info_none">В настоящее время вы не используете сервер идентификации. Чтобы приглашать членов команды и быть доступным для них, настройте один из них ниже.</string>
-    <string name="invite_by_mxid_or_mail">Приглашение по имени пользователя или по почте</string>
+    <string name="invite_by_username_or_mail">Приглашение по имени пользователя или по почте</string>
     <string name="create_spaces_invite_public_header_desc">Убедитесь, что нужные люди имеют доступ к %s. Вы можете пригласить больше людей позже.</string>
     <string name="create_spaces_invite_public_header">Кто ваши члены команды\?</string>
     <string name="command_description_add_to_space">Добавить в данное пространство</string>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 8c5d9d1be8..138cf6af07 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -39,7 +39,7 @@
     <string name="notice_room_third_party_invite">%1$s pozval/a %2$s vstúpiť do miestnosti</string>
     <string name="notice_room_third_party_registered_invite">%1$s prijal/a pozvanie pre %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Nie je možné dešifrovať: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Zo zariadenia odosieľateľa nebolo možné získať kľúče potrebné na dešifrovanie tejto správy.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Zo zariadenia odosieľateľa nebolo možné získať kľúče potrebné na dešifrovanie tejto správy.</string>
     <string name="could_not_redact">Nie je možné vymazať</string>
     <string name="unable_to_send_message">Nie je možné odoslať správu</string>
     <string name="message_failed_to_upload">Nepodarilo sa nahrať obrázok</string>
@@ -221,21 +221,21 @@
     <string name="title_activity_member_details">Podrobnosti o členovi</string>
     <string name="title_activity_historical">Historické</string>
     <string name="ok">OK</string>
-    <string name="cancel">Zrušiť</string>
-    <string name="save">Uložiť</string>
-    <string name="leave">Opustiť</string>
-    <string name="send">Odoslať</string>
-    <string name="resend">Odoslať znovu</string>
-    <string name="redact">Vymazať</string>
-    <string name="quote">Citovať</string>
-    <string name="share">Zdieľať</string>
+    <string name="action_cancel">Zrušiť</string>
+    <string name="action_save">Uložiť</string>
+    <string name="action_leave">Opustiť</string>
+    <string name="action_send">Odoslať</string>
+    <string name="action_resend">Odoslať znovu</string>
+    <string name="action_redact">Vymazať</string>
+    <string name="action_quote">Citovať</string>
+    <string name="action_share">Zdieľať</string>
     <string name="later">Neskôr</string>
-    <string name="forward">Preposlať</string>
+    <string name="action_forward">Preposlať</string>
     <string name="permalink">Trvalý odkaz</string>
     <string name="view_source">Zobraziť zdroj</string>
     <string name="view_decrypted_source">Zobraziť dešifrovaný zdroj</string>
-    <string name="delete">Vymazať</string>
-    <string name="rename">Premenovať</string>
+    <string name="action_delete">Vymazať</string>
+    <string name="action_rename">Premenovať</string>
     <string name="report_content">Nahlásiť obsah</string>
     <string name="active_call">Aktívny hovor</string>
     <string name="ongoing_conference_call">Prebiehajúci konferenčný hovor.
@@ -250,7 +250,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Konferenčné hovory nie sú podporované v šifrovaných miestnostiach</string>
     <string name="send_anyway">Napriek tomu odoslať</string>
     <string name="or">alebo</string>
-    <string name="invite">Pozvanie</string>
+    <string name="action_invite">Pozvanie</string>
     <string name="offline">Nedostupný</string>
     <string name="action_sign_out">Odhlásiť sa</string>
     <string name="action_voice_call">Audio hovor</string>
@@ -262,7 +262,7 @@
     <string name="action_open">Otvoriť</string>
     <string name="action_close">Zavrieť</string>
     <string name="copied_to_clipboard">Skopírované do schránky</string>
-    <string name="disable">Zakázať</string>
+    <string name="action_disable">Zakázať</string>
     <string name="dialog_title_confirmation">Potvrdenie</string>
     <string name="dialog_title_warning">Upozornenie</string>
     <string name="bottom_action_home">Domov</string>
@@ -433,10 +433,10 @@
     <string name="yes">ÁNO</string>
     <string name="no">NIE</string>
     <string name="_continue">Pokračovať</string>
-    <string name="remove">Odstrániť</string>
-    <string name="join">Vstúpiť</string>
-    <string name="preview">Zobraziť náhľad</string>
-    <string name="reject">Odmietnuť</string>
+    <string name="action_remove">Odstrániť</string>
+    <string name="action_join">Vstúpiť</string>
+    <string name="action_preview">Zobraziť náhľad</string>
+    <string name="action_reject">Odmietnuť</string>
     <string name="room_jump_to_first_unread">Preskočiť na neprečítanú správu</string>
     <string name="room_preview_invitation_format">Používateľ %s vás pozval vstúpiť do tejto miestnosti</string>
     <string name="room_preview_unlinked_email_warning">Toto pozvanie bolo odoslané na emailovú adresu %s, ktorá nie je priradená k tomuto účtu.
@@ -527,17 +527,6 @@
     <string name="tab_title_search_messages">SPRÁVY</string>
     <string name="tab_title_search_people">ĽUDIA</string>
     <string name="tab_title_search_files">SÚBORY</string>
-    <string name="room_recents_join">VSTÚPIŤ</string>
-    <string name="room_recents_directory">ADRESÁR</string>
-    <string name="room_recents_favourites">OBĽÚBENÉ</string>
-    <string name="room_recents_conversations">MIESTNOSTI</string>
-    <string name="room_recents_low_priority">NÍZKA PRIORITA</string>
-    <string name="room_recents_invites">POZVANIA</string>
-    <string name="room_recents_start_chat">Začať konverzáciu</string>
-    <string name="room_recents_create_room">Vytvoriť miestnosť</string>
-    <string name="room_recents_join_room">Vstúpiť do miestnosti</string>
-    <string name="room_recents_join_room_title">Vstúpiť do miestnosti</string>
-    <string name="room_recents_join_room_prompt">Zadajte alias alebo ID miestnosti</string>
     <string name="directory_search_results_title">Prezrieť adresár</string>
     <string name="directory_searching_title">Vyhľadávanie v adresári…</string>
     <string name="room_settings_favourite">Do obľúbených</string>
@@ -768,7 +757,6 @@
     <string name="widget_creation_failure">Nie je možné vytvoriť widget</string>
     <string name="settings_labs_create_conference_with_jitsi">Konferenčné hovory uskutočňovať použitím jitsi</string>
     <string name="widget_delete_message_confirmation">Ste si istí, že chcete odstrániť widget z tejto miestnosti?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Nie je možné vytvoriť widget.</string>
     <string name="widget_integration_failed_to_send_request">Nepodarilo sa odoslať požiadavku.</string>
     <string name="widget_integration_positive_power_level">Úroveň moci musí byť kladné celé číslo.</string>
@@ -778,7 +766,6 @@
     <string name="widget_integration_missing_user_id">V požiadavke chýba user_id.</string>
     <string name="widget_integration_room_not_visible">Miestnosť %s nie je viditeľná.</string>
     <string name="room_add_matrix_apps">Pridať Matrix aplikácie</string>
-    <!-- share keys -->
     <string name="you_added_a_new_device">Pridali ste novú reláciu \'%s\', ktorá požaduje šifrovacie kľúče.</string>
     <string name="your_unverified_device_requesting">Vaša neoverená relácia \'%s\' požaduje šifrovacie kľúče.</string>
     <string name="start_verification">Spustiť overenie</string>
@@ -791,13 +778,10 @@
     <string name="option_take_video">Poslať video</string>
     <string name="settings_analytics">Štatistika</string>
     <string name="settings_labs_native_camera">Používať vstavaný fotoaparát a kameru</string>
-    <!-- share keys -->
     <string name="conference_call_warning_title">Upozornenie!</string>
     <string name="conference_call_warning_message">Konferenčné hovory sú stále vo vývoji a nemusia byť úplne spoľahlivé.</string>
-    <!-- slash commands -->
     <string name="command_error">Chybný príkaz</string>
     <string name="unrecognized_command">Nerozpoznaný príkaz: %s</string>
-    <!-- notification statuses -->
     <string name="notification_off">Vypnuté</string>
     <string name="notification_noisy">Hlasné</string>
     <string name="encrypted_message">Šifrovaná správa</string>
@@ -833,7 +817,6 @@
     <string name="community_name_hint">Príklad</string>
     <string name="community_id">ID komunity</string>
     <string name="community_id_hint">príklad</string>
-    <!-- group details -->
     <string name="group_details_home">Domov</string>
     <string name="group_details_people">Ľudia</string>
     <string name="group_details_rooms">Miestnosti</string>
@@ -905,7 +888,6 @@
         <item quantity="few">%d aktívne widgety</item>
         <item quantity="other">%d aktívnych widgetov</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="receipt_avatar">Potvrdenie o prečítaní</string>
     <string name="notice_avatar">Obrázok oznámenia</string>
     <string name="avatar">Obrázok</string>
@@ -947,9 +929,9 @@
     <string name="deactivate_account_prompt_password">Aby ste mohli pokračovať, prosím zadajte svoje heslo:</string>
     <string name="deactivate_account_submit">Deaktivovať účet</string>
     <string name="dialog_title_third_party_licences">Licencie tretích strán</string>
-    <string name="download">Stiahnuť</string>
-    <string name="speak">Hovoriť</string>
-    <string name="clear">Vymazať</string>
+    <string name="action_download">Stiahnuť</string>
+    <string name="action_speak">Hovoriť</string>
+    <string name="action_clear">Vymazať</string>
     <string name="e2e_re_request_encryption_key_sent">Žiadosť o šifrovacie kľúče bola odoslaná.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Žiadosť odoslaná</string>
     <string name="lock_screen_hint">Píšte sem…</string>
@@ -1054,7 +1036,7 @@
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
     <string name="call_anyway">Napriek tomu zavolať</string>
-    <string name="accept">Prijať</string>
+    <string name="action_accept">Prijať</string>
     <string name="auth_accept_policies">Prosím prečítajte si a odsúhlaste zmluvné podmienky tohoto domovského servera:</string>
     <string name="settings_call_category">Hovory</string>
     <string name="template_settings_call_ringtone_use_app_ringtone">Použiť predvolené zvonenie ${app_name} pre prichádzajúce hovory</string>
@@ -1160,11 +1142,11 @@
     <string name="are_you_sure">Ste si istí\?</string>
     <string name="backup">Zálohovať</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Skôr než sa odhlásite, zálohujte si šifrovacie kľúče, inak prídete o prístup k zašifrovaným správam.</string>
-    <string name="stay">Zostať</string>
-    <string name="skip">Vynechať</string>
+    <string name="action_stay">Zostať</string>
+    <string name="action_skip">Vynechať</string>
     <string name="done">Hotovo</string>
-    <string name="abort">Prerušiť</string>
-    <string name="ignore">Ignorovať</string>
+    <string name="action_abort">Prerušiť</string>
+    <string name="action_ignore">Ignorovať</string>
     <string name="action_sign_out_confirmation_simple">Ste si istí, že sa chcete odhlásiť\?</string>
     <string name="action_mark_room_read">Označiť ako prečítané</string>
     <string name="auth_login_sso">Prihlásiť sa použitím jediného prihlásenia</string>
@@ -1224,10 +1206,10 @@
     <string name="error_empty_field_enter_user_name">Prosím zadajte meno používateľa.</string>
     <string name="title_activity_verify_device">Overiť reláciu</string>
     <string name="none">Žiadny</string>
-    <string name="revoke">Zrušiť</string>
-    <string name="disconnect">Odpojiť sa</string>
-    <string name="review">Náhlad</string>
-    <string name="decline">Odmietnuť</string>
+    <string name="action_revoke">Zrušiť</string>
+    <string name="action_disconnect">Odpojiť sa</string>
+    <string name="action_review">Náhlad</string>
+    <string name="action_decline">Odmietnuť</string>
     <string name="people_no_identity_server">Nebol nakonfigurovaný server totožnosti.</string>
     <string name="call_failed_no_ice_title">Hovor zlyhal kvôli zle nakonfigurovanému serveru</string>
     <string name="call_failed_no_ice_description">Prosím, požiadajte administrátora vášho domovského serveru (%1$s) o konfiguráciu TURN serveru, aby hovory fungovali spoľahlivo. 
@@ -1242,9 +1224,9 @@
     <string name="login_error_no_homeserver_found">Toto nie je platná adresa Matrix serveru</string>
     <string name="login_error_homeserver_not_found">Domovský server je nedostupný na tejto URL adrese, preverte to prosím</string>
     <string name="room_member_profile_sessions_section_title">Relácie</string>
-    <string name="play_video">Prehrať</string>
-    <string name="pause_video">Pozastaviť</string>
-    <string name="dismiss">Odmietnuť</string>
+    <string name="action_play">Prehrať</string>
+    <string name="action_pause">Pozastaviť</string>
+    <string name="action_dismiss">Odmietnuť</string>
     <string name="no_permissions_to_start_conf_call">Nemáte právo začať konferenčný hovor v tejto miestnosti</string>
     <string name="conference_call_in_progress">Konferenčný hovor práve prebieha!</string>
     <string name="video_meeting">Začať video schôdzu</string>
@@ -1569,8 +1551,8 @@
     <string name="room_list_rooms_empty_title">Miestnosti</string>
     <string name="room_list_rooms_empty_body">Tu sa zobrazia vaše miestnosti. Ťuknutím na + vpravo dole nájdete existujúce miestnosti alebo si môžete založiť vlastnú.</string>
     <string name="title_activity_emoji_reaction_picker">Reakcie</string>
-    <string name="reactions_agree">Súhlasím</string>
-    <string name="reactions_like">Páči sa mi</string>
+    <string name="action_agree">Súhlasím</string>
+    <string name="action_like">Páči sa mi</string>
     <string name="message_add_reaction">Pridať reakciu</string>
     <string name="message_view_reaction">Zobraziť reakcie</string>
     <string name="reactions">Reakcie</string>
@@ -1814,7 +1796,7 @@
     <string name="create_room_topic_hint">Téma</string>
     <string name="direct_room_profile_section_more_leave">Opustiť</string>
     <string name="direct_room_profile_section_more_settings">Nastavenia</string>
-    <string name="reset">Obnoviť predvolené</string>
+    <string name="action_reset">Obnoviť predvolené</string>
     <string name="sent_a_poll">Anketa</string>
     <string name="settings_text_message_sent_hint">Kód</string>
     <string name="room_settings_topic_hint">Téma</string>
@@ -2080,11 +2062,6 @@
     <string name="message_key">Kľúč správy</string>
     <string name="verification_cancelled">Overovanie zrušené</string>
     <string name="delete_event_dialog_title">Potvrdiť odstránenie</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d hlas</item>
-        <item quantity="few">%d hlasy</item>
-        <item quantity="other">%d hlasov</item>
-    </plurals>
     <string name="settings_account_data">Údaje o účte</string>
     <string name="settings_dev_tools">Vývojárske nástroje</string>
     <string name="a11y_qr_code_for_verification">QR kód</string>
diff --git a/vector/src/main/res/values-sl/strings.xml b/vector/src/main/res/values-sl/strings.xml
index 836a4c112e..c6e8ede589 100644
--- a/vector/src/main/res/values-sl/strings.xml
+++ b/vector/src/main/res/values-sl/strings.xml
@@ -3,8 +3,8 @@
     <string name="create_room_name_hint">Ime</string>
     <string name="send_bug_report">Prijava hrošča</string>
     <string name="send_bug_report_include_screenshot">Pošlji ekransko sliko</string>
-    <string name="resend">Ponovno pošlji</string>
-    <string name="send">Pošlji</string>
+    <string name="action_resend">Ponovno pošlji</string>
+    <string name="action_send">Pošlji</string>
     <string name="notification_sync_in_progress">Sinhroniziram…</string>
     <string name="notice_room_join_by_you">Pridružil si se v sobi</string>
     <string name="notice_room_invite_you">%1$s te je povabil</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index c12fb416cd..cba5e0f3bb 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -30,7 +30,7 @@
     <string name="notice_profile_change_redacted">%1$s përditësoi profilin e tij %2$s</string>
     <string name="notice_room_third_party_registered_invite">%1$s pranoi ftesën tuaj për %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** S’arrihet të shfshehtëzohet: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Pajisja e dërguesit nuk na ka dërguar kyçet për këtë mesazh.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Pajisja e dërguesit nuk na ka dërguar kyçet për këtë mesazh.</string>
     <string name="could_not_redact">S’u redaktua dot</string>
     <string name="unable_to_send_message">S’arrihet të dërgohet mesazh</string>
     <string name="message_failed_to_upload">Ngarkimi i figurës dështoi</string>
@@ -273,23 +273,23 @@
     <string name="dialog_title_third_party_licences">Licenca nga palë të treta</string>
     <string name="loading">Po ngarkohet…</string>
     <string name="ok">OK</string>
-    <string name="cancel">Anuloje</string>
-    <string name="save">Ruaje</string>
-    <string name="leave">Dil</string>
-    <string name="send">Dërgoje</string>
-    <string name="resend">Ridërgoje</string>
-    <string name="quote">Citim</string>
-    <string name="download">Shkarkoje</string>
-    <string name="share">Ndaje me të tjerë</string>
-    <string name="speak">Flisni</string>
-    <string name="clear">Pastroje</string>
+    <string name="action_cancel">Anuloje</string>
+    <string name="action_save">Ruaje</string>
+    <string name="action_leave">Dil</string>
+    <string name="action_send">Dërgoje</string>
+    <string name="action_resend">Ridërgoje</string>
+    <string name="action_quote">Citim</string>
+    <string name="action_download">Shkarkoje</string>
+    <string name="action_share">Ndaje me të tjerë</string>
+    <string name="action_speak">Flisni</string>
+    <string name="action_clear">Pastroje</string>
     <string name="later">Më vonë</string>
-    <string name="forward">Përpara</string>
+    <string name="action_forward">Përpara</string>
     <string name="permalink">Permalidhje</string>
     <string name="view_source">Shihini Burimin</string>
     <string name="view_decrypted_source">Shihni Burim të Shfshehtëzuar</string>
-    <string name="delete">Fshije</string>
-    <string name="rename">Riemërtojeni</string>
+    <string name="action_delete">Fshije</string>
+    <string name="action_rename">Riemërtojeni</string>
     <string name="report_content">Raportoni Lëndë</string>
     <string name="active_call">Thirrje aktive</string>
     <string name="cannot_start_call">S’fillohet dot thirrja, ju lutemi, riprovoni më vonë</string>
@@ -297,7 +297,7 @@
     <string name="device_information">Të dhëna Sesioni</string>
     <string name="call_anyway">Thirre Sido Qoftë</string>
     <string name="send_anyway">Dërgoje Sido Qoftë</string>
-    <string name="invite">Ftoje</string>
+    <string name="action_invite">Ftoje</string>
     <string name="offline">Jashtë linje</string>
     <string name="action_exit">Dalje</string>
     <string name="actions">Veprime</string>
@@ -310,7 +310,7 @@
     <string name="action_open">Hape</string>
     <string name="action_close">Mbylle</string>
     <string name="copied_to_clipboard">U kopjua në të papastër</string>
-    <string name="disable">Çaktivizoje</string>
+    <string name="action_disable">Çaktivizoje</string>
     <string name="dialog_title_confirmation">Ripohim</string>
     <string name="dialog_title_warning">Kujdes</string>
     <string name="dialog_title_error">Gabim</string>
@@ -447,10 +447,10 @@
     <string name="media_slider_saved_message">Të ruhet te shkarkimet?</string>
     <string name="yes">PO</string>
     <string name="_continue">Vazhdo</string>
-    <string name="remove">Hiqe</string>
-    <string name="join">Bëhuni pjesë</string>
-    <string name="preview">Paraparje</string>
-    <string name="reject">Hidheni tej</string>
+    <string name="action_remove">Hiqe</string>
+    <string name="action_join">Bëhuni pjesë</string>
+    <string name="action_preview">Paraparje</string>
+    <string name="action_reject">Hidheni tej</string>
     <string name="list_members">Anëtarë liste</string>
     <string name="room_sync_in_progress">Po njëkohësohet…</string>
     <string name="room_jump_to_first_unread">Hidhu te të palexuarit</string>
@@ -554,17 +554,6 @@
     <string name="tab_title_search_messages">MESAZHE</string>
     <string name="tab_title_search_people">PERSONA</string>
     <string name="tab_title_search_files">KARTELA</string>
-    <string name="room_recents_join">MERRNI PJESË</string>
-    <string name="room_recents_directory">DREJTORI</string>
-    <string name="room_recents_favourites">TË PARAPËLQYERA</string>
-    <string name="room_recents_conversations">DHOMA</string>
-    <string name="room_recents_low_priority">ME PËRPARËSI TË ULËT</string>
-    <string name="room_recents_invites">FTESA</string>
-    <string name="room_recents_start_chat">Filloni fjalosje</string>
-    <string name="room_recents_create_room">Krijo dhomë</string>
-    <string name="room_recents_join_room">Hyni në dhomë</string>
-    <string name="room_recents_join_room_title">Hyni në një dhomë</string>
-    <string name="room_recents_join_room_prompt">Shtypni një ID ose alias dhome</string>
     <string name="directory_search_results_title">Shfletoni në drejtori</string>
     <string name="directory_searching_title">Po kërkohet në drejtori…</string>
     <string name="room_settings_all_messages_noisy">Krejt mesazhet (e zhurmshme)</string>
@@ -933,7 +922,7 @@
     <string name="settings_lazy_loading_title"><em>Lazy-load</em> anëtarët e dhomave</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Shërbyesi juaj nuk e mbulon ende <em>lazy loading</em> e anëtarëve të dhomës. Provoni më vonë.</string>
     <string name="notification_sync_in_progress">Po njëkohësohet…</string>
-    <string name="redact">Hiqe</string>
+    <string name="action_redact">Hiqe</string>
     <string name="missing_permissions_warning">Për shkak lejesh që mungojnë, mund të mungojnë disa veçori…</string>
     <string name="missing_permissions_error">Ky veprim s’është i mundur, për shkak lejesh që mungojnë.</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Thirrjet konferencë nuk mbulohen në dhoma të fshehtëzuara</string>
@@ -1098,7 +1087,7 @@
     <string name="encryption_information_claimed_ed25519_fingerprint_key">U pretendua për kyç Ed25519 shenjash gishtash</string>
     <string name="historical_placeholder">Kërkoni për të dikurshme</string>
     <string name="settings_flair">Simbole</string>
-    <string name="accept">Pranoje</string>
+    <string name="action_accept">Pranoje</string>
     <string name="auth_accept_policies">Ju lutemi, merrni në shqyrtim dhe pranoni rregullat e këtij shërbyesi Home:</string>
     <string name="settings_notification_troubleshoot">Diagnostikoni Njoftime</string>
     <string name="settings_troubleshoot_diagnostic">Diagnostikime</string>
@@ -1171,7 +1160,7 @@
     <string name="title_activity_keys_backup_setup">Kopjeruajtje Kyçesh</string>
     <string name="title_activity_keys_backup_restore">Përdor Kopjeruajtje Kyçesh</string>
     <string name="keys_backup_is_not_finished_please_wait">Kopjeruajtja e kyçeve s’ka përfunduar, ju lutemi, pritni…</string>
-    <string name="skip">Anashkaloje</string>
+    <string name="action_skip">Anashkaloje</string>
     <string name="done">U bë</string>
     <string name="settings_notification_advanced">Rregullime të Mëtejshme Për Njoftimet</string>
     <string name="settings_notification_by_event">Rëndësi njoftimi sipas aktesh</string>
@@ -1268,8 +1257,8 @@
     <string name="are_you_sure">A jeni i sigurt?</string>
     <string name="backup">Kopjeruaji</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Do të humbni hyrjen te mesazhet tuaj të fshehtëzuar, veç në bëfshi kopjeruajtje të kyçeve tuaj, përpara se të dilni nga llogaria.</string>
-    <string name="stay">Rri</string>
-    <string name="abort">Ndërprite</string>
+    <string name="action_stay">Rri</string>
+    <string name="action_abort">Ndërprite</string>
     <string name="action_sign_out_confirmation_simple">Jeni i sigurt se doni të dilni?</string>
     <string name="settings_data_save_mode_summary">Mënyra e ruajtjes së të dhënave aplikon një filtër specifik, që kështu përditësimet rreth pranish dhe njoftime mbi shtypje në tastierë lihen jashtë.</string>
     <string name="encryption_message_recovery">Rimarrje Mesazhesh të Fshehtëzuar</string>
@@ -1306,7 +1295,7 @@
     <string name="keys_backup_info_title_version">Version</string>
     <string name="keys_backup_info_title_algorithm">Algoritëm</string>
     <string name="keys_backup_info_title_signature">Nënshkrim</string>
-    <string name="ignore">Shpërfille</string>
+    <string name="action_ignore">Shpërfille</string>
     <string name="auth_login_sso">Hyni me një hyrje njëshe</string>
     <string name="login_error_unknown_host">Kjo URL s’kapet dot, ju lutemi, kontrollojeni</string>
     <string name="login_error_ssl_handshake">Pajisja juaj përdor një protokoll TLS sigurie të vjetruar, pre sulmesh, për hir të sigurisë tuaj, s’do të jeni në gjendje të lidheni</string>
@@ -1424,8 +1413,8 @@
     <string name="room_list_rooms_empty_title">Dhoma</string>
     <string name="room_list_rooms_empty_body">Dhomat tuaja do të shfaqen këtu. Prekni + poshtë djathtas që të gjeni të tilla ekzistuese ose që të nisni një tuajën.</string>
     <string name="title_activity_emoji_reaction_picker">Reagime</string>
-    <string name="reactions_agree">Pajtohem</string>
-    <string name="reactions_like">E pëlqej</string>
+    <string name="action_agree">Pajtohem</string>
+    <string name="action_like">E pëlqej</string>
     <string name="message_add_reaction">Shtoni Reagim</string>
     <string name="message_view_reaction">Shihni Reagime</string>
     <string name="reactions">Reagime</string>
@@ -1505,8 +1494,8 @@
     <string name="direct_room_filter_hint">Filtrojini sipas emrash përdoruesish ose ID-sh…</string>
     <string name="joining_room">Po hyhet në dhomë…</string>
     <string name="message_view_edit_history">Shihni Historik Përpunimesh</string>
-    <string name="review">Shqyrtojeni</string>
-    <string name="decline">Hidhe poshtw</string>
+    <string name="action_review">Shqyrtojeni</string>
+    <string name="action_decline">Hidhe poshtw</string>
     <string name="widget_integration_review_terms">Që të vazhdohet, lypset të pranoni Kushtet e këtij shërbimi.</string>
     <string name="terms_of_service">Kushte Shërbimi</string>
     <string name="review_terms">Shqyrtoni Kushtet</string>
@@ -1514,8 +1503,8 @@
     <string name="terms_description_for_integration_manager">Përdorni robotë, ura, widget-e dhe paketa ngjitësish</string>
     <string name="read_at">Lexoni te</string>
     <string name="none">Asnjë</string>
-    <string name="revoke">Shfuqizoje</string>
-    <string name="disconnect">Shkëputu</string>
+    <string name="action_revoke">Shfuqizoje</string>
+    <string name="action_disconnect">Shkëputu</string>
     <string name="people_no_identity_server">S’ka shërbyes identitetesh të formësuar.</string>
     <string name="call_failed_no_ice_title">Thirrja dështoi për shkak shërbyesi të keqformësuar</string>
     <string name="call_failed_no_ice_description">Që thirrjet të funksionojnë në mënyrë të qëndrueshme, ju lutemi, kërkojini përgjegjësit të shërbyesit tuaj Home (%1$s) të formësojë një shërbyes TURN.
@@ -1950,15 +1939,6 @@
     <string name="verification_verified_user">%s i verifikuar</string>
     <string name="settings_dev_tools">Mjete Zhvilluesi</string>
     <string name="settings_account_data">Të dhëna Llogarie</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d votë</item>
-        <item quantity="other">%d vota</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d votë - Përfundimet finale</item>
-        <item quantity="other">%d vota - Përfundimet finale</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Mundësi e Përzgjedhur</string>
     <string name="command_description_poll">Krijoni një pyetësor të thjeshtë</string>
     <string name="verification_cannot_access_other_session">Përdorni Frazëkalim Rikthimesh ose Kyç</string>
     <string name="verification_use_passphrase">Nëse s’hyni dot në një sesion ekzistues</string>
@@ -2086,7 +2066,7 @@
 \n${app_name} Desktop</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">ose një tjetër klient Matrix i aftë për &lt;em&gt;cross-signing&lt;/em</string>
+    <string name="or_other_mx_capable_client">ose një tjetër klient Matrix i aftë për &lt;em&gt;cross-signing&lt;/em</string>
     <string name="template_use_latest_app">Përdorni ${app_name}-in më të ri në pajisjet tuaja të tjera:</string>
     <string name="command_description_discard_session_not_handled">Mbulohet vetëm për dhoma të fshehtëzuara</string>
     <string name="enter_secret_storage_passphrase_or_key">Përdorni %1$s tuaj ose përdorni %2$s tuaj që të vazhdohet.</string>
@@ -2159,9 +2139,9 @@
     <string name="identity_server_set_alternative_notice_no_default">Jepni URL-në e një shërbyesi identitetesh</string>
     <string name="identity_server_set_alternative_submit">Parashtroje</string>
     <string name="open_terms_of">Hap termat e %s</string>
-    <string name="play_video">Luaje</string>
-    <string name="pause_video">Pauzë</string>
-    <string name="dismiss">Hidhe poshtë</string>
+    <string name="action_play">Luaje</string>
+    <string name="action_pause">Pauzë</string>
+    <string name="action_dismiss">Hidhe poshtë</string>
     <string name="no_permissions_to_start_conf_call">S’keni leje të nisni një thirrje konferencë në këtë dhomë</string>
     <string name="no_permissions_to_start_webrtc_call">S’keni leje të nisni thirrje në këtë dhomë</string>
     <string name="conference_call_in_progress">Ka tashmë një konferencë në ecuri e sipër!</string>
@@ -2277,7 +2257,6 @@
     <string name="login_signin_matrix_id_password_notice">Nëse s’e dini fjalëkalimin, kthehuni mbrapsht që ta ricaktoni.</string>
     <string name="send_a_sticker">Ngjitës</string>
     <string name="sent_a_poll">Pyetësor</string>
-    <string name="sent_a_bot_buttons">Butona Roboti</string>
     <string name="sent_a_reaction">Reagoi me: %s</string>
     <string name="sent_verification_conclusion">Përfundim Verifikimi</string>
     <string name="room_profile_section_admin">Veprime Përgjegjësi</string>
@@ -2689,7 +2668,7 @@
     <string name="invite_to_space_with_name_desc">Do të jenë në gjendje të eksplorojnë %s</string>
     <string name="invite_to_space_with_name">Ftojeni në %s</string>
     <string name="invite_by_link">Jepuni lidhjen</string>
-    <string name="invite_by_mxid">Ftoni përmes emri përdoruesi</string>
+    <string name="invite_by_username">Ftoni përmes emri përdoruesi</string>
     <string name="invite_by_email">Ftoni përmes email-i</string>
     <string name="invite_people_to_your_space_desc">Vetëm ju, hëpërhë. %s do të jetë edhe më mirë me të tjerë.</string>
     <string name="invite_people_menu">Ftoni njerëz</string>
@@ -2948,7 +2927,7 @@
     <string name="discovery_invite">Ftoni me email, gjeni kontakte, etj…</string>
     <string name="finish_setting_up_discovery">Përfundo ujdisjen e zbulimit.</string>
     <string name="create_space_identity_server_info_none">Aktualisht nuk përdorni ndonjë shërbyes identitetesh. Që të ftoni shokë të ekipit dhe të jeni i zbulueshëm prej tyre, formësoni një të tillë më poshtë.</string>
-    <string name="invite_by_mxid_or_mail">Ftoni me emër përdoruesi ose email</string>
+    <string name="invite_by_username_or_mail">Ftoni me emër përdoruesi ose email</string>
     <string name="create_spaces_invite_public_header_desc">Sigurohuni se te %s e shoqërisë kanë hyrje personat e duhur. Më vonë mund të ftoni të tjerë.</string>
     <string name="create_spaces_invite_public_header">Cilët janë shokët tuaj të ekipit\?</string>
     <string name="command_description_add_to_space">Shtoni te Hapësira e dhënë</string>
diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index 065fd3154b..e43d7bce24 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -67,7 +67,7 @@
     <string name="network_error">Мрежна грешка</string>
     <string name="message_failed_to_upload">Неуспело слање слике</string>
     <string name="unable_to_send_message">Не могу да пошаљем поруку</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Уређај пошиљаоца није нам послао кључеве за ову поруку.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Уређај пошиљаоца није нам послао кључеве за ову поруку.</string>
     <string name="notice_power_level_changed_by_you">Изменили сте ниво снаге корисника %1$s.</string>
     <string name="power_level_custom_no_value">посебно</string>
     <string name="power_level_custom">посебно (%1$d)</string>
@@ -300,21 +300,21 @@
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Изгубићете приступ вашим шифрованим порукама уколико не направите резервну копију кључева пре него што се одјавите.</string>
     <string name="loading">Учитавам…</string>
     <string name="ok">У реду</string>
-    <string name="cancel">Откажи</string>
-    <string name="save">Сачувај</string>
-    <string name="leave">Напусти</string>
-    <string name="stay">Остани</string>
-    <string name="send">Пошаљи</string>
-    <string name="resend">Пошаљи поново</string>
-    <string name="redact">Уклони</string>
-    <string name="share">Подели</string>
-    <string name="accept">Прихвати</string>
-    <string name="skip">Прескочи</string>
+    <string name="action_cancel">Откажи</string>
+    <string name="action_save">Сачувај</string>
+    <string name="action_leave">Напусти</string>
+    <string name="action_stay">Остани</string>
+    <string name="action_send">Пошаљи</string>
+    <string name="action_resend">Пошаљи поново</string>
+    <string name="action_redact">Уклони</string>
+    <string name="action_share">Подели</string>
+    <string name="action_accept">Прихвати</string>
+    <string name="action_skip">Прескочи</string>
     <string name="done">Готово</string>
-    <string name="abort">Обустави</string>
-    <string name="ignore">Игнориши</string>
-    <string name="review">Прегледај</string>
-    <string name="decline">Одбаци</string>
+    <string name="action_abort">Обустави</string>
+    <string name="action_ignore">Игнориши</string>
+    <string name="action_review">Прегледај</string>
+    <string name="action_decline">Одбаци</string>
     <string name="action_exit">Изађи</string>
     <string name="actions">Радње</string>
     <string name="action_sign_out">Одјави се</string>
@@ -327,7 +327,7 @@
     <string name="action_mark_room_read">Означи као прочитано</string>
     <string name="action_open">Отвори</string>
     <string name="action_close">Затвори</string>
-    <string name="disable">Искључи</string>
+    <string name="action_disable">Искључи</string>
     <string name="dialog_title_confirmation">Потврда</string>
     <string name="dialog_title_warning">Упозорење</string>
     <string name="dialog_title_error">Грешка</string>
@@ -368,26 +368,26 @@
     <string name="auth_return_to_login">Врати се на екран за пријаву</string>
     <string name="auth_submit">Пошаљи</string>
     <string name="auth_send_reset_email">Пошаљи е-пошту за ресет</string>
-    <string name="rename">Преименуј</string>
-    <string name="delete">Обриши</string>
+    <string name="action_rename">Преименуј</string>
+    <string name="action_delete">Обриши</string>
     <string name="view_decrypted_source">Погледај дешифрован извор</string>
     <string name="view_source">Погледај извор</string>
-    <string name="forward">Напред</string>
+    <string name="action_forward">Напред</string>
     <string name="later">Касније</string>
-    <string name="clear">Очисти</string>
-    <string name="speak">Говори</string>
-    <string name="download">Преузми</string>
-    <string name="quote">Цитирај</string>
+    <string name="action_clear">Очисти</string>
+    <string name="action_speak">Говори</string>
+    <string name="action_download">Преузми</string>
+    <string name="action_quote">Цитирај</string>
     <string name="dialog_title_third_party_licences">Лиценце треће стране</string>
     <string name="title_activity_group_details">Детаљи о заједници</string>
     <string name="notification_listening_for_events">Ослушкујем догађања</string>
     <string name="system_theme">системска</string>
     <string name="encrypted_message">Шифрована порука</string>
-    <string name="play_video">Пусти</string>
+    <string name="action_play">Пусти</string>
     <string name="active_call">Активан позив</string>
     <string name="report_content">Пријави садржај</string>
-    <string name="disconnect">Искључи се</string>
-    <string name="revoke">Повуци</string>
+    <string name="action_disconnect">Искључи се</string>
+    <string name="action_revoke">Повуци</string>
     <string name="none">Ништа</string>
     <string name="backup">Резервна копија</string>
     <string name="enter_secret_storage_passphrase_or_key">Употребите %1$s или %2$s да наставите.</string>
@@ -434,7 +434,7 @@
     <string name="call_notification_reject">Одбаци</string>
     <string name="call_notification_answer">Прихвати</string>
     <string name="offline">Ван везе</string>
-    <string name="invite">Позивница</string>
+    <string name="action_invite">Позивница</string>
     <string name="or">или</string>
     <string name="send_anyway">Свеједно пошаљи</string>
     <string name="call_anyway">Свеједно позови</string>
@@ -447,9 +447,9 @@
     <string name="ongoing_conference_call_video">Видео</string>
     <string name="ongoing_conference_call_voice">Глас</string>
     <string name="start_chatting">Почни ћаскање</string>
-    <string name="reset">Ресет</string>
-    <string name="dismiss">Одбаци</string>
-    <string name="pause_video">Паузирај</string>
+    <string name="action_reset">Ресет</string>
+    <string name="action_dismiss">Одбаци</string>
+    <string name="action_pause">Паузирај</string>
     <string name="call_error_camera_init_failed">Неуспешно иницијализовање камере</string>
     <string name="call_error_ice_failed">Веза није успела</string>
     <string name="call_error_user_not_responding">Дописник није одговорио.</string>
@@ -706,10 +706,10 @@
     <string name="room_sync_in_progress">Синхронизација…</string>
     <string name="open_chat_header">Отвори заглавље</string>
     <string name="list_members">Листа чланова</string>
-    <string name="reject">Одбаци</string>
-    <string name="preview">Преглед</string>
-    <string name="join">Придружи се</string>
-    <string name="remove">Избриши</string>
+    <string name="action_reject">Одбаци</string>
+    <string name="action_preview">Преглед</string>
+    <string name="action_join">Придружи се</string>
+    <string name="action_remove">Избриши</string>
     <string name="_continue">Настави</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Послати одговор (НЕшифрован)…</string>
     <string name="room_message_placeholder_reply_to_encrypted">Послати шифрован дговор…</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 9a67d76b5d..c87f81d2f9 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -99,7 +99,7 @@
     <string name="notice_power_level_changed">%1$s ändrade behörighetsnivå för %2$s.</string>
     <string name="notice_power_level_diff">%1$s från %2$s till %3$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Kan inte avkryptera: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Avsändarens enhet har inte gett oss nycklarna för det här meddelandet.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Avsändarens enhet har inte gett oss nycklarna för det här meddelandet.</string>
     <string name="could_not_redact">Kunde inte dölja</string>
     <string name="unable_to_send_message">Kunde inte skicka meddelandet</string>
     <string name="message_failed_to_upload">Misslyckades att ladda upp bilden</string>
@@ -295,28 +295,28 @@
     <string name="dialog_title_third_party_licences">Tredjepartslicenser</string>
     <string name="loading">Laddar…</string>
     <string name="ok">OK</string>
-    <string name="cancel">Avbryt</string>
-    <string name="save">Spara</string>
-    <string name="leave">Lämna</string>
-    <string name="stay">Stanna</string>
-    <string name="send">Skicka</string>
-    <string name="resend">Skicka igen</string>
-    <string name="redact">Ta bort</string>
-    <string name="quote">Citera</string>
-    <string name="download">Ladda ner</string>
-    <string name="share">Dela</string>
-    <string name="speak">Prata</string>
-    <string name="clear">Rensa</string>
+    <string name="action_cancel">Avbryt</string>
+    <string name="action_save">Spara</string>
+    <string name="action_leave">Lämna</string>
+    <string name="action_stay">Stanna</string>
+    <string name="action_send">Skicka</string>
+    <string name="action_resend">Skicka igen</string>
+    <string name="action_redact">Ta bort</string>
+    <string name="action_quote">Citera</string>
+    <string name="action_download">Ladda ner</string>
+    <string name="action_share">Dela</string>
+    <string name="action_speak">Prata</string>
+    <string name="action_clear">Rensa</string>
     <string name="later">Senare</string>
-    <string name="forward">Vidarebefordra</string>
+    <string name="action_forward">Vidarebefordra</string>
     <string name="permalink">Permanent länk</string>
     <string name="view_source">Visa källkod</string>
     <string name="view_decrypted_source">Visa avkrypterad källkod</string>
-    <string name="delete">Radera</string>
-    <string name="rename">Döp om</string>
+    <string name="action_delete">Radera</string>
+    <string name="action_rename">Döp om</string>
     <string name="none">Ingen</string>
-    <string name="revoke">Återkalla</string>
-    <string name="disconnect">Koppla ifrån</string>
+    <string name="action_revoke">Återkalla</string>
+    <string name="action_disconnect">Koppla ifrån</string>
     <string name="report_content">Rapportera innehåll</string>
     <string name="active_call">Aktivt samtal</string>
     <string name="ongoing_conference_call">Pågående gruppsamtal.
@@ -333,15 +333,15 @@
     <string name="call_anyway">Ring ändå</string>
     <string name="send_anyway">Skicka ändå</string>
     <string name="or">eller</string>
-    <string name="invite">Bjud in</string>
+    <string name="action_invite">Bjud in</string>
     <string name="offline">Bortkopplad</string>
-    <string name="accept">Godkänn</string>
-    <string name="skip">Hoppa över</string>
+    <string name="action_accept">Godkänn</string>
+    <string name="action_skip">Hoppa över</string>
     <string name="done">Färdig</string>
-    <string name="abort">Avbryt</string>
-    <string name="ignore">Ignorera</string>
-    <string name="review">Granska</string>
-    <string name="decline">Avslå</string>
+    <string name="action_abort">Avbryt</string>
+    <string name="action_ignore">Ignorera</string>
+    <string name="action_review">Granska</string>
+    <string name="action_decline">Avslå</string>
     <string name="action_exit">Avsluta</string>
     <string name="actions">Handlingar</string>
     <string name="action_sign_out">Logga ut</string>
@@ -356,7 +356,7 @@
     <string name="action_open">Öppna</string>
     <string name="action_close">Stäng</string>
     <string name="copied_to_clipboard">Kopierat till klippbordet</string>
-    <string name="disable">Stäng av</string>
+    <string name="action_disable">Stäng av</string>
     <string name="dialog_title_confirmation">Bekräftelse</string>
     <string name="dialog_title_warning">Varning</string>
     <string name="dialog_title_error">Fel</string>
@@ -580,10 +580,10 @@
     <string name="yes">JA</string>
     <string name="no">NEJ</string>
     <string name="_continue">Fortsätt</string>
-    <string name="remove">Ta bort</string>
-    <string name="join">Gå med</string>
-    <string name="preview">Förhandsvisning</string>
-    <string name="reject">Avslå</string>
+    <string name="action_remove">Ta bort</string>
+    <string name="action_join">Gå med</string>
+    <string name="action_preview">Förhandsvisning</string>
+    <string name="action_reject">Avslå</string>
     <string name="list_members">Lista medlemmar</string>
     <string name="open_chat_header">Öppna rubrik</string>
     <string name="room_sync_in_progress">Synkroniserar…</string>
@@ -647,7 +647,6 @@
     <string name="room_participants_action_ignore">Ignorera</string>
     <string name="search_members_hint">Filtrera rumsmedlemmar</string>
     <string name="tab_title_search_rooms">RUM</string>
-    <string name="room_recents_conversations">RUM</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d rum</item>
         <item quantity="other">%d rum</item>
@@ -1062,9 +1061,9 @@
     <string name="choose_locale_current_locale_title">Nuvarande språk</string>
     <string name="choose_locale_other_locales_title">Andra tillgängliga språk</string>
     <string name="choose_locale_loading_locales">Laddar tillgängliga språk…</string>
-    <string name="play_video">Spela</string>
-    <string name="pause_video">Pausa</string>
-    <string name="dismiss">Avfärda</string>
+    <string name="action_play">Spela</string>
+    <string name="action_pause">Pausa</string>
+    <string name="action_dismiss">Avfärda</string>
     <string name="action_copy">Kopiera</string>
     <string name="dialog_title_success">Framgång</string>
     <string name="bottom_action_notification">Aviseringar</string>
@@ -1292,16 +1291,6 @@
     <string name="search_hint">Sök</string>
     <string name="search_no_results">Inga resultat</string>
     <string name="tab_title_search_messages">MEDDELANDEN</string>
-    <string name="room_recents_join">GÅ MED</string>
-    <string name="room_recents_directory">KATALOG</string>
-    <string name="room_recents_favourites">FAVORITER</string>
-    <string name="room_recents_low_priority">LÅG PRIORITET</string>
-    <string name="room_recents_invites">INBJUDNINGAR</string>
-    <string name="room_recents_start_chat">Starta chatt</string>
-    <string name="room_recents_create_room">Skapa rum</string>
-    <string name="room_recents_join_room">Gå med i rum</string>
-    <string name="room_recents_join_room_title">Gå med i ett rum</string>
-    <string name="room_recents_join_room_prompt">Skriv ett rums-ID eller ett rumsalias</string>
     <string name="directory_search_results_title">Bläddra i katalogen</string>
     <string name="directory_searching_title">Söker i katalog…</string>
     <string name="room_settings_favourite">Favorit</string>
@@ -1566,7 +1555,7 @@
     <string name="settings_security_prevent_screenshots_title">Förhindra skärmdumpar av appen</string>
     <string name="settings_security_prevent_screenshots_summary">Att aktivera den här inställningen lägger till FLAG_SECURE till alla aktiviteter. Starta om appen för att inställningen ska få effekt.</string>
     <string name="template_use_other_session_content_description">Använd senaste ${app_name} på dina andra enheter; ${app_name} Web, ${app_name} iOS, ${app_name} för Android, eller annan Matrixklient som stöder korssignering</string>
-    <string name="or_other_mx_capabale_client">eller en annan Matrixklient som städer korssignering</string>
+    <string name="or_other_mx_capable_client">eller en annan Matrixklient som städer korssignering</string>
     <string name="template_use_latest_app">Använd senaste ${app_name} på dina andra enheter:</string>
     <string name="command_description_discard_session">Tvingar den nuvarande utgående gruppsessionen i ett krypterat rum att kasseras</string>
     <string name="keys_backup_recovery_key_error_decrypt">Säkerhetskopian kunde inte avkrypteras med den här återställningsnyckeln: vänligen verifiera att du skrev in rätt återställningsnyckel.</string>
@@ -1925,8 +1914,8 @@
     <string name="room_list_catchup_welcome_body">Kom ikapp med olästa meddelanden här</string>
     <string name="room_list_people_empty_title">Konversationer</string>
     <string name="title_activity_emoji_reaction_picker">Reaktioner</string>
-    <string name="reactions_agree">Acceptera</string>
-    <string name="reactions_like">Gilla</string>
+    <string name="action_agree">Acceptera</string>
+    <string name="action_like">Gilla</string>
     <string name="message_add_reaction">Lägg till reaktion</string>
     <string name="message_view_reaction">Visa reaktioner</string>
     <string name="reactions">Reaktioner</string>
@@ -2184,15 +2173,6 @@
     <string name="qr_code_scanned_by_other_no">Nej</string>
     <string name="no_connectivity_to_the_server_indicator">Anslutningen till servern har tappats</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">Flygplansläge är på</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d röst</item>
-        <item quantity="other">%d röster</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d röst - Slutgiltigt resultat</item>
-        <item quantity="other">%d röster - Slutgiltigt resultat</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Valt alternativ</string>
     <string name="command_description_poll">Skapar en enkel omröstning</string>
     <string name="verification_cannot_access_other_session">Använd en återställningslösenfras eller -nyckel</string>
     <string name="new_signin">Ny inloggning</string>
@@ -2371,7 +2351,6 @@
     <string name="settings_show_room_member_state_events">Visa statushändelser angående rumsmedlemmar</string>
     <string name="settings_show_room_member_state_events_summary">Inkluderar när personer bjuds in, går med, lämnar, kickas, bannas eller byter sin avatar eller sitt namn.</string>
     <string name="sent_a_poll">Omröstning</string>
-    <string name="sent_a_bot_buttons">Bottknappar</string>
     <string name="sent_a_reaction">Reagerade med: %s</string>
     <string name="sent_verification_conclusion">Verifieringsavslutning</string>
     <string name="universal_link_malformed">Länken var felformaterad</string>
@@ -2431,7 +2410,7 @@
     <string name="search_banned_user_hint">Filtrera bannade användare</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Du har inte behörighet att starta ett samtal</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Du har inte behörighet att starta ett gruppsamtal</string>
-    <string name="reset">Återställ</string>
+    <string name="action_reset">Återställ</string>
     <string name="create_room_topic_hint">Ämne</string>
     <string name="warning_unsaved_change_discard">Förkasta ändringar</string>
     <string name="warning_unsaved_change">Det finns osparade ändringar. Förkasta ändringarna\?</string>
@@ -2711,7 +2690,7 @@
     <string name="suggested_header">Föreslagna rum</string>
     <string name="invite_to_space_with_name">Bjud in till %s</string>
     <string name="invite_by_link">Dela länk</string>
-    <string name="invite_by_mxid">Bjud in med användarnamn</string>
+    <string name="invite_by_username">Bjud in med användarnamn</string>
     <string name="invite_by_email">Bjud in via e-post</string>
     <string name="invite_people_to_your_space_desc">Det är bara du här för tillfället. %s kommer att vara ännu bättre med fler.</string>
     <string name="invite_people_to_your_space">Bjud in personer till ditt utrymme</string>
@@ -3002,7 +2981,7 @@
     <string name="discovery_invite">Bjud in med e-post, hitta kontakter och mer…</string>
     <string name="finish_setting_up_discovery">Slutför inställning av upptäckbarhet.</string>
     <string name="create_space_identity_server_info_none">Du använder för närvarande ingen identitetsserver. För att bjuda in teammedlemmar och kunna upptäckas av dem, konfigurera en nedan.</string>
-    <string name="invite_by_mxid_or_mail">Bjud in med användarnamn eller e-postadress</string>
+    <string name="invite_by_username_or_mail">Bjud in med användarnamn eller e-postadress</string>
     <string name="a11y_presence_unavailable">Otillgänglig</string>
     <string name="a11y_presence_offline">Offline</string>
     <string name="a11y_presence_online">Online</string>
diff --git a/vector/src/main/res/values-szl/strings.xml b/vector/src/main/res/values-szl/strings.xml
index e060344ae4..ad3e626685 100644
--- a/vector/src/main/res/values-szl/strings.xml
+++ b/vector/src/main/res/values-szl/strings.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="dismiss">Zawrzij</string>
-    <string name="pause_video">Strzim</string>
-    <string name="play_video">Ôdtwōrz</string>
+    <string name="action_dismiss">Zawrzij</string>
+    <string name="action_pause">Strzim</string>
+    <string name="action_play">Ôdtwōrz</string>
     <string name="active_call">Aktywne połōnczynie</string>
     <string name="report_content">Zgłoś zawartość</string>
-    <string name="disconnect">Rozłōncz</string>
-    <string name="revoke">Ôdkoż</string>
+    <string name="action_disconnect">Rozłōncz</string>
+    <string name="action_revoke">Ôdkoż</string>
     <string name="none">Brak</string>
-    <string name="rename">Przemianuj</string>
-    <string name="delete">Skasuj</string>
+    <string name="action_rename">Przemianuj</string>
+    <string name="action_delete">Skasuj</string>
     <string name="view_decrypted_source">Pokoż ôdszyfrowane zdrzōdło</string>
     <string name="view_source">Pokoż zdrzōdło</string>
     <string name="permalink">Bezpostrzedni link</string>
-    <string name="forward">Przekoż</string>
+    <string name="action_forward">Przekoż</string>
     <string name="later">Niyskorzij</string>
-    <string name="clear">Wymaż</string>
-    <string name="speak">Godej</string>
-    <string name="share">Udostympnij</string>
-    <string name="download">Pobier</string>
-    <string name="quote">Cytuj</string>
-    <string name="redact">Wymaż</string>
-    <string name="resend">Wyślij zaś</string>
-    <string name="send">Wyślij</string>
-    <string name="stay">Ôstōń</string>
-    <string name="leave">Pociep</string>
-    <string name="save">Spamiyntej</string>
-    <string name="cancel">Pociep</string>
+    <string name="action_clear">Wymaż</string>
+    <string name="action_speak">Godej</string>
+    <string name="action_share">Udostympnij</string>
+    <string name="action_download">Pobier</string>
+    <string name="action_quote">Cytuj</string>
+    <string name="action_redact">Wymaż</string>
+    <string name="action_resend">Wyślij zaś</string>
+    <string name="action_send">Wyślij</string>
+    <string name="action_stay">Ôstōń</string>
+    <string name="action_leave">Pociep</string>
+    <string name="action_save">Spamiyntej</string>
+    <string name="action_cancel">Pociep</string>
     <string name="ok">OK</string>
     <string name="loading">Wgrowanie…</string>
     <string name="dialog_title_third_party_licences">Licyncyje podmiotōw trzecich</string>
diff --git a/vector/src/main/res/values-te/strings.xml b/vector/src/main/res/values-te/strings.xml
index 14232e65eb..ffe6c1d5a5 100644
--- a/vector/src/main/res/values-te/strings.xml
+++ b/vector/src/main/res/values-te/strings.xml
@@ -38,7 +38,7 @@
     <string name="notice_room_third_party_registered_invite">%2$sకోసం %1$s ఆహ్వానాన్ని అంగీకరించారు</string>
 
     <string name="notice_crypto_unable_to_decrypt">** వ్యక్తీకరించడానికి సాధ్యం కాలేదు: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">ఈ సందేశానికి పంపేవారి పరికరం మాకు కీలను పంపలేదు.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">ఈ సందేశానికి పంపేవారి పరికరం మాకు కీలను పంపలేదు.</string>
 
     <string name="could_not_redact">గది స్క్రీన్</string>
     <string name="unable_to_send_message">సందేశం పంపడం సాధ్యం కాలేదు</string>
@@ -69,32 +69,32 @@
     <string name="title_activity_room">గది</string>
     <string name="ok">అలాగే</string>
     <string name="title_activity_member_details">సభ్యుని వివరాలు</string>
-    <string name="save">దాచు</string>
+    <string name="action_save">దాచు</string>
     <string name="auth_forgot_password">సంకేతపదం మరచిపోయారా?</string>
-    <string name="send">పంపు</string>
-    <string name="redact">చెరిపేయి</string>
-    <string name="share">పంచుకొను</string>
-    <string name="delete">తొలగించు</string>
-    <string name="invite">ఆహ్వానము</string>
+    <string name="action_send">పంపు</string>
+    <string name="action_redact">చెరిపేయి</string>
+    <string name="action_share">పంచుకొను</string>
+    <string name="action_delete">తొలగించు</string>
+    <string name="action_invite">ఆహ్వానము</string>
 
     <string name="action_open">తెరువు</string>
     <string name="title_activity_historical">చారిత్రిక</string>
 
-    <string name="leave">వదిలివేయు</string>
-    <string name="resend">తిరిగిపంపు</string>
+    <string name="action_leave">వదిలివేయు</string>
+    <string name="action_resend">తిరిగిపంపు</string>
     <string name="title_activity_home">సందేశాలు</string>
     <string name="title_activity_settings">అమరికలు</string>
-    <string name="cancel">రద్దుచేయి</string>
+    <string name="action_cancel">రద్దుచేయి</string>
     <string name="later">తరువాత</string>
     <string name="view_source">మూలాన్ని వీక్షించండి</string>
-    <string name="rename">పేరు మార్చండి</string>
+    <string name="action_rename">పేరు మార్చండి</string>
     <string name="cannot_start_call">కాల్ను ప్రారంభించలేరు, దయచేసి తరువాత ప్రయత్నించండి</string>
     <string name="device_information">పరికర సమాచారం</string>
     <string name="or">లేదా</string>
     <string name="action_video_call">విడియో కాల్</string>
     <string name="action_close">మూసివేయు</string>
     <string name="copied_to_clipboard">క్లిప్బోర్డ్కు నకలు చేయబడింది</string>
-    <string name="disable">అచేతనపరచు</string>
+    <string name="action_disable">అచేతనపరచు</string>
 
     <string name="dialog_title_confirmation">నిర్ధారణ</string>
     <string name="dialog_title_warning">హెచ్చరిక</string>
@@ -133,8 +133,8 @@
     <string name="send_bug_report">బగ్ నివేదిక</string>
     <string name="send_bug_report_description">దయచేసి బగ్ను వివరించండి. మీరు ఎం చేసారు? మీరు ఏమి జరిగే అవకాశము ఉందనుకున్నారు? వాస్తవానికి ఏం జరిగింది?</string>
     <string name="send_bug_report_placeholder">ఇక్కడ మీ సమస్యను వివరించండి</string>
-    <string name="quote">కోట్</string>
-    <string name="forward">ముందుకు</string>
+    <string name="action_quote">కోట్</string>
+    <string name="action_forward">ముందుకు</string>
     <string name="permalink">పెర్మాలింక్</string>
     <string name="view_decrypted_source">డెక్రిప్టెడ్ మూలాన్ని చూడండి</string>
     <string name="report_content">నివేదిక వివరాలు</string>
@@ -253,9 +253,9 @@
     <string name="no">కాదు</string>
     <string name="_continue">కొనసాగించండి</string>
 
-    <string name="remove">తీసివేయి</string>
-    <string name="join">చేరండి</string>
-    <string name="reject">తిరస్కరించు</string>
+    <string name="action_remove">తీసివేయి</string>
+    <string name="action_join">చేరండి</string>
+    <string name="action_reject">తిరస్కరించు</string>
 
     <string name="room_jump_to_first_unread">మొదటి చదవని సందేశానికి వెళ్ళు.</string>
 
@@ -348,17 +348,6 @@
     <string name="tab_title_search_people">ప్రజలు</string>
     <string name="tab_title_search_files">దస్త్రాలు</string>
 
-    <string name="room_recents_join">చేరు</string>
-    <string name="room_recents_directory">డైరెక్టరీ</string>
-    <string name="room_recents_conversations">గదులు</string>
-    <string name="room_recents_low_priority">తక్కువ ప్రాధాన్యత</string>
-    <string name="room_recents_invites">ఆహ్వానాలు</string>
-    <string name="room_recents_start_chat">చాట్ ప్రారంభించండి</string>
-    <string name="room_recents_create_room">గదిని సృష్టించండి</string>
-    <string name="room_recents_join_room">గదిలో చేరండి</string>
-    <string name="room_recents_join_room_title">ఒక గదిలో చేరండి</string>
-    <string name="room_recents_join_room_prompt">ఒక గది id లేదా ఒక గది alias టైప్ చేయండి</string>
-
     <string name="directory_search_results_title">డైరెక్టరీలో విహరించండి</string>
     <string name="directory_searching_title">డైరెక్టరీని వెతుకుతున్నాం..</string>
 
@@ -559,7 +548,7 @@
     <string name="template_permissions_rationale_msg_camera_and_audio">"మీ కెమెరాను మరియు మీ శబ్ద ప్రసారిణి సాంగత్యం చేయడానికి రియోట్కు అనుమతి అవసరం.
 \n
 \nదయచేసి   పిలుపు చేయడానికి వీలుగా తదుపరి పాప్-అప్ల్లో ప్రాప్యతను అనుమతించండి."</string>
-    <string name="preview">ప్రత్యేక ప్రదర్శన</string>
+    <string name="action_preview">ప్రత్యేక ప్రదర్శన</string>
     <string name="room_preview_room_interactions_disabled">ఇది ఈ గది యొక్క పరిదృశ్యం. గది పరస్పర చర్యలు నిలిపివేయబడ్డాయి.</string>
 
     <string name="encryption_information_verify_device_warning2">ఇది సరిపోలితే, దిగువ ధృవీకరించు బటన్ను నొక్కండి. అది కాకపోతే, అప్పుడు ఎవరో ఈ పరికరాన్ని అడ్డుకుంటున్నారు మరియు మీరు బహుశా బ్లాక్ బటన్ను నొక్కాలనుకుంటున్నారు.
diff --git a/vector/src/main/res/values-th/strings.xml b/vector/src/main/res/values-th/strings.xml
index 091dc268a0..fef5de0471 100644
--- a/vector/src/main/res/values-th/strings.xml
+++ b/vector/src/main/res/values-th/strings.xml
@@ -4,7 +4,7 @@
     <string name="or">หรือ</string>
     <string name="action_open">เปิด</string>
     <string name="action_close">ปิด</string>
-    <string name="disable">ปิดใช้งาน</string>
+    <string name="action_disable">ปิดใช้งาน</string>
     <string name="dialog_title_warning">คำเตือน</string>
     <string name="read_receipt">อ่านแล้ว</string>
     <string name="auth_skip">ข้าม</string>
@@ -16,23 +16,23 @@
     <string name="title_activity_settings">การตั้งค่า</string>
     <string name="title_activity_member_details">รายละเอียดสมาชิก</string>
     <string name="ok">ตกลง</string>
-    <string name="cancel">ยกเลิก</string>
-    <string name="save">บันทึก</string>
-    <string name="leave">ออก</string>
-    <string name="send">ส่ง</string>
-    <string name="download">ดาวน์โหลด</string>
-    <string name="share">แบ่งปัน</string>
-    <string name="speak">พูด</string>
-    <string name="delete">ลบ</string>
-    <string name="rename">เปลี่ยนชื่อ</string>
-    <string name="skip">ข้าม</string>
+    <string name="action_cancel">ยกเลิก</string>
+    <string name="action_save">บันทึก</string>
+    <string name="action_leave">ออก</string>
+    <string name="action_send">ส่ง</string>
+    <string name="action_download">ดาวน์โหลด</string>
+    <string name="action_share">แบ่งปัน</string>
+    <string name="action_speak">พูด</string>
+    <string name="action_delete">ลบ</string>
+    <string name="action_rename">เปลี่ยนชื่อ</string>
+    <string name="action_skip">ข้าม</string>
     <string name="title_activity_choose_sticker">ส่งสติ๊กเกอร์</string>
     <string name="loading">กำลังโหลด…</string>
-    <string name="forward">ส่งต่อ</string>
+    <string name="action_forward">ส่งต่อ</string>
     <string name="none">ไม่มี</string>
     <string name="report_content">รายงานเนื้อหา</string>
-    <string name="play_video">เล่น</string>
-    <string name="pause_video">หยุดชั่วคราว</string>
+    <string name="action_play">เล่น</string>
+    <string name="action_pause">หยุดชั่วคราว</string>
     <string name="ongoing_conference_call_voice">เสียง</string>
     <string name="ongoing_conference_call_video">วิดีโอ</string>
     <string name="bottom_action_home">หน้าหลัก</string>
@@ -141,26 +141,26 @@
     <string name="call_notification_hangup">วางสาย</string>
     <string name="call_notification_reject">ปฏิเสธ</string>
     <string name="call_notification_answer">ยอมรับ</string>
-    <string name="decline">ปฏิเสธ</string>
-    <string name="ignore">เพิกเฉย</string>
+    <string name="action_decline">ปฏิเสธ</string>
+    <string name="action_ignore">เพิกเฉย</string>
     <string name="done">เสร็จสิ้น</string>
-    <string name="accept">ยอมรับ</string>
+    <string name="action_accept">ยอมรับ</string>
     <string name="offline">ออฟไลน์</string>
-    <string name="invite">เชิญ</string>
+    <string name="action_invite">เชิญ</string>
     <string name="device_information">ข้อมูลเซสชั่น</string>
     <string name="missing_permissions_title_to_start_conf_call">ไม่สามารถเริ่มการโทร</string>
     <string name="audio_meeting">เริ่มการประชุมเสียง</string>
     <string name="video_meeting">เริ่มการประชุมวิดีโอ</string>
     <string name="start_chatting">เริ่มแชท</string>
-    <string name="reset">รีเซ็ต</string>
-    <string name="dismiss">ปิด</string>
-    <string name="disconnect">เลิกเชื่อมต่อ</string>
+    <string name="action_reset">รีเซ็ต</string>
+    <string name="action_dismiss">ปิด</string>
+    <string name="action_disconnect">เลิกเชื่อมต่อ</string>
     <string name="view_decrypted_source">ดูต้นฉบับที่ถอดรหัสแล้ว</string>
     <string name="view_source">ดูต้นฉบับ</string>
     <string name="later">ภายหลัง</string>
-    <string name="redact">เอาออก</string>
-    <string name="resend">ส่งใหม่</string>
-    <string name="stay">อยู่</string>
+    <string name="action_redact">เอาออก</string>
+    <string name="action_resend">ส่งใหม่</string>
+    <string name="action_stay">อยู่</string>
     <string name="backup">สำรองข้อมูล</string>
     <string name="are_you_sure">คุณแน่ใจหรือไม่\?</string>
     <string name="title_activity_group_details">รายละเอียดชุมชน</string>
@@ -173,7 +173,6 @@
     <plurals name="directory_search_rooms">
         <item quantity="other">%d ห้อง</item>
     </plurals>
-    <string name="room_recents_join">เข้าร่วม</string>
     <string name="search_is_not_supported_in_e2e_room">ยังไม่รองรับการค้นหาในห้องที่เข้ารหัส</string>
     <string name="tab_title_search_files">ไฟล์</string>
     <string name="tab_title_search_people">ผู้คน</string>
@@ -244,9 +243,9 @@
     <string name="room_preview_try_join_an_unknown_room_default">ห้อง</string>
     <string name="room_jump_to_first_unread">ไปที่ข้อความแรกที่ยังไม่ได้อ่าน</string>
     <string name="list_members">แสดงรายชื่อสมาชิก</string>
-    <string name="reject">ปฏิเสธ</string>
-    <string name="preview">แสดงตัวอย่าง</string>
-    <string name="join">เข้าร่วม</string>
+    <string name="action_reject">ปฏิเสธ</string>
+    <string name="action_preview">แสดงตัวอย่าง</string>
+    <string name="action_join">เข้าร่วม</string>
     <string name="_continue">ดำเนินการต่อ</string>
     <string name="no">ไม่</string>
     <string name="yes">ใช่</string>
@@ -262,7 +261,7 @@
     <string name="option_send_voice">ส่งข้อความเสียง</string>
     <string name="matrix_only_filter">เฉพาะรายชื่อผู้ติดต่อ Matrix</string>
     <string name="no_public_room_placeholder">ไม่มีห้องสาธารณะ</string>
-    <string name="abort">ยกเลิก</string>
+    <string name="action_abort">ยกเลิก</string>
     <string name="action_mark_all_as_read">ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว</string>
     <string name="summary_user_sent_sticker">%1$s ได้ส่งสติ๊กเกอร์</string>
     <string name="summary_you_sent_sticker">คุณได้ส่งสติ๊กเกอร์</string>
@@ -289,12 +288,6 @@
     <string name="login_signup">ลงทะเบียน</string>
     <string name="directory_searching_title">กำลังค้นหาไดเรกทอรี…</string>
     <string name="directory_search_results_title">เรียกดูไดเรกทอรี</string>
-    <string name="room_recents_join_room_title">เข้าร่วมห้อง</string>
-    <string name="room_recents_join_room">เข้าร่วมห้อง</string>
-    <string name="room_recents_create_room">สร้างห้อง</string>
-    <string name="room_recents_start_chat">เริ่มแชท</string>
-    <string name="room_recents_conversations">ห้อง</string>
-    <string name="room_recents_directory">ไดเรกทอรี</string>
     <string name="room_details_people_present_group_name">เข้าร่วมแล้ว</string>
     <string name="people_search_user_directory">ไดเรกทอรีผู้ใช้ (%s)</string>
     <string name="room_participants_action_set_admin">ทำให้เป็นผู้ดูแล</string>
@@ -306,10 +299,9 @@
     </plurals>
     <string name="option_send_files">ส่งไฟล์</string>
     <string name="user_directory_header">ไดเรกทอรีผู้ใช้</string>
-    <string name="clear">ล้าง</string>
+    <string name="action_clear">ล้าง</string>
     <string name="room_sync_in_progress">กำลังซิงค์…</string>
-    <string name="remove">เอาออก</string>
-    <string name="room_recents_favourites">รายการโปรด</string>
+    <string name="action_remove">เอาออก</string>
     <string name="settings_password">รหัสผ่าน</string>
     <string name="settings_change_password">เปลี่ยนรหัสผ่าน</string>
     <string name="settings_category_timeline">เส้นเวลา</string>
diff --git a/vector/src/main/res/values-tlh/strings.xml b/vector/src/main/res/values-tlh/strings.xml
index 0f7f1ac8e9..4cefe5a9e4 100644
--- a/vector/src/main/res/values-tlh/strings.xml
+++ b/vector/src/main/res/values-tlh/strings.xml
@@ -20,21 +20,21 @@
     <string name="loading">vIcha\'rupbeHmoHltaH…</string>
 
     <string name="ok">luq</string>
-    <string name="cancel">qIl</string>
-    <string name="save">choq</string>
-    <string name="leave">mej</string>
-    <string name="send">ngeH</string>
-    <string name="resend">ngeHqa\'</string>
-    <string name="quote">jatlhqa\'</string>
-    <string name="download">lI\'</string>
-    <string name="share">bon</string>
-    <string name="speak">jatlh</string>
-    <string name="clear">HuvmoH</string>
+    <string name="action_cancel">qIl</string>
+    <string name="action_save">choq</string>
+    <string name="action_leave">mej</string>
+    <string name="action_send">ngeH</string>
+    <string name="action_resend">ngeHqa\'</string>
+    <string name="action_quote">jatlhqa\'</string>
+    <string name="action_download">lI\'</string>
+    <string name="action_share">bon</string>
+    <string name="action_speak">jatlh</string>
+    <string name="action_clear">HuvmoH</string>
     <string name="later">SIbI\'Ha\'</string>
     <string name="view_source">Hal legh</string>
     <string name="view_decrypted_source">So\'be\'lu\'bogh Hal legh</string>
-    <string name="delete">Qaw\'</string>
-    <string name="rename">pongqa\'</string>
+    <string name="action_delete">Qaw\'</string>
+    <string name="action_rename">pongqa\'</string>
     <string name="active_call">QumchuqtaH</string>
     <string name="ongoing_conference_call_voice">ghogh</string>
     <string name="ongoing_conference_call_video">mIllogh</string>
@@ -45,7 +45,7 @@
     <string name="missing_permissions_title_to_start_conf_call">jIrI\'laHbe\'</string>
     <string name="device_information">jan De\'</string>
     <string name="or">ghap</string>
-    <string name="invite">ruSvep ngeH</string>
+    <string name="action_invite">ruSvep ngeH</string>
     <string name="actions">Qu\'</string>
     <string name="title_activity_bug_report">Qagh ja\'</string>
     <string name="dialog_title_third_party_licences" />
@@ -66,7 +66,7 @@
 
     <string name="action_exit">mejchu\'</string>
     <string name="action_global_search">Dat nej</string>
-    <string name="disable">Qotlh</string>
+    <string name="action_disable">Qotlh</string>
 
     <string name="bottom_action_people">nuvpu\'</string>
     <string name="bottom_action_rooms">pa\'mey</string>
@@ -147,7 +147,7 @@
     <string name="room_settings_leave_conversation">ja\'chuq \'e\' mev</string>
     <string name="room_tombstone_continuation_link">naDev ja\'chuqqa\'</string>
     <string name="room_tombstone_continuation_description">pa\'vamDaq ja\'chuqqa\'</string>
-    <string name="redact">Qaw\'</string>
+    <string name="action_redact">Qaw\'</string>
     <string name="send_bug_report">Qagh ja\'</string>
     <string name="send_bug_report_description">Qagh yIDel! nuq DanID? nuq DapIH? qaS nuq?</string>
     <string name="send_bug_report_logs_description">Qagh tu\'meH, janvamvo\' Qagh De\' ghajboghQonoSmey ngeHlu\'. Qaghvam De\', QonoS, jIH mIllogh je leghlaHbe\' vay\'. Dung ngutlhmey neH ngeH DaneHchugh, \'aplo\'vam yISIj:</string>
diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 6fc2a5a738..de0762f3cf 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -16,27 +16,27 @@
     <string name="title_activity_group_details">Topluluk ayrıntıları</string>
     <string name="loading">Yükleniyor…</string>
     <string name="ok">Tamam</string>
-    <string name="cancel">İptal</string>
-    <string name="save">Kaydet</string>
+    <string name="action_cancel">İptal</string>
+    <string name="action_save">Kaydet</string>
     <string name="room_jump_to_first_unread">Okunmamış ilk mesaja git.</string>
     <string name="title_activity_choose_sticker">Çıkartma gönder</string>
     <string name="dialog_title_third_party_licences">3. parti lisansları</string>
-    <string name="leave">Ayrıl</string>
-    <string name="send">Gönder</string>
-    <string name="resend">Tekrar gönder</string>
-    <string name="redact">Sil</string>
-    <string name="quote">Alıntı</string>
-    <string name="download">İndir</string>
-    <string name="share">Paylaş</string>
-    <string name="speak">Konuş</string>
-    <string name="clear">Temizle</string>
+    <string name="action_leave">Ayrıl</string>
+    <string name="action_send">Gönder</string>
+    <string name="action_resend">Tekrar gönder</string>
+    <string name="action_redact">Sil</string>
+    <string name="action_quote">Alıntı</string>
+    <string name="action_download">İndir</string>
+    <string name="action_share">Paylaş</string>
+    <string name="action_speak">Konuş</string>
+    <string name="action_clear">Temizle</string>
     <string name="later">Sonra</string>
-    <string name="forward">İleri</string>
+    <string name="action_forward">İleri</string>
     <string name="permalink">Kalıcı bağlantı</string>
     <string name="view_source">Kaynağı İncele</string>
     <string name="view_decrypted_source">Deşifre Edilmiş Kaynağı İncele</string>
-    <string name="delete">Sil</string>
-    <string name="rename">Yeniden Adlandır</string>
+    <string name="action_delete">Sil</string>
+    <string name="action_rename">Yeniden Adlandır</string>
     <string name="report_content">İçeriği bildir</string>
     <string name="active_call">Şu anki görüşme</string>
     <string name="ongoing_conference_call">Devam eden konferans görüşmesi. 
@@ -51,7 +51,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Konferans görüşmeleri şifreli (encrypted) odalarda desteklenmiyor</string>
     <string name="send_anyway">Ne olursa olsun gönder</string>
     <string name="or">veya</string>
-    <string name="invite">Davet et</string>
+    <string name="action_invite">Davet et</string>
     <string name="offline">Çevrimdışı</string>
     <string name="action_exit">Çık</string>
     <string name="actions">Aksiyonlar</string>
@@ -65,7 +65,7 @@
     <string name="action_open">Aç</string>
     <string name="action_close">Kapa</string>
     <string name="copied_to_clipboard">Panoya kopyalandı</string>
-    <string name="disable">Etkisizleştir</string>
+    <string name="action_disable">Etkisizleştir</string>
     <string name="dialog_title_confirmation">Onay</string>
     <string name="dialog_title_warning">Uyarı</string>
     <string name="bottom_action_home">Ev</string>
@@ -159,13 +159,13 @@
     <string name="are_you_sure">Emin misiniz?</string>
     <string name="backup">Yedekle</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Oturumu kapatmadan önce anahtarlarınızı yedeklemezseniz şifrelenmiş mesajlarınıza erişiminizi kaybedeceksiniz.</string>
-    <string name="stay">Kal</string>
+    <string name="action_stay">Kal</string>
     <string name="missing_permissions_error">Eksik izinler nedeniyle bu eylem mümkün değil.</string>
     <string name="call_anyway">Yine de Ara</string>
-    <string name="accept">Kabul Et</string>
-    <string name="skip">Atla</string>
+    <string name="action_accept">Kabul Et</string>
+    <string name="action_skip">Atla</string>
     <string name="done">Tamamlandı</string>
-    <string name="abort">İptal Et</string>
+    <string name="action_abort">İptal Et</string>
     <string name="action_sign_out_confirmation_simple">Oturumunuzu kapatmak istediğinizden emin misiniz?</string>
     <string name="keys_backup_banner_in_progress">Anahtarlar yedekleniyor…</string>
     <string name="keys_backup_info_keys_all_backup_up">Tüm anahtarlar yedeklendi</string>
@@ -309,10 +309,10 @@
     <string name="yes">EVET</string>
     <string name="no">HAYIR</string>
     <string name="_continue">Devam et</string>
-    <string name="remove">Sil</string>
-    <string name="join">Katıl</string>
-    <string name="preview">Önizleme</string>
-    <string name="reject">Reddet</string>
+    <string name="action_remove">Sil</string>
+    <string name="action_join">Katıl</string>
+    <string name="action_preview">Önizleme</string>
+    <string name="action_reject">Reddet</string>
     <string name="list_members">Üyeleri Listele</string>
     <string name="open_chat_header">Başlık Aç</string>
     <string name="room_sync_in_progress">Eşzamanlanıyor…</string>
@@ -447,17 +447,6 @@
     <string name="tab_title_search_messages">MESAJLAR</string>
     <string name="tab_title_search_people">KİŞİLER</string>
     <string name="tab_title_search_files">DOSYALAR</string>
-    <string name="room_recents_join">KATIL</string>
-    <string name="room_recents_directory">DİZİN</string>
-    <string name="room_recents_favourites">FAVORİLER</string>
-    <string name="room_recents_conversations">ODALAR</string>
-    <string name="room_recents_low_priority">DÜŞÜK ÖNCELİK</string>
-    <string name="room_recents_invites">DAVETLER</string>
-    <string name="room_recents_start_chat">Sohbet başlat</string>
-    <string name="room_recents_create_room">Oda oluştur</string>
-    <string name="room_recents_join_room">Odaya katıl</string>
-    <string name="room_recents_join_room_title">Bir odaya katıl</string>
-    <string name="room_recents_join_room_prompt">Oda ID\'si ya da takma adı girin</string>
     <string name="directory_search_results_title">Dizinlere gözat</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">1 oda</item>
@@ -1062,11 +1051,11 @@
     <string name="notification_sync_init">Hizmet başlatılıyor</string>
     <string name="title_activity_verify_device">Oturumu doğrula</string>
     <string name="none">Hiç (Yok)</string>
-    <string name="revoke">Geri Al</string>
-    <string name="disconnect">Bağlantıyı Kes</string>
-    <string name="ignore">Yoksay</string>
-    <string name="review">Gözden Geçir</string>
-    <string name="decline">Reddet</string>
+    <string name="action_revoke">Geri Al</string>
+    <string name="action_disconnect">Bağlantıyı Kes</string>
+    <string name="action_ignore">Yoksay</string>
+    <string name="action_review">Gözden Geçir</string>
+    <string name="action_decline">Reddet</string>
     <string name="action_mark_room_read">Okunmuş olarak işaretle</string>
     <string name="call_failed_no_ice_title">Arama yanlış yapılandırılmış sunucudan dolayı başarısız oldu</string>
     <string name="call_failed_no_ice_use_alt">%s kullanmayı deneyin</string>
@@ -1234,8 +1223,8 @@
     <string name="room_list_rooms_empty_title">Odalar</string>
     <string name="room_list_rooms_empty_body">Odalar burada görünecek. Mevcut odaları görmek ya da kendi odanızı kurmak için aşağıdan + butonuna tıklayın.</string>
     <string name="title_activity_emoji_reaction_picker">Tepkiler</string>
-    <string name="reactions_agree">Bencede</string>
-    <string name="reactions_like">Beğendim</string>
+    <string name="action_agree">Bencede</string>
+    <string name="action_like">Beğendim</string>
     <string name="message_add_reaction">Bir Tepki Ekle</string>
     <string name="message_view_reaction">Tekpileri Görüntüle</string>
     <string name="reactions">Tepkiler</string>
@@ -1270,9 +1259,9 @@
     <string name="settings_background_fdroid_sync_mode_battery">Batarya için optimize edildi</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Uygulama arka plandayken gelen mesajlar için uyarılmayacaksınız.</string>
     <string name="settings_background_sync_update_error">Ayarlar güncellenemedi.</string>
-    <string name="play_video">Oynat</string>
-    <string name="pause_video">Durdur</string>
-    <string name="dismiss">Kapat</string>
+    <string name="action_play">Oynat</string>
+    <string name="action_pause">Durdur</string>
+    <string name="action_dismiss">Kapat</string>
     <string name="action_copy">Kopyala</string>
     <string name="dialog_title_success">Başarılı</string>
     <string name="bottom_action_notification">Bildirimler</string>
@@ -1430,7 +1419,7 @@
     <string name="no_permissions_to_start_conf_call">Bu odada konferans görüşmesi başlatma izniniz yok</string>
     <string name="no_permissions_to_start_webrtc_call">Bu odada arama başlatma izniniz yok</string>
     <string name="start_chatting">Sohbet etmeye başla</string>
-    <string name="reset">Sıfırla</string>
+    <string name="action_reset">Sıfırla</string>
     <string name="system_theme">Sistem Varsayılan Teması</string>
     <string name="settings_discovery_mail_pending">Bekleniyor</string>
     <string name="direct_room_user_list_suggestions_title">Öneriler</string>
diff --git a/vector/src/main/res/values-tzm/strings.xml b/vector/src/main/res/values-tzm/strings.xml
index 3566c14f0d..7ac06c77bb 100644
--- a/vector/src/main/res/values-tzm/strings.xml
+++ b/vector/src/main/res/values-tzm/strings.xml
@@ -39,7 +39,6 @@
     <string name="compression_opt_list_choose">Dɣer</string>
     <string name="devices_delete_submit_button_label">Azen</string>
     <string name="room_sliding_menu_messages">Tuzinin</string>
-    <string name="room_recents_join">LKEM</string>
     <string name="tab_title_search_files">IFUYLA</string>
     <string name="search_hint">Rzu</string>
     <string name="room_details_files">Ifuyla</string>
@@ -50,8 +49,8 @@
         <item quantity="one">%das</item>
         <item quantity="other">%das</item>
     </plurals>
-    <string name="reject">Agy</string>
-    <string name="join">Lkem</string>
+    <string name="action_reject">Agy</string>
+    <string name="action_join">Lkem</string>
     <string name="no">UHU</string>
     <string name="yes">YAH</string>
     <string name="call_ring">Aɣuri…</string>
@@ -66,21 +65,21 @@
     <string name="action_open">Ṛẓem</string>
     <string name="actions">Tigawin</string>
     <string name="action_exit">Ffeɣ</string>
-    <string name="decline">Agy</string>
-    <string name="invite">Ɣer</string>
+    <string name="action_decline">Agy</string>
+    <string name="action_invite">Ɣer</string>
     <string name="or">neɣ</string>
     <string name="ongoing_conference_call_video">Afidyu</string>
-    <string name="play_video">Ɣer</string>
-    <string name="delete">Kkes</string>
-    <string name="clear">Sfeḍ</string>
-    <string name="speak">Ssiwel</string>
-    <string name="share">Bḍu</string>
-    <string name="download">Agem</string>
-    <string name="resend">Ssifeḍ</string>
-    <string name="send">Azen</string>
-    <string name="leave">Ffeɣ</string>
-    <string name="save">Ḥḍu</string>
-    <string name="cancel">Sser</string>
+    <string name="action_play">Ɣer</string>
+    <string name="action_delete">Kkes</string>
+    <string name="action_clear">Sfeḍ</string>
+    <string name="action_speak">Ssiwel</string>
+    <string name="action_share">Bḍu</string>
+    <string name="action_download">Agem</string>
+    <string name="action_resend">Ssifeḍ</string>
+    <string name="action_send">Azen</string>
+    <string name="action_leave">Ffeɣ</string>
+    <string name="action_save">Ḥḍu</string>
+    <string name="action_cancel">Sser</string>
     <string name="ok">WAX</string>
     <string name="loading">Asali…</string>
     <string name="summary_you_sent_image">Tuzend yat twellaft.</string>
@@ -94,11 +93,11 @@
     <string name="auth_submit">Azen</string>
     <string name="dialog_title_confirmation">Asentem</string>
     <string name="call_notification_reject">Agy</string>
-    <string name="ignore">Ttu</string>
-    <string name="dismiss">Agy</string>
+    <string name="action_ignore">Ttu</string>
+    <string name="action_dismiss">Agy</string>
     <string name="none">Awd yan</string>
-    <string name="redact">Sfeḍ</string>
-    <string name="stay">Qqim</string>
+    <string name="action_redact">Sfeḍ</string>
+    <string name="action_stay">Qqim</string>
     <string name="notice_room_ban_by_you">Tegdeld %1$s</string>
     <string name="notice_room_ban">igdel %1$s %2$s</string>
     <string name="notice_room_invite_by_you">Teɣrid-d i %1$s</string>
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 1f17bc2628..4446edcf00 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -4,7 +4,6 @@
     <string name="summary_user_sent_image">%1$s надсилає зображення.</string>
     <string name="notice_room_invite_no_invitee">%s запрошення</string>
     <string name="notice_room_invite">%1$s запрошує %2$s</string>
-    <!-- Room display name -->
     <string name="room_displayname_invite_from">Запрошення від %s</string>
     <string name="room_displayname_room_invite">Запрошення до кімнати</string>
     <string name="room_displayname_two_members">%1$s і %2$s</string>
@@ -45,7 +44,7 @@
     <string name="notice_room_third_party_invite">%1$s надсилає запрошення %2$s приєднатися до кімнати</string>
     <string name="notice_room_third_party_registered_invite">%1$s приймає запрошення до %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Неможливо розшифрувати: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Пристрій відправника не надіслав нам ключ для цього повідомлення.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Пристрій відправника не надіслав нам ключ для цього повідомлення.</string>
     <string name="could_not_redact">Не вдається редагувати</string>
     <string name="unable_to_send_message">Не вдалося надіслати повідомлення</string>
     <string name="message_failed_to_upload">Не вдалося завантажити зображення</string>
@@ -173,37 +172,33 @@
     <string name="notice_room_withdraw_by_you">Ви відкликали запрошення для %1$s</string>
     <string name="notice_room_ban_by_you">Ви заблокували %1$s</string>
     <string name="notice_room_unban_by_you">Ви заблокували %1$s</string>
-    <!-- theme -->
     <string name="light_theme">Світла Тема</string>
     <string name="dark_theme">Темна Тема</string>
     <string name="black_theme">OLED Тема</string>
-    <!-- permanent notification subtitle -->
     <string name="notification_sync_in_progress">Синхронізація…</string>
     <string name="notification_listening_for_events">Стеження за подіями</string>
-    <!-- titles -->
     <string name="title_activity_home">Повідомлення</string>
     <string name="title_activity_room">Кімната</string>
     <string name="title_activity_settings">Налаштування</string>
     <string name="title_activity_member_details">Інформація про учасника</string>
     <string name="title_activity_historical">Історія</string>
     <string name="title_activity_bug_report">Звіт про ваду</string>
-    <!-- button names -->
     <string name="ok">Гаразд</string>
-    <string name="cancel">Скасувати</string>
-    <string name="save">Зберегти</string>
-    <string name="leave">Вийти</string>
-    <string name="send">Надіслати</string>
-    <string name="resend">Надіслати ще раз</string>
-    <string name="redact">Прибрати</string>
-    <string name="quote">Цитувати</string>
-    <string name="share">Поділитися</string>
+    <string name="action_cancel">Скасувати</string>
+    <string name="action_save">Зберегти</string>
+    <string name="action_leave">Вийти</string>
+    <string name="action_send">Надіслати</string>
+    <string name="action_resend">Надіслати ще раз</string>
+    <string name="action_redact">Прибрати</string>
+    <string name="action_quote">Цитувати</string>
+    <string name="action_share">Поділитися</string>
     <string name="later">Пізніше</string>
-    <string name="forward">Переслати</string>
+    <string name="action_forward">Переслати</string>
     <string name="permalink">Постійне посилання</string>
     <string name="view_source">Переглянути початковий код</string>
     <string name="view_decrypted_source">Переглянути розшифроване джерело</string>
-    <string name="delete">Видалити</string>
-    <string name="rename">Перейменувати</string>
+    <string name="action_delete">Видалити</string>
+    <string name="action_rename">Перейменувати</string>
     <string name="report_content">Поскаржитись на вміст</string>
     <string name="active_call">Активний виклик</string>
     <string name="ongoing_conference_call">Відбувається конференц-дзвінок.
@@ -218,9 +213,8 @@
     <string name="room_no_conference_call_in_encrypted_rooms">Конференц-дзвінки не підтримуються у зашифрованих кімнатах</string>
     <string name="send_anyway">Усе одно надіслати</string>
     <string name="or">або</string>
-    <string name="invite">Запрошення</string>
+    <string name="action_invite">Запрошення</string>
     <string name="offline">Не в мережі</string>
-    <!-- actions -->
     <string name="action_sign_out">Вийти з облікового запису</string>
     <string name="action_voice_call">Голосовий виклик</string>
     <string name="action_video_call">Відеовиклик</string>
@@ -231,24 +225,19 @@
     <string name="action_open">Відкрити</string>
     <string name="action_close">Закрити</string>
     <string name="copied_to_clipboard">Скопійовано до буфера обміну</string>
-    <string name="disable">Вимкнути</string>
-    <!-- dialog titles -->
+    <string name="action_disable">Вимкнути</string>
     <string name="dialog_title_confirmation">Підтвердження</string>
     <string name="dialog_title_warning">Попередження</string>
-    <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Домівка</string>
     <string name="bottom_action_favourites">Обрані</string>
     <string name="bottom_action_people">Люди</string>
     <string name="bottom_action_rooms">Кімнати</string>
-    <!-- Home screen -->
     <string name="home_filter_placeholder_home">Пошук кімнат</string>
     <string name="home_filter_placeholder_favorites">Пошук обраних</string>
     <string name="home_filter_placeholder_people">Пошук людей</string>
     <string name="home_filter_placeholder_rooms">Пошук кімнат</string>
-    <!-- Home fragment -->
     <string name="invitations_header">Запрошення</string>
     <string name="low_priority_header">Неважливі</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">Бесіди</string>
     <string name="local_address_book_header">Локальні контакти</string>
     <string name="user_directory_header">Каталог користувачів</string>
@@ -256,7 +245,6 @@
     <string name="no_conversation_placeholder">Немає бесід</string>
     <string name="template_no_contact_access_placeholder">Ви не надали ${app_name} доступу до контактів</string>
     <string name="no_result_placeholder">Немає результатів</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">Кімнати</string>
     <string name="rooms_directory_header">Каталог кімнат</string>
     <string name="no_room_placeholder">Кімнати відсутні</string>
@@ -293,7 +281,6 @@
     <string name="start_video_call">Здійснити відеовиклик</string>
     <string name="option_send_files">Надсилання файлів</string>
     <string name="option_take_photo_video">Зняти світлину чи відео</string>
-    <!-- Authentication -->
     <string name="auth_login">Увійти</string>
     <string name="auth_register">Реєстрація</string>
     <string name="auth_submit">Надіслати</string>
@@ -337,7 +324,6 @@
     <string name="auth_reset_password_email_validation_message">На адресу %s надіслано електронний лист. Як тільки ви перейдете за посиланням у ньому, натисніть нижче.</string>
     <string name="auth_reset_password_error_unauthorized">Не вдалося перевірити email: переконайтеся, що ви перейшли за посиланням у листі</string>
     <string name="auth_reset_password_success_message">Пароль скинуто.\n\nВсі ваші пристрої деаутентифіковано, а ви більше не отримаєте push-сповіщень. Щоб увімкнути їх, залогуйтеся знову на всіх пристроях.</string>
-    <!-- Login Screen -->
     <string name="login_error_must_start_http">URL має починатися з http[s]://</string>
     <string name="login_error_network_error">Збій входу: Мережева помилка</string>
     <string name="login_error_unable_login">Збій входу</string>
@@ -352,28 +338,20 @@
     <string name="login_error_limit_exceeded">Надіслано забагато запитів</string>
     <string name="login_error_user_in_use">Ім\'я користувача вже використовується</string>
     <string name="login_error_login_email_not_yet">Ви не перейшли за посиланням в електронному листі</string>
-    <!-- crypto warnings -->
-    <!-- read receipts list Screen -->
     <string name="read_receipts_list">Список міток прочитання</string>
-    <!-- accounts list Screen -->
-    <!-- image size selection -->
     <string name="compression_options">Надіслати як </string>
     <string name="compression_opt_list_original">Оригінал</string>
     <string name="compression_opt_list_large">Великий</string>
     <string name="compression_opt_list_medium">Середній</string>
     <string name="compression_opt_list_small">Малий</string>
-    <!-- media upload / download messages -->
     <string name="attachment_cancel_download">"Скасувати завантаження?</string>
     <string name="attachment_cancel_upload">Скасувати відвантаження?</string>
     <string name="attachment_remaining_time_seconds">%d с</string>
     <string name="attachment_remaining_time_minutes">%1$dхв %2$dс</string>
-    <!-- room creation dialog Screen -->
     <string name="yesterday">Вчора</string>
     <string name="today">Сьогодні</string>
-    <!-- room info dialog Screen -->
     <string name="room_info_room_name">Назва кімнати</string>
     <string name="room_info_room_topic">Тема кімнати</string>
-    <!-- call string -->
     <string name="call_connected">Виклик з\'єднано</string>
     <string name="call_connecting">Встановлюється з\'єднання…</string>
     <string name="call_ended">Виклик завершено</string>
@@ -386,10 +364,8 @@
     <string name="call_error_ice_failed">Медіавиклик не вдався</string>
     <string name="call_error_camera_init_failed">Неможливо ініціювати камеру</string>
     <string name="call_error_answered_elsewhere">Дзвінок прийнято іншим пристроєм</string>
-    <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Зняти світлину чи відео"</string>
     <string name="media_picker_cannot_record_video">Не вдалося записати відео"</string>
-    <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Інформація</string>
     <string name="template_permissions_rationale_msg_storage">Для передачі та збереження вкладень потрібен доступ до медіатеки.\n\nБудь ласка, надайте його у наступному виринаючому вікні, щоб отримати змогу надсилати файли з вашого телефону.</string>
     <string name="template_permissions_rationale_msg_camera">Для зйомки та відеодзвінків необхідно мати доступ до камери.</string>
@@ -402,30 +378,24 @@
 \n
 \nНадати ${app_name} доступ до ваших контактів\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Вибачте.. Дію не виконано через нестачу дозволів</string>
-    <!-- medias slider string -->
     <string name="media_slider_saved">Збережено</string>
     <string name="media_slider_saved_message">Зберегти в завантаженнях?</string>
     <string name="yes">ТАК</string>
     <string name="no">НІ</string>
     <string name="_continue">Продовжити</string>
-    <!-- Actions -->
-    <string name="remove">Видалити</string>
-    <string name="join">Приєднатися</string>
-    <string name="preview">Попередній перегляд</string>
-    <string name="reject">Відхилити</string>
-    <!-- Room -->
+    <string name="action_remove">Видалити</string>
+    <string name="action_join">Приєднатися</string>
+    <string name="action_preview">Попередній перегляд</string>
+    <string name="action_reject">Відхилити</string>
     <string name="room_jump_to_first_unread">Перейти до непрочитаного</string>
-    <!-- Room Preview -->
     <string name="room_preview_invitation_format">%s запросив(ла) вас приєднатися до цієї кімнати</string>
     <string name="room_preview_unlinked_email_warning">Запрошення надіслано на адресу %s, не пов\'язану з цим обліковим записом.\nВи можете увійти під іншим обліковим записом чи приєднати email до цього.</string>
     <string name="room_preview_try_join_an_unknown_room">Ви намагаєтесь отримати доступ до %s. Бажаєте приєднатися щоб взяти участь у обговоренні?</string>
     <string name="room_preview_try_join_an_unknown_room_default">кімната</string>
     <string name="room_preview_room_interactions_disabled">Це попередній перегляд кімнати. Ви в режимі лише читання.</string>
-    <!-- Chat creation -->
     <string name="room_creation_title">Новий Чат</string>
     <string name="room_creation_add_member">Додати учасника</string>
     <string name="room_title_one_member">1 учасник</string>
-    <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Вийти з кімнати</string>
     <string name="room_participants_leave_prompt_msg">Ви впевнені, що хочете вийти з кімнати\?</string>
     <string name="room_participants_remove_prompt_msg">Ви впевнені, що бажаєте вилучити %s з цієї кімнати\?</string>
@@ -453,7 +423,6 @@
     <string name="room_participants_power_level_prompt">Ви не зможете скасувати цю дію, оскільки надаєте користувачу той же рівень повноважень, що й у вас.
 \nВи впевнені\?</string>
     <string name="room_participants_invite_prompt_msg">Ви впевнені, що бажаєте запросити %s до цієї кімнати\?</string>
-    <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Запросити за ID</u></string>
     <string name="people_search_local_contacts">Локальні Контакти (%d)</string>
     <string name="people_search_user_directory">Каталог Користувачів (%s)</string>
@@ -461,7 +430,6 @@
     <string name="people_search_invite_by_id_dialog_title">Запросити користувача за ID</string>
     <string name="people_search_invite_by_id_dialog_description">Введіть одну чи декілька email адрес або Matrix ID</string>
     <string name="people_search_invite_by_id_dialog_hint">Email або Matrix ID</string>
-    <!--  Chat -->
     <string name="room_menu_search">Пошук</string>
     <string name="room_one_user_is_typing">%s друкує…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s друкують…</string>
@@ -477,7 +445,6 @@
     <string name="room_delete_unsent_messages">Видалити не надіслані повідомлення</string>
     <string name="room_message_file_not_found">Файл не знайдено</string>
     <string name="room_do_not_have_permission_to_post">Ви не маєте дозволу писати повідомлення у цій кімнаті.</string>
-    <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Довіряти</string>
     <string name="ssl_do_not_trust">Не довіряти</string>
     <string name="ssl_logout_account">Вийти</string>
@@ -489,7 +456,6 @@
     <string name="ssl_unexpected_existing_expl">Сертифікат почав відрізнятися від того, якому довіряв ваш телефон. Це ДУЖЕ НЕЗВИЧНО. Наполегливо радимо НЕ ПРИЙМАТИ цей новий сертифікат.</string>
     <string name="ssl_expected_existing_expl">Сертифікат змінився з довіреного на недовірений. Сервер міг оновити свій сертифікат. Зв\'яжіться з адміністратором сервера, щоб отримати дійсний відбиток.</string>
     <string name="ssl_only_accept">Приймайте сертифікат лише у випадку збігу відбитку вище з відбитком, оприлюдненим адміністратором сервера.</string>
-    <!-- Room Details -->
     <string name="room_details_title">Деталі про кімнату</string>
     <string name="room_details_people">Люди</string>
     <string name="room_details_files">Файли</string>
@@ -497,14 +463,12 @@
     <string name="malformed_id">Викривлений ID. Використовуйте email адресу або Matrix ID вигляду \'@localpart:domain\'</string>
     <string name="room_details_people_invited_group_name">ЗАПРОШЕНІ</string>
     <string name="room_details_people_present_group_name">ПРИЄДНАЛИСЯ</string>
-    <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Причина скарги на цей вміст</string>
     <string name="room_event_action_report_prompt_ignore_user">Бажаєте сховати всі повідомлення цього користувача\?
 \n
 \nЗауважте, що це перезавантажить застосунок та може тривати деякий час.</string>
     <string name="room_event_action_cancel_upload">Скасувати відвантаження</string>
     <string name="room_event_action_cancel_download">Скасувати завантаження</string>
-    <!-- Search -->
     <string name="search_hint">Пошук</string>
     <string name="search_members_hint">Фільтр переліку користувачів</string>
     <string name="search_no_results">Тут порожньо</string>
@@ -512,28 +476,13 @@
     <string name="tab_title_search_messages">ПОВІДОМЛЕННЯ</string>
     <string name="tab_title_search_people">ЛЮДИ</string>
     <string name="tab_title_search_files">ФАЙЛИ</string>
-    <!-- Room recents -->
-    <string name="room_recents_join">ПРИЄДНАЛИСЯ</string>
-    <string name="room_recents_directory">КАТАЛОГ</string>
-    <string name="room_recents_favourites">ОБРАНІ</string>
-    <string name="room_recents_conversations">КІМНАТИ</string>
-    <string name="room_recents_low_priority">НЕВАЖЛИВІ</string>
-    <string name="room_recents_invites">ЗАПРОШЕННЯ</string>
-    <string name="room_recents_start_chat">Почати чат</string>
-    <string name="room_recents_create_room">Створити кімнату</string>
-    <string name="room_recents_join_room">Увійти до кімнати</string>
-    <string name="room_recents_join_room_title">Увійти до кімнати</string>
-    <string name="room_recents_join_room_prompt">Введіть id кімнати чи аліас</string>
-    <!-- Directory -->
     <string name="directory_search_results_title">Огляд каталогу</string>
     <string name="directory_searching_title">Пошук у каталозі…</string>
-    <!-- home room settings -->
     <string name="room_settings_favourite">Обране</string>
     <string name="room_settings_de_prioritize">Не терміново</string>
     <string name="room_settings_direct_chat">Особиста бесіда</string>
     <string name="room_settings_leave_conversation">Вийти з бесіди</string>
     <string name="room_settings_forget">Забути</string>
-    <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Повідомлення</string>
     <string name="room_sliding_menu_settings">Налаштування</string>
     <string name="room_sliding_menu_version">Версія</string>
@@ -541,7 +490,6 @@
     <string name="room_sliding_menu_third_party_notices">Примітки третіх сторін</string>
     <string name="room_sliding_menu_copyright">Copyright</string>
     <string name="room_sliding_menu_privacy_policy">Політика приватності</string>
-    <!-- Vector Settings -->
     <string name="settings_profile_picture">Аватар</string>
     <string name="settings_display_name">Показуване ім\'я</string>
     <string name="settings_email_address">Е-пошта</string>
@@ -591,7 +539,6 @@
     <string name="settings_devices_list">Сеанси</string>
     <string name="settings_always_show_timestamps">Показувати час надсилання для всіх повідомлень</string>
     <string name="settings_12_24_timestamps">Показувати час надсилання у 12-годинному форматі</string>
-    <!-- analytics -->
     <string name="settings_analytics">Телеметрія</string>
     <string name="settings_data_save_mode">Режим економії трафіку</string>
     <string name="devices_details_dialog_title">Про пристрій</string>
@@ -637,42 +584,33 @@
     <string name="settings_phone_number_verification_error_empty_code">Введіть код активації</string>
     <string name="settings_phone_number_verification_error">Сталася помилка під час перевірки вашого номера</string>
     <string name="settings_phone_number_code">Код</string>
-    <!-- medias saving settings -->
     <string name="media_saving_period_3_days">3 дні</string>
     <string name="media_saving_period_1_week">1 тиждень</string>
     <string name="media_saving_period_1_month">1 місяць</string>
     <string name="media_saving_period_forever">Завжди</string>
-    <!-- Room Settings -->
-    <!-- room global settings-->
     <string name="room_settings_room_photo">Світлина кімнати</string>
     <string name="room_settings_room_name">Назва кімнати</string>
     <string name="room_settings_topic">Тема</string>
     <string name="room_settings_room_tag">Мітка кімнати</string>
     <string name="room_settings_tag_pref_dialog_title">Позначено як:</string>
-    <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Улюблені</string>
     <string name="room_settings_tag_pref_entry_low_priority">Неважливі</string>
     <string name="room_settings_tag_pref_entry_none">Жодного</string>
-    <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Доступ та видимість</string>
     <string name="room_settings_directory_visibility">Показувати кімнату в каталозі</string>
     <string name="room_settings_room_access_rules_pref_title">Доступ</string>
     <string name="room_settings_room_read_history_rules_pref_title">Прочитність історії</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Хто може читати історію повідомлень?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Хто має доступ до кімнати?</string>
-    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Будь-хто</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Лише учасники (з моменту вибору цієї опції)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Лише учасники (з моменту запрошення)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Лише учасники (з моменту вступу)</string>
-    <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Щоб посилатися на кімнату, вона повинна мати адресу.</string>
     <string name="room_settings_room_access_entry_only_invited">Лише запрошені</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Будь-хто з посиланням, окрім гостів</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Будь-хто з посиланням, включно з гостями</string>
-    <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Заблоковані користувачі</string>
-    <!-- advanced -->
     <string name="room_settings_category_advanced_title">Розширені</string>
     <string name="room_settings_room_internal_id">Внутрішній ID кімнати</string>
     <string name="room_settings_addresses_pref_title">Адреси</string>
@@ -683,7 +621,6 @@
     <string name="room_settings_labs_end_to_end_warnings">Вийдіть з облікового запису, щоб отримати змогу увімкнути шифрування.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Шифрувати лише для звірених сеансів</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Ніколи не надсилати зашифровані повідомлення з цього сеансу незвіреним сеансам у цій кімнаті.</string>
-    <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Кімната не має локальної адреси</string>
     <string name="room_settings_addresses_add_new_address">Нова адреса (наприклад #foo:matrix.org)</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Хибний формат псевдоніма</string>
@@ -697,11 +634,8 @@
     <string name="room_settings_addresses_e2e_enabled">У цій кімнаті увімкнено шифрування.</string>
     <string name="room_settings_addresses_e2e_disabled">У цій кімнаті вимкнено шифрування.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Увімкнути шифрування \n(увага: вимкнути його неможливо!)</string>
-    <!-- Directory -->
     <string name="directory_title">Каталог</string>
-    <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s намагався завантажити певну точку зі стрічки подій цієї кімнати, але не зміг її знайти.</string>
-    <!-- encryption dialog -->
     <string name="encryption_information_title">Дані про наскрізне шифрування</string>
     <string name="encryption_information_device_info">Інформація про подію</string>
     <string name="encryption_information_user_id">ID користувача</string>
@@ -745,23 +679,19 @@
     <string name="encryption_information_verify_device_warning">Підтвердьте, порівнявши вказане за допомогою налаштувань користувача в іншому сеансі:</string>
     <string name="encryption_information_verify_device_warning2">Якщо вони відрізняються, безпека вашого зв\'язку може бути під загрозою.</string>
     <string name="encryption_information_verify_key_match">Я підтверджую, що ключі збігаються</string>
-    <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Кімната містить невідомі сеанси</string>
     <string name="unknown_devices_alert_message">Кімната містить незвірені невідомі сеанси.
 \nЦе означає відсутність будь-яких гарантій у тому, що сеанси належать тим користувачам, які заявляють про належність цих сеансів їм.
 \nМи радимо вам звірити кожен сеанс перед тим, як продовжити, проте ви можете перенадіслати повідомлення без звірки, якщо цього бажаєте.
 \n
 \nНевідомі сеанси:</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">Вибір каталогу кімнат</string>
     <string name="directory_server_fail_to_retrieve_server">Можливо сервер недоступний чи перевантажений</string>
     <string name="directory_server_type_homeserver">Введіть сервер для показу каталогу публічних кімнат</string>
     <string name="directory_server_placeholder">Ім\'я сервера</string>
     <string name="directory_server_all_rooms_on_server">Всі кімнати на сервері %s</string>
     <string name="directory_server_native_rooms">Усі кімнати сервера %s</string>
-    <!-- historical -->
     <string name="historical_placeholder">Пошук в історії</string>
-    <!-- text size selection -->
     <string name="font_size">Розмір шрифту</string>
     <string name="tiny">Крихітний</string>
     <string name="small">Дрібний</string>
@@ -770,12 +700,10 @@
     <string name="larger">Великий</string>
     <string name="largest">Найбільший</string>
     <string name="huge">Величезний</string>
-    <!-- Widget-->
     <string name="widget_no_power_to_manage">Вам потрібен дозвіл, щоб керувати віджетами у цій кімнаті</string>
     <string name="widget_creation_failure">Помилка створення віджету</string>
     <string name="settings_labs_create_conference_with_jitsi">Здійснювати конференц дзвінки через Jitsi</string>
     <string name="widget_delete_message_confirmation">Ви впевнені, що бажаєте видалити віджет із цієї кімнати\?</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Не вдалося створити віджет.</string>
     <string name="widget_integration_failed_to_send_request">Не вдалося надіслати запит.</string>
     <string name="widget_integration_positive_power_level">Рівень повноважень має бути цілим додатним числом.</string>
@@ -791,19 +719,16 @@
     <string name="option_take_video">Записати відео</string>
     <string name="call">Виклик</string>
     <string name="settings_theme">Тема</string>
-    <!-- conference call -->
     <string name="conference_call_warning_title">Увага!</string>
     <string name="notification_off">Вимкнено</string>
     <string name="notification_noisy">Гучно</string>
     <string name="encrypted_message">Зашифроване повідомлення</string>
     <string name="settings_labs_native_camera">Використовувати рідну камеру</string>
-    <!-- share keys -->
     <string name="you_added_a_new_device">Щойно доданий вами пристрій \'%s\' править ключі шифрування.</string>
     <string name="your_unverified_device_requesting">Ваш незвірений пристрій «%s» вимагає ключі шифрування.</string>
     <string name="start_verification">Почати перевірку</string>
     <string name="share_without_verifying">Поділитись без перевірки</string>
     <string name="ignore_request">Знехтувати запит</string>
-    <!-- slash commands -->
     <string name="command_error">Помилка виконання команди</string>
     <string name="unrecognized_command">Команду %s не розпізнано</string>
     <string name="title_activity_group_details">Відомості про спільноту</string>
@@ -866,9 +791,9 @@
     <string name="settings_notification_privacy_metadata">• Сповіщення містять лише метадані</string>
     <string name="settings_notification_privacy_secure_message_content">• Зміст повідомлення було <b>надійно розміщено на домашньому сервері Matrix</b></string>
     <string name="dialog_title_third_party_licences">Ліцензії сторонніх виробників</string>
-    <string name="download">Завантажити</string>
-    <string name="speak">Говорити</string>
-    <string name="clear">Очистити</string>
+    <string name="action_download">Завантажити</string>
+    <string name="action_speak">Говорити</string>
+    <string name="action_clear">Очистити</string>
     <string name="e2e_re_request_encryption_key">Вдруге запитати ключі шифрування з інших ваших сеансів.</string>
     <string name="e2e_re_request_encryption_key_sent">Запит ключа надіслано.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Запит надіслано</string>
@@ -1098,7 +1023,7 @@
     <string name="template_settings_call_ringtone_use_app_ringtone">Використовувати стандартний рингтон ${app_name} для вхідних викликів</string>
     <string name="settings_call_ringtone_title">Мелодія вхідного виклику</string>
     <string name="settings_call_ringtone_dialog_title">Виберіть мелодію викликів:</string>
-    <string name="accept">Прийняти</string>
+    <string name="action_accept">Прийняти</string>
     <string name="auth_accept_policies">Будь ласка, ознайомтесь та прийміть правила цього серверу:</string>
     <string name="action_mark_room_read">Позначити прочитаним</string>
     <string name="notification_sync_init">Запуск сервісу</string>
@@ -1144,12 +1069,12 @@
     <string name="call_notification_hangup">Покласти слухавку</string>
     <string name="call_notification_reject">Відхилити</string>
     <string name="call_notification_answer">Відповісти</string>
-    <string name="decline">Відмовити</string>
-    <string name="review">Огляд</string>
-    <string name="ignore">Знехтувати</string>
-    <string name="abort">Перервати</string>
+    <string name="action_decline">Відмовити</string>
+    <string name="action_review">Огляд</string>
+    <string name="action_ignore">Знехтувати</string>
+    <string name="action_abort">Перервати</string>
     <string name="done">Готово</string>
-    <string name="skip">Пропустити</string>
+    <string name="action_skip">Пропустити</string>
     <string name="failed_to_remove_widget">Не вдалося видалити віджет</string>
     <string name="failed_to_add_widget">Не вдалося додати віджет</string>
     <string name="cannot_call_yourself">Ви не можете здійснити дзвінок із самим собою</string>
@@ -1160,12 +1085,12 @@
     <string name="no_permissions_to_start_webrtc_call">У вас немає повноважень на дзвінок у цій кімнаті</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">У вас немає повноважень розпочати конференц-дзвінок</string>
     <string name="no_permissions_to_start_conf_call">У вас немає повноважень розпочати конференц-дзвінок у цій кімнаті</string>
-    <string name="reset">Скинути</string>
-    <string name="dismiss">Відхилити</string>
-    <string name="pause_video">Пауза</string>
-    <string name="play_video">Грати</string>
-    <string name="disconnect">Від’єднатися</string>
-    <string name="stay">Залишитися</string>
+    <string name="action_reset">Скинути</string>
+    <string name="action_dismiss">Відхилити</string>
+    <string name="action_pause">Пауза</string>
+    <string name="action_play">Грати</string>
+    <string name="action_disconnect">Від’єднатися</string>
+    <string name="action_stay">Залишитися</string>
     <string name="backup">Резервна копія</string>
     <string name="are_you_sure">Ви впевнені\?</string>
     <string name="keys_backup_activate">Використати резервну копію ключів</string>
@@ -1207,7 +1132,7 @@
     <string name="settings">Налаштування</string>
     <string name="room_profile_section_more_notifications">Сповіщення</string>
     <string name="direct_room_profile_section_more_settings">Налаштування</string>
-    <string name="revoke">Відкликати</string>
+    <string name="action_revoke">Відкликати</string>
     <string name="none">немає</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Ви втратите доступ до своїх зашифрованих повідомлень, якщо не зробите резервну копію ключів перед виходом з системи.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Безпечне резервне копіювання ключів має бути активним у всіх ваших сеансах, щоб не втратити доступу до ваших зашифрованих повідомлень.</string>
@@ -1850,7 +1775,7 @@
     <string name="new_session">Новий вхід. Це були ви\?</string>
     <string name="refresh">Оновити</string>
     <string name="reset_cross_signing">Скинути ключі</string>
-    <string name="or_other_mx_capabale_client">або будь-який інший, здатний до перехресного підписування, Matrix-клієнт</string>
+    <string name="or_other_mx_capable_client">або будь-який інший, здатний до перехресного підписування, Matrix-клієнт</string>
     <string name="encryption_information_dg_xsigning_disabled">Перехресне підписування не ввімкнене</string>
     <string name="encryption_information_dg_xsigning_not_trusted">Перехресне підписування увімкнено.
 \nКлючі не є довіреними</string>
@@ -1925,8 +1850,8 @@
     <string name="set_recovery_passphrase">Зазначити %s</string>
     <string name="account_password">Пароль облікового запису</string>
     <string name="message_key">Ключ повідомлення</string>
-    <string name="reactions_like">Подобається</string>
-    <string name="reactions_agree">Гаразд</string>
+    <string name="action_like">Подобається</string>
+    <string name="action_agree">Гаразд</string>
     <string name="title_activity_emoji_reaction_picker">Реакції</string>
     <string name="direct_room_created_summary_item_by_you">Ви приєднались.</string>
     <string name="inviting_users_to_room">Запрошування користувачів…</string>
@@ -2195,7 +2120,7 @@
     <string name="create_space">Створити Простір</string>
     <string name="join_space">Приєднатися до Простору</string>
     <string name="invite_by_link">Поділитися посиланням</string>
-    <string name="invite_by_mxid">Запросити за користувацьким іменем</string>
+    <string name="invite_by_username">Запросити за користувацьким іменем</string>
     <string name="invite_by_email">Запросити електронним листом</string>
     <string name="voice_message_slide_to_cancel">Проведіть пальцем, щоб скасувати</string>
     <string name="a11y_start_voice_message">Записати голосове повідомлення</string>
@@ -2585,7 +2510,6 @@
     <string name="settings_discovery_confirm_mail">Ми надіслали вам електронний лист для підтвердження на %s, відкрийте свою е-пошту та клацніть на посилання для підтвердження</string>
     <string name="settings_discovery_confirm_mail_not_clicked">Ми надіслали вам електронний лист для підтвердження на %s, відкрийте свою е-пошту та клацніть на посилання для підтвердження</string>
     <string name="you">Ви</string>
-    <string name="sent_a_bot_buttons">Кнопки бота</string>
     <string name="sent_a_poll">Опитування</string>
     <string name="sent_a_file">Файл</string>
     <string name="sent_a_voice_message">Голосове</string>
@@ -2753,19 +2677,6 @@
     <string name="verification_no_scan_emoji_title">Звірити порівнявши емоджі</string>
     <string name="verification_profile_verify">Звірити</string>
     <string name="command_description_poll">Створює просте опитування</string>
-    <string name="poll_item_selected_aria">Вибрана опція</string>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d голос - Підсумок</item>
-        <item quantity="few">%d голоси - Підсумок</item>
-        <item quantity="many">%d голосів - Підсумок</item>
-        <item quantity="other">%d голосів - Підсумок</item>
-    </plurals>
-    <plurals name="poll_info">
-        <item quantity="one">%d голос</item>
-        <item quantity="few">%d голоси</item>
-        <item quantity="many">%d голосів</item>
-        <item quantity="other">%d голосів</item>
-    </plurals>
     <string name="initialize_cross_signing">Ініціалізувати перехресне підписування</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) входить за допомогою нового сеансу:</string>
     <string name="settings_server_room_version_unstable">нестабільна</string>
@@ -3085,7 +2996,7 @@
     <string name="new_let_people_in_spaces_find_and_join">Нове: Дозволити людям у просторах знаходити та приєднуватися до приватних кімнат</string>
     <string name="invite_just_to_this_room">Лише в цю кімнату</string>
     <string name="invite_to_space_with_name_desc">Вони зможуть переглядати %s</string>
-    <string name="invite_by_mxid_or_mail">Запрошення за іменем користувача або е-поштою</string>
+    <string name="invite_by_username_or_mail">Запрошення за іменем користувача або е-поштою</string>
     <string name="create_spaces_default_public_room_name">Головне</string>
     <string name="share_by_text">Поділитися у тексті</string>
     <string name="settings_security_pin_code_notifications_summary_off">Показувати лише кількість непрочитаних повідомлень у звичайному сповіщенні.</string>
diff --git a/vector/src/main/res/values-uz/strings.xml b/vector/src/main/res/values-uz/strings.xml
index b705987cdf..5b61df1cda 100644
--- a/vector/src/main/res/values-uz/strings.xml
+++ b/vector/src/main/res/values-uz/strings.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="call_notification_answer">Koʻtarish</string>
-    <string name="decline">Rad etish</string>
-    <string name="review">Koʻrib chiqish</string>
-    <string name="ignore">Eʼtiborsiz qoldirish</string>
-    <string name="abort">Tugatish</string>
+    <string name="action_decline">Rad etish</string>
+    <string name="action_review">Koʻrib chiqish</string>
+    <string name="action_ignore">Eʼtiborsiz qoldirish</string>
+    <string name="action_abort">Tugatish</string>
     <string name="done">Bajarildi</string>
-    <string name="skip">O\'tkazib yuborish</string>
-    <string name="accept">Qabul qilish</string>
-    <string name="invite">Taklif qilish</string>
+    <string name="action_skip">O\'tkazib yuborish</string>
+    <string name="action_accept">Qabul qilish</string>
+    <string name="action_invite">Taklif qilish</string>
     <string name="or">yoki</string>
     <string name="send_anyway">Baribir joʻnatish</string>
     <string name="call_anyway">Baribir qo\'ng\'iroq qilish</string>
@@ -27,18 +27,18 @@
     <string name="ongoing_conference_call">Joriy konferts-aloaqa.
 \n%1$s yoki %2$s sifatida qoʻshilish</string>
     <string name="start_chatting">Chatni boshlash</string>
-    <string name="reset">Qayta oʻrnatish</string>
-    <string name="dismiss">Bekor qilish</string>
-    <string name="play_video">Ijro etmoq</string>
+    <string name="action_reset">Qayta oʻrnatish</string>
+    <string name="action_dismiss">Bekor qilish</string>
+    <string name="action_play">Ijro etmoq</string>
     <string name="active_call">Faol qo\'ng\'iroq</string>
     <string name="report_content">Hisobot mazmuni</string>
-    <string name="disconnect">Ajratish</string>
-    <string name="revoke">Bekor qilish</string>
+    <string name="action_disconnect">Ajratish</string>
+    <string name="action_revoke">Bekor qilish</string>
     <string name="none">Yoʻq</string>
     <string name="view_decrypted_source">Shifrlangan manbani ko‘rish</string>
     <string name="view_source">Manbani ko‘rish</string>
     <string name="permalink">Doimiy aloqa</string>
-    <string name="forward">Oldinga</string>
+    <string name="action_forward">Oldinga</string>
     <string name="later">Keyinroq</string>
     <string name="dialog_title_third_party_licences">Uchinchi tomonlarning litsenziyalari</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Chiqishdan oldin kalitlarning zaxira nusxasini yaratmasangiz, shifrlangan xabarlardan foydalanishni yo‘qotishingiz mumkin.</string>
@@ -88,20 +88,20 @@
     <string name="cannot_start_call">Qoʻngʻiroqni amalga oshirish imkoniyati yoʻq, iltimos keyinroq urunib koʻring</string>
     <string name="ongoing_conference_call_video">Video</string>
     <string name="ongoing_conference_call_voice">Ovoz</string>
-    <string name="pause_video">Pauza</string>
-    <string name="rename">Qayta nomlash</string>
-    <string name="delete">Oʻchirib tashlash</string>
-    <string name="clear">Tozalash</string>
-    <string name="speak">Gapirish</string>
-    <string name="share">Tarqatish</string>
-    <string name="download">Yuklash</string>
-    <string name="redact">Oʻchirish</string>
-    <string name="resend">Qayta joʻnatish</string>
-    <string name="send">Joʻnatish</string>
-    <string name="stay">Qolish</string>
-    <string name="leave">Chiqish</string>
-    <string name="save">Saqlash</string>
-    <string name="cancel">Bekor qilish</string>
+    <string name="action_pause">Pauza</string>
+    <string name="action_rename">Qayta nomlash</string>
+    <string name="action_delete">Oʻchirib tashlash</string>
+    <string name="action_clear">Tozalash</string>
+    <string name="action_speak">Gapirish</string>
+    <string name="action_share">Tarqatish</string>
+    <string name="action_download">Yuklash</string>
+    <string name="action_redact">Oʻchirish</string>
+    <string name="action_resend">Qayta joʻnatish</string>
+    <string name="action_send">Joʻnatish</string>
+    <string name="action_stay">Qolish</string>
+    <string name="action_leave">Chiqish</string>
+    <string name="action_save">Saqlash</string>
+    <string name="action_cancel">Bekor qilish</string>
     <string name="ok">OK</string>
     <string name="loading">Yuklanmoqda…</string>
     <string name="title_activity_verify_device">Sessiyani verifikatsiya qilish</string>
diff --git a/vector/src/main/res/values-vi/strings.xml b/vector/src/main/res/values-vi/strings.xml
index ef0abeb90e..882ec75d32 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -19,7 +19,7 @@
     <string name="rooms_header">Phòng</string>
     <string name="no_more_results">Không còn kết quả nào nữa</string>
     <string name="home_filter_placeholder_favorites">Lọc danh sách yêu thích</string>
-    <string name="ignore">Bỏ qua</string>
+    <string name="action_ignore">Bỏ qua</string>
     <string name="conference_call_in_progress">Đã có một cuộc hội thoại đang diễn ra!</string>
     <string name="no_result_placeholder">Không có kết quả nào</string>
     <string name="template_no_contact_access_placeholder">Bạn chưa cho phép ${app_name} truy cập danh bạ của bạn</string>
@@ -35,7 +35,7 @@
     <string name="home_filter_placeholder_rooms">Lọc tên phòng</string>
     <string name="home_filter_placeholder_people">Lọc người</string>
     <string name="dialog_title_confirmation">Xác nhận</string>
-    <string name="disable">Tắt</string>
+    <string name="action_disable">Tắt</string>
     <string name="home_filter_placeholder_home">Lọc tên phòng</string>
     <string name="bottom_action_groups">Cộng đồng</string>
     <string name="bottom_action_rooms">Phòng</string>
@@ -63,9 +63,9 @@
     <string name="call_notification_hangup">Cúp máy</string>
     <string name="call_notification_reject">Từ chối</string>
     <string name="call_notification_answer">Đồng ý</string>
-    <string name="decline">Từ chối</string>
-    <string name="abort">Huỷ bỏ</string>
-    <string name="skip">Bỏ qua</string>
+    <string name="action_decline">Từ chối</string>
+    <string name="action_abort">Huỷ bỏ</string>
+    <string name="action_skip">Bỏ qua</string>
     <string name="offline">Ngoại tuyến</string>
     <string name="or">hoặc</string>
     <string name="call_anyway">Vẫn gọi</string>
@@ -73,8 +73,8 @@
     <string name="missing_permissions_title_to_start_conf_call">Không thể bắt đầu cuộc gọi</string>
     <string name="audio_meeting">Bắt đầu cuộc họp âm thanh</string>
     <string name="done">Xong</string>
-    <string name="accept">Đồng ý</string>
-    <string name="invite">Mời</string>
+    <string name="action_accept">Đồng ý</string>
+    <string name="action_invite">Mời</string>
     <string name="send_anyway">Vẫn gửi</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Gọi hội thoại không được hỗ trợ trong phòng chat được mã hoá</string>
     <string name="device_information">Thông tin phiên</string>
@@ -94,34 +94,34 @@
     <string name="ongoing_conference_call">Có cuộc gọi đến.
 \nTham gia với tư cách %1$s hoặc %2$s</string>
     <string name="start_chatting">Bắt đầu trò chuyện</string>
-    <string name="reset">Cài lại</string>
-    <string name="dismiss">Bỏ</string>
-    <string name="pause_video">Tạm dừng</string>
-    <string name="play_video">Chạy</string>
+    <string name="action_reset">Cài lại</string>
+    <string name="action_dismiss">Bỏ</string>
+    <string name="action_pause">Tạm dừng</string>
+    <string name="action_play">Chạy</string>
     <string name="active_call">Cuộc gọi đang hoạt động</string>
     <string name="report_content">Báo cáo nội dung</string>
-    <string name="disconnect">Ngắt kết nối</string>
-    <string name="revoke">Rút lại</string>
+    <string name="action_disconnect">Ngắt kết nối</string>
+    <string name="action_revoke">Rút lại</string>
     <string name="none">Trống</string>
-    <string name="rename">Đặt lại tên</string>
-    <string name="delete">Xoá</string>
+    <string name="action_rename">Đặt lại tên</string>
+    <string name="action_delete">Xoá</string>
     <string name="view_decrypted_source">Xem nguồn đã được giải mã</string>
     <string name="view_source">Xem nguồn</string>
     <string name="permalink">Đường dẫn</string>
-    <string name="forward">Chuyển tiếp</string>
+    <string name="action_forward">Chuyển tiếp</string>
     <string name="later">Để sau</string>
-    <string name="clear">Xoá</string>
-    <string name="speak">Nói</string>
-    <string name="share">Chia sẻ</string>
-    <string name="download">Tải xuống</string>
-    <string name="quote">Trích</string>
-    <string name="redact">Xoá</string>
-    <string name="resend">Gửi lại</string>
-    <string name="send">Gửi</string>
-    <string name="stay">Ở lại</string>
-    <string name="leave">Thoát</string>
-    <string name="save">Lưu</string>
-    <string name="cancel">Huỷ</string>
+    <string name="action_clear">Xoá</string>
+    <string name="action_speak">Nói</string>
+    <string name="action_share">Chia sẻ</string>
+    <string name="action_download">Tải xuống</string>
+    <string name="action_quote">Trích</string>
+    <string name="action_redact">Xoá</string>
+    <string name="action_resend">Gửi lại</string>
+    <string name="action_send">Gửi</string>
+    <string name="action_stay">Ở lại</string>
+    <string name="action_leave">Thoát</string>
+    <string name="action_save">Lưu</string>
+    <string name="action_cancel">Huỷ</string>
     <string name="ok">OK</string>
     <string name="loading">Đang tải…</string>
     <string name="dialog_title_third_party_licences">Giấy phép bên thứ ba</string>
@@ -327,7 +327,7 @@
     <string name="message_failed_to_upload">Tải hình ảnh lên thất bại</string>
     <string name="unable_to_send_message">Không thể gửi tin nhắn</string>
     <string name="could_not_redact">Không thể rút lại</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Thiết bị của người gửi chưa gửi cho chúng tôi mã khoá cho tin nhắn này.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">Thiết bị của người gửi chưa gửi cho chúng tôi mã khoá cho tin nhắn này.</string>
     <string name="notice_crypto_unable_to_decrypt">** Không thể giải mã: %s **</string>
     <string name="notice_power_level_diff">%1$s từ %2$s thành %3$s</string>
     <string name="power_level_custom_no_value">Tuỳ chỉnh</string>
@@ -504,7 +504,7 @@
     <string name="action_unpublish">Huỷ xuất bản</string>
     <string name="failed_to_remove_widget">Xoá tiện ích thất bại</string>
     <string name="failed_to_add_widget">Thêm tiện ích thất bại</string>
-    <string name="review">Xem xét</string>
+    <string name="action_review">Xem xét</string>
     <string name="action_switch">Chuyển</string>
     <string name="encryption_information_blocked">Đã cho vào danh sách đen</string>
     <string name="encryption_information_verified">Đã xác minh</string>
@@ -583,10 +583,10 @@
     <string name="room_sync_in_progress">Đang đồng bộ…</string>
     <string name="open_chat_header">Mở tiêu đề</string>
     <string name="list_members">Liệt kê các thành viên</string>
-    <string name="reject">Từ chối</string>
-    <string name="preview">Xem trước</string>
-    <string name="join">Tham gia</string>
-    <string name="remove">Xoá</string>
+    <string name="action_reject">Từ chối</string>
+    <string name="action_preview">Xem trước</string>
+    <string name="action_join">Tham gia</string>
+    <string name="action_remove">Xoá</string>
     <string name="_continue">Tiếp tục</string>
     <string name="no">KHÔNG</string>
     <string name="yes">CÓ</string>
@@ -856,20 +856,20 @@
     <string name="settings_mentions_at_room">\@room</string>
     <string name="settings_encrypted_group_messages">Tin nhắn trong chat nhóm được mã hóa</string>
     <string name="settings_group_messages">Tin nhắn trong chat nhóm</string>
-    <string name="settings_encrypted_direct_messages">Tin nhắn trực tiếp 1-1 được mã hóa</string>
-    <string name="settings_messages_direct_messages">Tin nhắn trực tiếp 1-1</string>
+    <string name="settings_encrypted_direct_messages">Tin nhắn trực tiếp 1–1 được mã hóa</string>
+    <string name="settings_messages_direct_messages">Tin nhắn trực tiếp 1–1</string>
     <string name="settings_messages_containing_username">Tên đăng nhập của tôi</string>
     <string name="settings_messages_containing_display_name">Tên hiển thị của tôi</string>
     <string name="settings_messages_at_room">Tin nhắn chứa @room</string>
     <string name="settings_messages_sent_by_bot">Tin nhắn được gửi bởi bot</string>
     <string name="settings_invited_to_room">Khi tôi được mời vào phòng</string>
     <string name="settings_messages_in_group_chat">Tin nhắn trong phòng chat nhóm</string>
-    <string name="settings_messages_in_one_to_one">Tin nhắn trong phòng chat 1-1</string>
+    <string name="settings_messages_in_one_to_one">Tin nhắn trong phòng chat 1–1</string>
     <string name="settings_containing_my_user_name">Tin nhắn chứa tên đăng nhập của tôi</string>
     <string name="settings_containing_my_display_name">Tin nhắn chứa trên tôi</string>
     <string name="settings_when_rooms_are_upgraded">Khi phòng được nâng cấp phiên bản</string>
     <string name="settings_messages_in_e2e_group_chat">Tin nhắn mã hóa trong phòng chat nhóm</string>
-    <string name="settings_messages_in_e2e_one_to_one">Tin nhắn mã hóa trong phòng chat 1-1</string>
+    <string name="settings_messages_in_e2e_one_to_one">Tin nhắn mã hóa trong phòng chat 1–1</string>
     <string name="settings_system_preferences_summary">Chọn màu LED, rung, âm thanh…</string>
     <string name="settings_silent_notifications_preferences">Cấu hình thông báo im lặng</string>
     <string name="settings_call_notifications_preferences">Cấu hình thông báo cuộc gọi</string>
@@ -1095,9 +1095,9 @@
     <string name="a11y_show_password">Hiện mật khẩu</string>
     <string name="a11y_close_keys_backup_banner">Đóng banner sao lưu khóa</string>
     <string name="a11y_create_room">Tạo phòng chat mới</string>
-    <string name="a11y_create_direct_message_by_qr_code">Tạo phòng chat 1-1 bằng cách quét mã QR</string>
-    <string name="a11y_create_direct_message_by_mxid">Tạo mới phòng chat 1-1 theo ID Matrix</string>
-    <string name="a11y_create_direct_message">Tạo mới phòng chat 1-1</string>
+    <string name="a11y_create_direct_message_by_qr_code">Tạo phòng chat 1–1 bằng cách quét mã QR</string>
+    <string name="a11y_create_direct_message_by_mxid">Tạo mới phòng chat 1–1 theo ID Matrix</string>
+    <string name="a11y_create_direct_message">Tạo mới phòng chat 1–1</string>
     <string name="a11y_create_menu_close">Đóng menu tạo phòng…</string>
     <string name="a11y_create_menu_open">Mở menu tạo phòng</string>
     <string name="send_attachment">Gửi tệp đính kèm</string>
@@ -1127,7 +1127,7 @@
     <string name="search_hint_room_name">Tìm Tên</string>
     <string name="room_directory_search_hint">Tên hoặc ID</string>
     <string name="room_filtering_footer_open_room_directory">Xem danh mục phòng chat</string>
-    <string name="room_filtering_footer_create_new_direct_message">Gửi tin nhắn tới phòng 1-1</string>
+    <string name="room_filtering_footer_create_new_direct_message">Gửi tin nhắn tới phòng 1–1</string>
     <string name="room_filtering_footer_create_new_room">Tạo phòng chat mới</string>
     <string name="room_filtering_footer_title">Không tìm thấy kết quả cần tìm\?</string>
     <string name="direct_room_no_known_users">Không tìm thấy, sử dụng chức năng thêm thành viên bằng username.</string>
@@ -1432,17 +1432,6 @@
         <item quantity="other">%d phòng</item>
     </plurals>
     <string name="directory_search_results_title">Duyệt danh mục phòng</string>
-    <string name="room_recents_join_room_prompt">Nhập ID hoặc tên phòng</string>
-    <string name="room_recents_join_room_title">Tham gia phòng</string>
-    <string name="room_recents_join_room">Tham gia phòng</string>
-    <string name="room_recents_create_room">Tạo phòng</string>
-    <string name="room_recents_start_chat">Bắt đầu chat</string>
-    <string name="room_recents_invites">LỜI MỜI</string>
-    <string name="room_recents_low_priority">ƯU TIÊN THẤP</string>
-    <string name="room_recents_conversations">PHÒNG</string>
-    <string name="room_recents_favourites">YÊU THÍCH</string>
-    <string name="room_recents_directory">DANH MỤC</string>
-    <string name="room_recents_join">THAM GIA</string>
     <string name="search_is_not_supported_in_e2e_room">Tìm kiếm trong phòng mã hóa chưa được hỗ trợ.</string>
     <string name="tab_title_search_files">FILES</string>
     <string name="tab_title_search_people">NGƯỜI</string>
@@ -1661,12 +1650,6 @@
     <plurals name="secure_backup_reset_devices_you_can_verify">
         <item quantity="other">Hiển thị %d thiết bị bạn có thể xác minh ngay bây giờ</item>
     </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="other">%d phiếu bầu - Kết quả cuối cùng</item>
-    </plurals>
-    <plurals name="poll_info">
-        <item quantity="other">%d phiếu bầu</item>
-    </plurals>
     <plurals name="settings_active_sessions_count">
         <item quantity="other">%d phiên đang hoạt động</item>
     </plurals>
@@ -1831,8 +1814,8 @@
     <string name="create_space">Tạo Space</string>
     <string name="skip_for_now">Bỏ qua ngay bây giờ</string>
     <string name="share_space_link_message">Gia nhập Space của tôi %1$s %2$s</string>
-    <string name="invite_by_mxid_or_mail">Mời theo tên người dùng hoặc thư</string>
-    <string name="invite_by_mxid">Mời theo tên người dùng</string>
+    <string name="invite_by_username_or_mail">Mời theo tên người dùng hoặc thư</string>
+    <string name="invite_by_username">Mời theo tên người dùng</string>
     <string name="invite_by_email">Mời qua email</string>
     <string name="invite_people_to_your_space_desc">Chỉ có anh lúc này thôi. %s sẽ còn tốt hơn với những người khác.</string>
     <string name="invite_to_space">Mời đến %s</string>
@@ -2058,7 +2041,7 @@
     <string name="command_description_discard_session_not_handled">Chỉ được hỗ trợ trong các phòng được mã hóa</string>
     <string name="command_description_discard_session">Buộc nhóm phiên hướng ra hiện tại trong một căn phòng được mã hóa phải bị loại bỏ</string>
     <string name="template_use_latest_app">Sử dụng ${app_name mới nhất} trên các thiết bị khác của bạn:</string>
-    <string name="or_other_mx_capabale_client">hoặc một máy khách Matrix có khả năng xác thực chéo khác</string>
+    <string name="or_other_mx_capable_client">hoặc một máy khách Matrix có khả năng xác thực chéo khác</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
     <string name="template_app_desktop_web">${app_name} Web
@@ -2259,7 +2242,6 @@
     <string name="verification_request_waiting">Đang chờ…</string>
     <string name="sent_verification_conclusion">Kết luận xác minh</string>
     <string name="sent_a_reaction">Phản ứng với: %s</string>
-    <string name="sent_a_bot_buttons">Nút Bot</string>
     <string name="sent_a_poll">Thăm dò ý kiến</string>
     <string name="send_a_sticker">Sticker</string>
     <string name="sent_a_file">Tệp</string>
@@ -2482,8 +2464,8 @@
     <string name="reactions">Phản ứng</string>
     <string name="message_view_reaction">Xem phản ứng</string>
     <string name="message_add_reaction">Thêm phản ứng</string>
-    <string name="reactions_like">Thích</string>
-    <string name="reactions_agree">Đồng ý</string>
+    <string name="action_like">Thích</string>
+    <string name="action_agree">Đồng ý</string>
     <string name="title_activity_emoji_reaction_picker">Phản ứng</string>
     <string name="room_list_rooms_empty_title">Phòng</string>
     <string name="room_list_people_empty_body">Các cuộc hội thoại tin nhắn trực tiếp của bạn sẽ được hiển thị tại đây. Nhấp vào dấu + dưới cùng bên phải để bắt đầu.</string>
@@ -2698,7 +2680,6 @@
     <string name="verification_use_passphrase">Nếu bạn không thể truy nhập phiên hiện có</string>
     <string name="verification_cannot_access_other_session">Sử dụng Cụm mật khẩu hoặc Khóa phục hồi</string>
     <string name="command_description_poll">Tạo một cuộc thăm dò ý kiến đơn giản</string>
-    <string name="poll_item_selected_aria">Tùy chọn đã chọn</string>
     <string name="delete_account_data_warning">Xóa dữ liệu tài khoản của loại %1$s\?
 \n
 \nSử dụng một cách thận trọng, nó có thể dẫn đến hành vi bất ngờ.</string>
@@ -2779,7 +2760,7 @@
 \nHủy kích hoạt tài khoản của bạn <b>does không theo mặc định khiến chúng tôi quên tin nhắn bạn đã gửi</b>. Nếu bạn muốn chúng tôi quên tin nhắn của bạn, vui lòng đánh dấu vào hộp bên dưới.
 \n
 \nKhả năng hiển thị tin nhắn trong Matrix tương tự như email. Chúng tôi quên tin nhắn của bạn có nghĩa là tin nhắn bạn đã gửi sẽ không được chia sẻ với bất kỳ người dùng mới hoặc chưa đăng ký nào, nhưng người dùng đã đăng ký đã có quyền truy cập vào các tin nhắn này vẫn sẽ có quyền truy cập vào bản sao của họ.</string>
-    <string name="dialog_user_consent_content">Để tiếp tục sử dụng homeserver %1$, bạn phải xem xét và đồng ý với các điều khoản và điều kiện.</string>
+    <string name="dialog_user_consent_content">Để tiếp tục sử dụng homeserver %1$s, bạn phải xem xét và đồng ý với các điều khoản và điều kiện.</string>
     <string name="avatar">Avatar</string>
     <string name="notice_avatar">Chú ý avatar</string>
     <string name="receipt_avatar">Nhận avatar</string>
diff --git a/vector/src/main/res/values-vls/strings.xml b/vector/src/main/res/values-vls/strings.xml
index c8190e7a68..424430d584 100644
--- a/vector/src/main/res/values-vls/strings.xml
+++ b/vector/src/main/res/values-vls/strings.xml
@@ -48,7 +48,7 @@
     <string name="notice_room_third_party_registered_invite">%1$s èt d’uutnodigienge vo %2$s anveird</string>
 
     <string name="notice_crypto_unable_to_decrypt">** Kun nie ountsleuteln: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">’t Toestel van den afzender èt geen sleutels vo da bericht hier gesteurd.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">’t Toestel van den afzender èt geen sleutels vo da bericht hier gesteurd.</string>
 
     <string name="could_not_redact">Kosteg nie verwyderd wordn</string>
     <string name="unable_to_send_message">Kosteg ’t bericht nie verzendn</string>
@@ -138,6 +138,6 @@
     <string name="loading">Loadn…</string>
 
     <string name="ok">Oké</string>
-    <string name="cancel">Annuleern</string>
-    <string name="save">Ipsloan</string>
+    <string name="action_cancel">Annuleern</string>
+    <string name="action_save">Ipsloan</string>
 </resources>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 3780cff69c..5d6de2a2cd 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -33,7 +33,7 @@
     <string name="notice_room_name_removed">%1$s 移除了聊天室名称</string>
     <string name="notice_room_topic_removed">%1$s 移除了聊天室主题</string>
     <string name="notice_crypto_unable_to_decrypt">** 无法解密：%s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">发送者的设备没有向我们发送此消息的密钥。</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">发送者的设备没有向我们发送此消息的密钥。</string>
     <string name="unable_to_send_message">无法发送消息</string>
     <string name="message_failed_to_upload">上传图像失败</string>
     <string name="network_error">网络错误</string>
@@ -210,10 +210,10 @@
     <string name="call_notification_answer">接受</string>
     <string name="call_notification_reject">拒绝</string>
     <string name="call_notification_hangup">挂断</string>
-    <string name="resend">重新发送</string>
-    <string name="quote">引用</string>
-    <string name="share">分享</string>
-    <string name="forward">转发</string>
+    <string name="action_resend">重新发送</string>
+    <string name="action_quote">引用</string>
+    <string name="action_share">分享</string>
+    <string name="action_forward">转发</string>
     <string name="action_voice_call">语音通话</string>
     <string name="action_video_call">视频通话</string>
     <string name="action_mark_all_as_read">全部标记为已读</string>
@@ -238,9 +238,9 @@
     <string name="media_picker_cannot_record_video">无法录制视频</string>
     <string name="media_slider_saved">已保存</string>
     <string name="_continue">继续</string>
-    <string name="join">加入</string>
-    <string name="preview">查看</string>
-    <string name="reject">拒绝</string>
+    <string name="action_join">加入</string>
+    <string name="action_preview">查看</string>
+    <string name="action_reject">拒绝</string>
     <string name="room_preview_invitation_format">%s 邀请你加入这个聊天室</string>
     <string name="room_creation_title">新的聊天</string>
     <string name="room_creation_add_member">添加成员</string>
@@ -255,14 +255,14 @@
     <string name="title_activity_room">聊天室</string>
     <string name="title_activity_settings">设置</string>
     <string name="title_activity_member_details">成员信息</string>
-    <string name="save">保存</string>
-    <string name="leave">离开</string>
-    <string name="send">发送</string>
+    <string name="action_save">保存</string>
+    <string name="action_leave">离开</string>
+    <string name="action_send">发送</string>
     <string name="view_source">查看源代码</string>
     <string name="view_decrypted_source">查看解密后的源代码</string>
     <string name="or">或</string>
     <string name="action_sign_out">登出</string>
-    <string name="disable">禁用</string>
+    <string name="action_disable">禁用</string>
     <string name="dialog_title_warning">警告</string>
     <string name="send_bug_report_description">请描述你遇到的问题。你做了什么？你期望发生什么？实际上发生了什么？</string>
     <string name="send_bug_report_placeholder">在这里描述你的问题</string>
@@ -329,10 +329,6 @@
     <string name="tab_title_search_rooms">聊天室</string>
     <string name="tab_title_search_messages">消息</string>
     <string name="tab_title_search_files">文件</string>
-    <string name="room_recents_join">加入</string>
-    <string name="room_recents_conversations">聊天室</string>
-    <string name="room_recents_start_chat">开始聊天</string>
-    <string name="room_recents_create_room">创建聊天室</string>
     <string name="room_settings_direct_chat">私聊</string>
     <string name="room_sliding_menu_messages">消息</string>
     <string name="room_sliding_menu_settings">设置</string>
@@ -368,8 +364,8 @@
     <string name="encryption_information_ed25519_fingerprint">Ed25519 指纹</string>
     <string name="encryption_import_import">导入</string>
     <string name="encryption_information_verified">已验证</string>
-    <string name="cancel">取消</string>
-    <string name="delete">删除</string>
+    <string name="action_cancel">取消</string>
+    <string name="action_delete">删除</string>
     <string name="cannot_start_call">无法开始通话，请稍后重试</string>
     <string name="missing_permissions_warning">由于缺少权限，某些功能将无法使用…</string>
     <string name="missing_permissions_title_to_start_conf_call">无法发起通话</string>
@@ -448,8 +444,6 @@
 \n注意，此操作会重启应用并将花费一些时间。</string>
     <string name="room_event_action_cancel_upload">取消上传</string>
     <string name="room_event_action_cancel_download">取消下载</string>
-    <string name="room_recents_favourites">收藏夹</string>
-    <string name="room_recents_low_priority">低优先级</string>
     <string name="room_settings_de_prioritize">降低优先级</string>
     <string name="room_settings_leave_conversation">退出对话</string>
     <string name="room_sliding_menu_copyright">版权</string>
@@ -543,7 +537,7 @@
     <string name="unknown_devices_alert_title">聊天室包含未知设备</string>
     <string name="later">稍后再说</string>
     <string name="permalink">永久链接</string>
-    <string name="rename">重命名</string>
+    <string name="action_rename">重命名</string>
     <string name="report_content">举报内容</string>
     <string name="active_call">当前通话</string>
     <string name="ongoing_conference_call">正在进行电话会议。
@@ -588,7 +582,7 @@
 \n请在接下来的弹出窗口中授权允许访问，以便进行通话。</string>
     <string name="permissions_action_not_performed_missing_permissions">对不起。因为权限不足，操作已取消</string>
     <string name="media_slider_saved_message">保存至下载？</string>
-    <string name="remove">移除</string>
+    <string name="action_remove">移除</string>
     <string name="room_preview_unlinked_email_warning">此邀请已发送至未与此账号关联的 %s。
 \n你可能希望用一个不同的账号登录，或者把这个电子邮箱加入到你的账号。</string>
     <string name="room_preview_room_interactions_disabled">这是此聊天室的预览。与聊天室的交互已禁用。</string>
@@ -598,8 +592,6 @@
     <string name="ssl_cert_not_trust">这可能意味着有人正在恶意劫持你的流量，或者你的手机不信任远程服务器提供的数字证书。</string>
     <string name="ssl_cert_new_account_expl">如果服务器管理员说这是预期的情况，请确保下面的指纹与管理员提供的指纹相匹配。</string>
     <string name="room_event_action_report_prompt_reason">报告这个内容的原因</string>
-    <string name="room_recents_directory">目录</string>
-    <string name="room_recents_invites">邀请</string>
     <string name="directory_search_results_title">浏览目录</string>
     <string name="directory_searching_title">正在搜索目录…</string>
     <string name="room_settings_favourite">收藏夹</string>
@@ -640,7 +632,7 @@
     <string name="encryption_information_block">列入黑名单</string>
     <string name="encryption_information_unblock">移出黑名单</string>
     <string name="ok">确认</string>
-    <string name="redact">移除</string>
+    <string name="action_redact">移除</string>
     <string name="send_bug_report_alert_message">你似乎沮丧地摇了摇手机。你想打开问题反馈界面吗？</string>
     <string name="send_files_in">发送至</string>
     <string name="read_receipts_list">已读标签清单</string>
@@ -683,7 +675,7 @@
 \n
 \n未知设备：</string>
     <string name="title_activity_historical">历史消息</string>
-    <string name="invite">邀请</string>
+    <string name="action_invite">邀请</string>
     <string name="action_global_search">全局搜索</string>
     <string name="bottom_action_home">主页</string>
     <string name="bottom_action_favourites">收藏夹</string>
@@ -693,17 +685,14 @@
     <string name="home_filter_placeholder_favorites">按收藏夹过滤</string>
     <string name="home_filter_placeholder_people">按联系人过滤</string>
     <string name="home_filter_placeholder_rooms">按聊天室名称过滤</string>
-    <!-- Home fragment -->
     <string name="invitations_header">邀请</string>
     <string name="low_priority_header">低优先级</string>
-    <!-- People fragment -->
     <string name="direct_chats_header">对话</string>
     <string name="local_address_book_header">本地通讯录</string>
     <string name="matrix_only_filter">只显示 Matrix 联系人</string>
     <string name="no_conversation_placeholder">没有对话</string>
     <string name="no_result_placeholder">没有结果</string>
     <string name="template_no_contact_access_placeholder">你没有授予 ${app_name} 访问本地通讯录的权限</string>
-    <!-- Rooms fragment -->
     <string name="rooms_header">聊天室</string>
     <string name="rooms_directory_header">聊天室目录</string>
     <string name="no_room_placeholder">没有聊天室</string>
@@ -712,20 +701,15 @@
     <string name="people_search_invite_by_id_dialog_description">请输入一个或多个电子邮箱地址或 Matrix ID</string>
     <string name="people_search_invite_by_id_dialog_hint">电子邮箱地址或 Matrix ID</string>
     <string name="room_settings_forget">忘记</string>
-    <!-- directory activity  -->
     <string name="select_room_directory">选择一个聊天室目录</string>
     <string name="directory_server_fail_to_retrieve_server">服务器可能不可用或过载</string>
     <string name="directory_server_type_homeserver">请输入一个要列出公共聊天室的主服务器</string>
     <string name="directory_server_placeholder">服务器名称</string>
     <string name="directory_server_all_rooms_on_server">%s 服务器上的所有聊天室</string>
     <string name="directory_server_native_rooms">所有本地 %s 聊天室</string>
-    <!-- historical -->
     <string name="historical_placeholder">搜索历史</string>
     <string name="action_historical">历史消息</string>
     <string name="people_search_invite_by_id"><u>用 ID 邀请</u></string>
-    <string name="room_recents_join_room">进入聊天室</string>
-    <string name="room_recents_join_room_title">进入一个聊天室</string>
-    <string name="room_recents_join_room_prompt">输入聊天室 ID 或者聊天室别名</string>
     <string name="room_jump_to_first_unread">跳到未读</string>
     <string name="settings_home_display">主页显示</string>
     <string name="settings_pin_missed_notifications">固定含错过通知的聊天室</string>
@@ -763,7 +747,6 @@
     <string name="widget_creation_failure">创建挂件失败</string>
     <string name="settings_labs_create_conference_with_jitsi">用 jitsi 创建会议通话</string>
     <string name="widget_delete_message_confirmation">你确定要删除这个挂件吗？</string>
-    <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">无法创建挂件。</string>
     <string name="widget_integration_failed_to_send_request">发送请求失败。</string>
     <string name="widget_integration_positive_power_level">特权级别必须是正整数。</string>
@@ -787,13 +770,10 @@
     <string name="option_take_photo">拍摄照片</string>
     <string name="option_take_video">拍摄视频</string>
     <string name="settings_labs_native_camera">使用原生相机</string>
-    <!-- share keys -->
     <string name="conference_call_warning_title">警告！</string>
     <string name="conference_call_warning_message">会议通话正在开发中，可能不可靠。</string>
-    <!-- slash commands -->
     <string name="command_error">命令错误</string>
     <string name="unrecognized_command">不可识别的命令：%s</string>
-    <!-- notification statuses -->
     <string name="notification_off">关闭</string>
     <string name="encrypted_message">已加密消息</string>
     <string name="notification_noisy_notifications">响铃通知</string>
@@ -860,7 +840,6 @@
     <plurals name="active_widgets">
         <item quantity="other">已启用 %d 个挂件</item>
     </plurals>
-    <!-- Widget Integration Manager -->
     <string name="community_name">社群名称</string>
     <string name="community_id">社群 ID</string>
     <string name="group_details_home">主页</string>
@@ -925,8 +904,8 @@
     <string name="dialog_user_consent_content">要想继续使用主服务器 %1$s 你必须阅读并同意其服务条款。</string>
     <string name="dialog_user_consent_submit">现在阅读</string>
     <string name="dialog_title_third_party_licences">第三方开源协议</string>
-    <string name="download">下载</string>
-    <string name="clear">清除</string>
+    <string name="action_download">下载</string>
+    <string name="action_clear">清除</string>
     <string name="option_send_voice">发送语音消息</string>
     <string name="go_on_with">使用…打开</string>
     <string name="error_no_external_application_found">对不起，没有可完成此操作的外部应用。</string>
@@ -937,7 +916,7 @@
     <string name="lock_screen_hint">在此输入…</string>
     <string name="settings_labs_enable_send_voice">发送语音消息</string>
     <string name="error_empty_field_your_password">请输入你的密码。</string>
-    <string name="speak">发言</string>
+    <string name="action_speak">发言</string>
     <string name="send_bug_report_description_in_english">如果可能的话，请使用英文撰写问题描述。</string>
     <string name="room_message_placeholder_reply_to_encrypted">发送加密回复…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">发送回复（未加密）…</string>
@@ -1002,7 +981,7 @@
     <string name="resource_limit_hard_contact">请 %s 以继续使用本服务。</string>
     <string name="resource_limit_soft_contact">请 %s 以增加此限制的额度。</string>
     <string name="call_anyway">仍然呼叫</string>
-    <string name="accept">接受</string>
+    <string name="action_accept">接受</string>
     <string name="dialog_title_error">错误</string>
     <string name="auth_accept_policies">请审阅并接受此主服务器的政策：</string>
     <string name="settings_call_category">通话</string>
@@ -1126,10 +1105,10 @@
     <string name="are_you_sure">确定吗？</string>
     <string name="backup">备份</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">如果你在登出账号之前不备份密钥，你将失去你的已加密消息的访问权。</string>
-    <string name="stay">留下</string>
-    <string name="skip">跳过</string>
+    <string name="action_stay">留下</string>
+    <string name="action_skip">跳过</string>
     <string name="done">完成</string>
-    <string name="abort">中止</string>
+    <string name="action_abort">中止</string>
     <string name="action_sign_out_confirmation_simple">你确定要登出账号吗？</string>
     <string name="settings_notification_advanced">高级通知设置</string>
     <string name="settings_notification_by_event">事件的通知重要程度</string>
@@ -1258,7 +1237,7 @@
     <string name="keys_backup_info_title_version">版本</string>
     <string name="keys_backup_info_title_algorithm">算法</string>
     <string name="keys_backup_info_title_signature">签名</string>
-    <string name="ignore">忽略</string>
+    <string name="action_ignore">忽略</string>
     <string name="auth_login_sso">以单点登录方式登录</string>
     <string name="login_error_unknown_host">无法连接到此 URL，请检查</string>
     <string name="login_error_ssl_handshake">你的设备使用了过时的 TLS 安全协议，容易受到攻击，为保证安全，你将无法进行连接</string>
@@ -1337,8 +1316,8 @@
     <string name="room_list_people_empty_title">对话</string>
     <string name="room_list_rooms_empty_title">聊天室</string>
     <string name="title_activity_emoji_reaction_picker">响应</string>
-    <string name="reactions_agree">同意</string>
-    <string name="reactions_like">喜欢</string>
+    <string name="action_agree">同意</string>
+    <string name="action_like">喜欢</string>
     <string name="message_add_reaction">响应</string>
     <string name="message_view_reaction">查看响应</string>
     <string name="reactions">响应</string>
@@ -1371,10 +1350,10 @@
     <string name="preference_root_help_about">帮助和关于</string>
     <string name="edited_suffix">（已编辑）</string>
     <string name="none">无</string>
-    <string name="revoke">撤消</string>
-    <string name="disconnect">断开连接</string>
-    <string name="review">检查</string>
-    <string name="decline">拒绝</string>
+    <string name="action_revoke">撤消</string>
+    <string name="action_disconnect">断开连接</string>
+    <string name="action_review">检查</string>
+    <string name="action_decline">拒绝</string>
     <string name="people_no_identity_server">没有设置身份服务器。</string>
     <string name="call_failed_no_ice_title">服务器的错误配置导致通话失败</string>
     <string name="call_failed_no_ice_description">请要求你的主服务器 (%1$s) 的管理员配置 TURN 服务器，以使通话可靠地工作。
@@ -1389,9 +1368,9 @@
     <string name="login_error_no_homeserver_found">這不是有效的 Matrix 服务器位置</string>
     <string name="login_error_homeserver_not_found">无法在此 URL 找到主服务器，请检查</string>
     <string name="settings_call_ringtone_use_default_stun">允许后备呼叫协助服务器</string>
-    <string name="play_video">播放</string>
-    <string name="pause_video">暂停</string>
-    <string name="dismiss">忽略</string>
+    <string name="action_play">播放</string>
+    <string name="action_pause">暂停</string>
+    <string name="action_dismiss">忽略</string>
     <string name="action_copy">复制</string>
     <string name="dialog_title_success">成功</string>
     <string name="bottom_action_notification">通知</string>
@@ -1980,13 +1959,6 @@
     <string name="no_connectivity_to_the_server_indicator_airplane">飞行模式已打开</string>
     <string name="settings_dev_tools">开发工具</string>
     <string name="settings_account_data">账号数据</string>
-    <plurals name="poll_info">
-        <item quantity="other">%d 票</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="other">%d 票 - 最终结果</item>
-    </plurals>
-    <string name="poll_item_selected_aria">已选选项</string>
     <string name="command_description_poll">创建简单调查</string>
     <string name="verification_cannot_access_other_session">使用恢复密语或密钥</string>
     <string name="verification_use_passphrase">如果你无法访问已有会话</string>
@@ -2126,7 +2098,7 @@
 \n${app_name} Desktop</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">或其他能够交叉签名的 Matrix 客户端</string>
+    <string name="or_other_mx_capable_client">或其他能够交叉签名的 Matrix 客户端</string>
     <string name="template_use_latest_app">在你的其他设备上使用最新的 ${app_name}：</string>
     <string name="command_description_discard_session">强制丢弃加密聊天室中的当前出站群组会话</string>
     <string name="command_description_discard_session_not_handled">仅在加密聊天室中支持</string>
@@ -2290,7 +2262,6 @@
     <string name="settings_show_room_member_state_events">显示聊天室成员状态事件</string>
     <string name="settings_show_room_member_state_events_summary">包括邀请/加入/离开/踢掉/封禁事件和头像/昵称更改。</string>
     <string name="sent_a_poll">轮询</string>
-    <string name="sent_a_bot_buttons">机器人按钮</string>
     <string name="sent_a_reaction">回应：%s</string>
     <string name="sent_verification_conclusion">验证结果</string>
     <string name="delete_account_data_warning">是否删除类型 %1$s 的账号数据？
@@ -2347,7 +2318,7 @@
     <string name="search_banned_user_hint">过滤被封禁的用户</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">你没有权限发起通话</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">你没有权限发起会议通话</string>
-    <string name="reset">重置</string>
+    <string name="action_reset">重置</string>
     <string name="permissions_denied_add_contact">允许访问你的联系人。</string>
     <string name="permissions_denied_qr_code">如需扫描二维码，你须允许相机访问权限。</string>
     <string name="no_more_results">没有更多结果</string>
@@ -2622,7 +2593,7 @@
     <string name="invite_to_space_with_name_desc">他们将可以探索 %s</string>
     <string name="invite_to_space_with_name">邀请至 %s</string>
     <string name="invite_by_link">分享链接</string>
-    <string name="invite_by_mxid">通过用户名进行邀请</string>
+    <string name="invite_by_username">通过用户名进行邀请</string>
     <string name="invite_by_email">通过电子邮件进行邀请</string>
     <string name="invite_people_to_your_space_desc">此刻仅有你自己。%s 与他人一道会更好。</string>
     <string name="invite_to_space">邀请至 %s</string>
@@ -2913,7 +2884,7 @@
     <string name="discovery_invite">通过电子邮件邀请、寻找联系人和更多…</string>
     <string name="finish_setting_up_discovery">设置“发现”已毕。</string>
     <string name="create_space_identity_server_info_none">您目前没有使用身份服务器。为了邀请队友并被他们发现，请在下方配置一个这样的服务器。</string>
-    <string name="invite_by_mxid_or_mail">通过用户名或邮件邀请</string>
+    <string name="invite_by_username_or_mail">通过用户名或邮件邀请</string>
     <string name="create_spaces_invite_public_header_desc">确保只有合适的人能访问 %s 空间。稍后你可以邀请更多的人加入。</string>
     <string name="create_spaces_invite_public_header">谁是你的队友？</string>
     <string name="command_description_add_to_space">添加至规定的空间</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 261a48ba45..f45247ed56 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -39,7 +39,7 @@
     <string name="notice_room_third_party_invite">%1$s 傳送加入房間的邀請給 %2$s</string>
     <string name="notice_room_third_party_registered_invite">%1$s 接受 %2$s 的邀請</string>
     <string name="notice_crypto_unable_to_decrypt">** 無法解密：%s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">傳送者的裝置並未在此訊息傳送他們的金鑰。</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">傳送者的裝置並未在此訊息傳送他們的金鑰。</string>
     <string name="could_not_redact">無法編輯</string>
     <string name="unable_to_send_message">無法傳送訊息</string>
     <string name="message_failed_to_upload">上傳圖片失敗</string>
@@ -266,27 +266,27 @@
     <string name="title_activity_settings">設定</string>
     <string name="title_activity_member_details">會員訊息</string>
     <string name="title_activity_bug_report">錯誤回報</string>
-    <string name="cancel">取消</string>
+    <string name="action_cancel">取消</string>
     <string name="ok">確定</string>
-    <string name="leave">離開</string>
-    <string name="save">儲存</string>
+    <string name="action_leave">離開</string>
+    <string name="action_save">儲存</string>
     <string name="loading">載入中…</string>
-    <string name="send">發送</string>
-    <string name="resend">重新發送</string>
-    <string name="share">分享</string>
+    <string name="action_send">發送</string>
+    <string name="action_resend">重新發送</string>
+    <string name="action_share">分享</string>
     <string name="view_source">查看源代碼</string>
     <string name="notification_noisy_notifications">通知音效</string>
     <string name="notification_silent_notifications">靜音通知</string>
     <string name="title_activity_historical">歷史</string>
     <string name="title_activity_group_details">社群細節</string>
-    <string name="redact">移除</string>
-    <string name="quote">引用</string>
+    <string name="action_redact">移除</string>
+    <string name="action_quote">引用</string>
     <string name="later">稍後</string>
-    <string name="forward">轉寄</string>
+    <string name="action_forward">轉寄</string>
     <string name="permalink">永久連結</string>
     <string name="view_decrypted_source">檢視解密的來源</string>
-    <string name="delete">刪除</string>
-    <string name="rename">重新命名</string>
+    <string name="action_delete">刪除</string>
+    <string name="action_rename">重新命名</string>
     <string name="report_content">回報內容</string>
     <string name="active_call">進行中的通話</string>
     <string name="ongoing_conference_call">正在進行會議通話。 
@@ -301,7 +301,7 @@
     <string name="room_no_conference_call_in_encrypted_rooms">不支援在加密聊天室的會議通話</string>
     <string name="send_anyway">無論如何都要傳送</string>
     <string name="or">或</string>
-    <string name="invite">邀請</string>
+    <string name="action_invite">邀請</string>
     <string name="offline">離線</string>
     <string name="action_exit">離開</string>
     <string name="actions">動作</string>
@@ -315,7 +315,7 @@
     <string name="action_open">開啟</string>
     <string name="action_close">關閉</string>
     <string name="copied_to_clipboard">複製到剪貼簿</string>
-    <string name="disable">停用</string>
+    <string name="action_disable">停用</string>
     <string name="dialog_title_confirmation">確認</string>
     <string name="dialog_title_warning">警告</string>
     <string name="bottom_action_home">首頁</string>
@@ -496,10 +496,10 @@
     <string name="yes">是</string>
     <string name="no">否</string>
     <string name="_continue">繼續</string>
-    <string name="remove">移除</string>
-    <string name="join">加入</string>
-    <string name="preview">預覽</string>
-    <string name="reject">拒絕</string>
+    <string name="action_remove">移除</string>
+    <string name="action_join">加入</string>
+    <string name="action_preview">預覽</string>
+    <string name="action_reject">拒絕</string>
     <string name="list_members">列出成員</string>
     <string name="open_chat_header">打開標頭</string>
     <string name="room_sync_in_progress">正在同步……</string>
@@ -586,9 +586,9 @@
     <string name="ssl_unexpected_existing_expl">你的手機曾經信任的憑證已經變動。這非常不尋常。建議你不要接受此新的憑證。</string>
     <string name="title_activity_choose_sticker">發送貼圖</string>
     <string name="dialog_title_third_party_licences">第三方開放原始碼授權</string>
-    <string name="download">下載</string>
-    <string name="speak">說話</string>
-    <string name="clear">清除</string>
+    <string name="action_download">下載</string>
+    <string name="action_speak">說話</string>
+    <string name="action_clear">清除</string>
     <string name="option_send_voice">發送語音訊息</string>
     <string name="option_send_sticker">發送貼圖</string>
     <string name="no_sticker_application_dialog_content">您目前沒有任何貼圖。 
@@ -622,17 +622,6 @@
     <string name="tab_title_search_messages">訊息</string>
     <string name="tab_title_search_people">聯絡人</string>
     <string name="tab_title_search_files">檔案</string>
-    <string name="room_recents_join">加入</string>
-    <string name="room_recents_directory">目錄</string>
-    <string name="room_recents_favourites">最愛</string>
-    <string name="room_recents_conversations">聊天室</string>
-    <string name="room_recents_low_priority">低優先度</string>
-    <string name="room_recents_invites">邀請</string>
-    <string name="room_recents_start_chat">開始聊天</string>
-    <string name="room_recents_create_room">新建聊天室</string>
-    <string name="room_recents_join_room">加入聊天室</string>
-    <string name="room_recents_join_room_title">加入聊天室</string>
-    <string name="room_recents_join_room_prompt">輸入聊天室 ID 或聊天室別名</string>
     <string name="directory_search_results_title">瀏覽目錄</string>
     <plurals name="directory_search_rooms">
         <item quantity="other">%d 個聊天室</item>
@@ -1080,7 +1069,7 @@
     <string name="template_settings_call_ringtone_use_app_ringtone">為來電使用預設的 ${app_name} 鈴聲</string>
     <string name="settings_call_ringtone_title">來電鈴聲</string>
     <string name="settings_call_ringtone_dialog_title">選取通話鈴聲：</string>
-    <string name="accept">接受</string>
+    <string name="action_accept">接受</string>
     <string name="auth_accept_policies">請審閱並接受此家伺服器的政策：</string>
     <string name="settings_notification_troubleshoot">疑難排解通知</string>
     <string name="settings_troubleshoot_diagnostic">疑難排解診斷</string>
@@ -1153,7 +1142,7 @@
     <string name="title_activity_keys_backup_setup">金鑰備份</string>
     <string name="title_activity_keys_backup_restore">使用金鑰備份</string>
     <string name="keys_backup_is_not_finished_please_wait">金鑰備份尚未完成，請稍候……</string>
-    <string name="skip">略過</string>
+    <string name="action_skip">略過</string>
     <string name="done">完成</string>
     <string name="settings_notification_advanced">進階通知設定</string>
     <string name="settings_notification_by_event">活動通知重要程度</string>
@@ -1248,8 +1237,8 @@
     <string name="are_you_sure">您確定嗎？</string>
     <string name="backup">備份</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">除非您在登出前備份您的金鑰，否則您將會失去對您的加密訊息的存取權。</string>
-    <string name="stay">保留</string>
-    <string name="abort">放棄</string>
+    <string name="action_stay">保留</string>
+    <string name="action_abort">放棄</string>
     <string name="action_sign_out_confirmation_simple">您想要登出嗎？</string>
     <string name="settings_data_save_mode_summary">數據節省模式會套用特定的過濾器，這樣狀態更新與輸入通知就會被過濾掉。</string>
     <string name="encryption_message_recovery">加密訊息復原</string>
@@ -1294,7 +1283,7 @@
     <string name="keys_backup_restoring_computing_key_waiting_message">正在計算復原金鑰……</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">正在下載金鑰……</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">正在匯出金鑰……</string>
-    <string name="ignore">忽略</string>
+    <string name="action_ignore">忽略</string>
     <string name="auth_login_sso">使用單一登入系統登入</string>
     <string name="login_error_unknown_host">這個 URL 不可用，請檢查</string>
     <string name="login_error_ssl_handshake">您的裝置正在使用過期的 TLS 安全協定，容易遭受攻擊，為了您的安全將不會連線</string>
@@ -1402,8 +1391,8 @@
     <string name="room_list_rooms_empty_title">聊天室</string>
     <string name="room_list_rooms_empty_body">您的聊天室將會在此顯示。點擊右下角的 + 來尋找既有的或開始您自己的。</string>
     <string name="title_activity_emoji_reaction_picker">反應</string>
-    <string name="reactions_agree">同意</string>
-    <string name="reactions_like">喜歡</string>
+    <string name="action_agree">同意</string>
+    <string name="action_like">喜歡</string>
     <string name="message_add_reaction">新增反應</string>
     <string name="message_view_reaction">檢視反應</string>
     <string name="reactions">反應</string>
@@ -1485,8 +1474,8 @@
     <string name="direct_room_filter_hint">透過使用者名稱或 ID 過濾……</string>
     <string name="joining_room">正在加入聊天室……</string>
     <string name="message_view_edit_history">檢視編輯歷史</string>
-    <string name="review">審閱</string>
-    <string name="decline">婉拒</string>
+    <string name="action_review">審閱</string>
+    <string name="action_decline">婉拒</string>
     <string name="widget_integration_review_terms">要繼續，您必須接受此服務的條款。</string>
     <string name="terms_of_service">服務條款</string>
     <string name="review_terms">審閱條款</string>
@@ -1494,8 +1483,8 @@
     <string name="terms_description_for_integration_manager">使用機器人、橋接、小工具與貼紙包</string>
     <string name="read_at">閱讀於</string>
     <string name="none">無</string>
-    <string name="revoke">撤銷</string>
-    <string name="disconnect">斷線</string>
+    <string name="action_revoke">撤銷</string>
+    <string name="action_disconnect">斷線</string>
     <string name="people_no_identity_server">未設定身份識別伺服器。</string>
     <string name="call_failed_no_ice_title">因為錯誤設定的伺服器導致通話失敗</string>
     <string name="call_failed_no_ice_description">請要求您家伺服器 (%1$s) 的管理員設定 TURN 伺服器以讓通話正常運作。
@@ -1925,13 +1914,6 @@
     <string name="login_signup_username_hint">使用者名稱</string>
     <string name="settings_dev_tools">開發者工具</string>
     <string name="settings_account_data">帳號資料</string>
-    <plurals name="poll_info">
-        <item quantity="other">%d 投票</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="other">%d 投票 - 最後結果</item>
-    </plurals>
-    <string name="poll_item_selected_aria">已選取的選項</string>
     <string name="command_description_poll">建立簡易投票</string>
     <string name="verification_cannot_access_other_session">使用復原通關密語或金鑰</string>
     <string name="verification_use_passphrase">如果您無法存取既有的工作階段的話</string>
@@ -2058,7 +2040,7 @@
 \n${app_name} 桌面版</string>
     <string name="template_app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">或其他有交叉簽章功能的 Matrix 客戶端</string>
+    <string name="or_other_mx_capable_client">或其他有交叉簽章功能的 Matrix 客戶端</string>
     <string name="template_use_latest_app">在您的其他裝置上使用最新的 ${app_name}：</string>
     <string name="command_description_discard_session">強制丟棄目前在加密聊天室中的外發群組工作階段</string>
     <string name="command_description_discard_session_not_handled">僅在加密聊天室中支援</string>
@@ -2131,9 +2113,9 @@
     <string name="identity_server_set_alternative_notice">或者您可以輸入任何身份識別伺服器 URL</string>
     <string name="identity_server_set_alternative_notice_no_default">輸入身份識別伺服器 URL</string>
     <string name="identity_server_set_alternative_submit">遞交</string>
-    <string name="play_video">播放</string>
-    <string name="pause_video">暫停</string>
-    <string name="dismiss">忽略</string>
+    <string name="action_play">播放</string>
+    <string name="action_pause">暫停</string>
+    <string name="action_dismiss">忽略</string>
     <string name="action_copy">複製</string>
     <string name="dialog_title_success">成功</string>
     <string name="bottom_action_notification">通知</string>
@@ -2325,7 +2307,6 @@
     <string name="settings_show_room_member_state_events">顯示聊天室成員狀態活動</string>
     <string name="settings_show_room_member_state_events_summary">包含邀請／加入／離開／踢除／封鎖事件與大頭貼／顯示名稱變更等。</string>
     <string name="sent_a_poll">投票</string>
-    <string name="sent_a_bot_buttons">機器人按鈕</string>
     <string name="sent_a_reaction">反應：%s</string>
     <string name="sent_verification_conclusion">驗證結論</string>
     <string name="universal_link_malformed">連結格式錯誤</string>
@@ -2382,7 +2363,7 @@
     <string name="search_banned_user_hint">過濾被封鎖的使用者</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">您沒有開始通話的權限</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">您沒有開始會議通話的權限</string>
-    <string name="reset">重設</string>
+    <string name="action_reset">重設</string>
     <string name="settings_security_pin_code_use_biometrics_title">啟用生物識別技術</string>
     <string name="warning_unsaved_change_discard">放棄變更</string>
     <string name="warning_unsaved_change">有未儲存的變更。要放棄變更嗎？</string>
@@ -2648,7 +2629,7 @@
     <string name="invite_to_space_with_name_desc">他們將可以探索 %s</string>
     <string name="invite_to_space_with_name">邀請至 %s</string>
     <string name="invite_by_link">分享連結</string>
-    <string name="invite_by_mxid">透過使用者名稱邀請</string>
+    <string name="invite_by_username">透過使用者名稱邀請</string>
     <string name="invite_by_email">透過電子郵件邀請</string>
     <string name="invite_people_to_your_space_desc">此刻只有您。%s 與其他人一起會更好。</string>
     <string name="invite_people_menu">邀請夥伴</string>
@@ -2903,7 +2884,7 @@
     <string name="discovery_invite">透過電子郵件邀請、尋找聯絡人以及更多……</string>
     <string name="finish_setting_up_discovery">完成探索設定。</string>
     <string name="create_space_identity_server_info_none">您目前並未使用身份認證伺服器。為了邀請隊友並被他們探索，請在下方設定一個。</string>
-    <string name="invite_by_mxid_or_mail">透過使用者名稱或電子郵件邀請</string>
+    <string name="invite_by_username_or_mail">透過使用者名稱或電子郵件邀請</string>
     <string name="create_spaces_invite_public_header_desc">確保合適的人可以存取 %s 公司。您可以稍後再邀請。</string>
     <string name="create_spaces_invite_public_header">誰是您的隊友？</string>
     <string name="command_description_add_to_space">新增至指定的空間</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 34ac5fcddc..2bebefeef2 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -147,7 +147,7 @@
     <string name="notice_power_level_diff">%1$s from %2$s to %3$s</string>
 
     <string name="notice_crypto_unable_to_decrypt">** Unable to decrypt: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">The sender\'s device has not sent us the keys for this message.</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">The sender\'s device has not sent us the keys for this message.</string>
 
     <!-- Messages -->
 
@@ -357,34 +357,13 @@
 
     <!-- button names -->
     <string name="ok">OK</string>
-    <string name="cancel">Cancel</string>
-    <string name="save">Save</string>
-    <string name="leave">Leave</string>
-    <string name="stay">Stay</string>
-    <string name="send">Send</string>
-    <string name="resend">Resend</string>
-    <string name="redact">Remove</string>
-    <string name="quote">Quote</string>
-    <string name="download">Download</string>
-    <string name="share">Share</string>
-    <string name="speak">Speak</string>
-    <string name="clear">Clear</string>
     <string name="later">Later</string>
-    <string name="forward">Forward</string>
     <string name="permalink">Permalink</string>
     <string name="view_source">View Source</string>
     <string name="view_decrypted_source">View Decrypted Source</string>
-    <string name="delete">Delete</string>
-    <string name="rename">Rename</string>
     <string name="none">None</string>
-    <string name="revoke">Revoke</string>
-    <string name="disconnect">Disconnect</string>
     <string name="report_content">Report Content</string>
     <string name="active_call">Active call</string>
-    <string name="play_video">Play</string>
-    <string name="pause_video">Pause</string>
-    <string name="dismiss">Dismiss</string>
-    <string name="reset">Reset</string>
     <string name="start_chatting">Start Chatting</string>
     <string name="learn_more">Learn More</string>
     <string name="spaces">Spaces</string>
@@ -421,23 +400,16 @@
     <string name="call_anyway">Call Anyway</string>
     <string name="send_anyway">Send Anyway</string>
     <string name="or">or</string>
-    <string name="invite">Invite</string>
     <string name="offline">Offline</string>
-    <string name="accept">Accept</string>
-    <string name="skip">Skip</string>
     <string name="done">Done</string>
-    <string name="abort">Abort</string>
-    <string name="ignore">Ignore</string>
-    <string name="review">Review</string>
-    <string name="decline">Decline</string>
 
     <string name="call_notification_answer">Accept</string>
     <string name="call_notification_reject">Decline</string>
     <string name="call_notification_hangup">Hang Up</string>
 
     <!-- actions -->
-    <string name="action_exit">Exit</string>
     <string name="actions">Actions</string>
+    <string name="action_exit">Exit</string>
     <string name="action_sign_out">Sign out</string>
     <string name="action_sign_out_confirmation_simple">Are you sure you want to sign out?</string>
     <string name="action_voice_call">Voice Call</string>
@@ -453,11 +425,47 @@
     <string name="action_add">Add</string>
     <string name="action_switch">Switch</string>
     <string name="action_unpublish">Unpublish</string>
-    <string name="copied_to_clipboard">Copied to clipboard</string>
-    <string name="disable">Disable</string>
     <string name="action_return">Return</string>
     <string name="action_enable">Enable</string>
     <string name="action_not_now">Not now</string>
+    <string name="action_agree">Agree</string>
+    <string name="action_like">Like</string>
+    <string name="action_change">"Change"</string>
+    <string name="action_remove">Remove</string>
+    <string name="action_join">Join</string>
+    <string name="action_preview">Preview</string>
+    <string name="action_reject">Reject</string>
+    <string name="action_disable">Disable</string>
+    <string name="action_accept">Accept</string>
+    <string name="action_skip">Skip</string>
+    <string name="action_abort">Abort</string>
+    <string name="action_ignore">Ignore</string>
+    <string name="action_review">Review</string>
+    <string name="action_decline">Decline</string>
+    <string name="action_invite">Invite</string>
+    <string name="action_cancel">Cancel</string>
+    <string name="action_save">Save</string>
+    <string name="action_leave">Leave</string>
+    <string name="action_stay">Stay</string>
+    <string name="action_send">Send</string>
+    <string name="action_resend">Resend</string>
+    <string name="action_redact">Remove</string>
+    <string name="action_quote">Quote</string>
+    <string name="action_download">Download</string>
+    <string name="action_share">Share</string>
+    <string name="action_speak">Speak</string>
+    <string name="action_clear">Clear</string>
+    <string name="action_forward">Forward</string>
+    <string name="action_delete">Delete</string>
+    <string name="action_rename">Rename</string>
+    <string name="action_revoke">Revoke</string>
+    <string name="action_disconnect">Disconnect</string>
+    <string name="action_play">Play</string>
+    <string name="action_pause">Pause</string>
+    <string name="action_dismiss">Dismiss</string>
+    <string name="action_reset">Reset</string>
+
+    <string name="copied_to_clipboard">Copied to clipboard</string>
 
     <!-- dialog titles -->
     <string name="dialog_title_confirmation">Confirmation</string>
@@ -802,12 +810,6 @@
     <string name="_continue">Continue</string>
     <string name="continue_anyway">Continue Anyway</string>
 
-    <!-- Actions -->
-    <string name="remove">Remove</string>
-    <string name="join">Join</string>
-    <string name="preview">Preview</string>
-    <string name="reject">Reject</string>
-
     <!-- Room -->
     <string name="list_members">List members</string>
     <string name="open_chat_header">Open header</string>
@@ -1043,19 +1045,6 @@
     <string name="tab_title_search_files">FILES</string>
     <string name="search_is_not_supported_in_e2e_room">Searching in encrypted rooms is not supported yet.</string>
 
-    <!-- Room recents -->
-    <string name="room_recents_join">JOIN</string>
-    <string name="room_recents_directory">DIRECTORY</string>
-    <string name="room_recents_favourites">FAVORITES</string>
-    <string name="room_recents_conversations">ROOMS</string>
-    <string name="room_recents_low_priority">LOW PRIORITY</string>
-    <string name="room_recents_invites">INVITES</string>
-    <string name="room_recents_start_chat">Start chat</string>
-    <string name="room_recents_create_room">Create room</string>
-    <string name="room_recents_join_room">Join room</string>
-    <string name="room_recents_join_room_title">Join a room</string>
-    <string name="room_recents_join_room_prompt">Type a room id or a room alias</string>
-
     <!-- Directory -->
     <string name="directory_search_results_title">Browse directory</string>
     <plurals name="directory_search_rooms">
@@ -2210,10 +2199,6 @@
     <string name="room_list_rooms_empty_body">Your rooms will be displayed here. Tap the + bottom right to find existing ones or start some of your own.</string>
 
     <string name="title_activity_emoji_reaction_picker">Reactions</string>
-    <!-- TODO weblate sync: rename to "action_agree"-->
-    <string name="reactions_agree">Agree</string>
-    <!-- TODO weblate sync: rename to "action_like"-->
-    <string name="reactions_like">Like</string>
     <string name="message_add_reaction">Add Reaction</string>
     <string name="message_view_reaction">View Reactions</string>
     <string name="reactions">Reactions</string>
@@ -2230,7 +2215,6 @@
     <string name="create_new_room">Create New Room</string>
     <string name="create_new_space">Create New Space</string>
     <string name="error_no_network">No network. Please check your Internet connection.</string>
-    <string name="action_change">"Change"</string>
     <string name="change_room_directory_network">"Change network"</string>
     <string name="please_wait">"Please wait…"</string>
     <string name="group_all_communities">"All Communities"</string>
@@ -2756,7 +2740,6 @@
     <string name="sent_a_file">File</string>
     <string name="send_a_sticker">Sticker</string>
     <string name="sent_a_poll">Poll</string>
-    <string name="sent_a_bot_buttons">Bot Buttons</string>
     <string name="sent_a_reaction">Reacted with: %s</string>
     <string name="sent_verification_conclusion">Verification Conclusion</string>
 
@@ -2936,15 +2919,6 @@
     <string name="settings_account_data">Account Data</string>
     <string name="delete_account_data_warning">Delete the account data of type %1$s?\n\nUse with caution, it may lead to unexpected behavior.</string>
 
-    <plurals name="poll_info">
-        <item quantity="zero">%d vote</item>
-        <item quantity="other">%d votes</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="zero">%d vote - Final results</item>
-        <item quantity="other">%d votes - Final results</item>
-    </plurals>
-    <string name="poll_item_selected_aria">Selected Option</string>
     <string name="command_description_poll">Creates a simple poll</string>
     <string name="verification_cannot_access_other_session">Use a Recovery Passphrase or Key</string>
     <string name="verification_use_passphrase">If you can’t access an existing session</string>
@@ -3140,7 +3114,7 @@
     <string name="template_app_desktop_web">${app_name} Web\n${app_name} Desktop</string>
     <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
     <string name="template_app_ios_android">${app_name} iOS\n${app_name} Android</string>
-    <string name="or_other_mx_capabale_client">or another cross-signing capable Matrix client</string>
+    <string name="or_other_mx_capable_client">or another cross-signing capable Matrix client</string>
     <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
     <string name="template_use_latest_app">Use the latest ${app_name} on your other devices:</string>
     <string name="command_description_discard_session">Forces the current outbound group session in an encrypted room to be discarded</string>
@@ -3517,8 +3491,8 @@
     <string name="invite_to_space">Invite to %s</string>
     <string name="invite_people_to_your_space_desc">It’s just you at the moment.  %s will be even better with others.</string>
     <string name="invite_by_email">Invite by email</string>
-    <string name="invite_by_mxid">Invite by username</string>
-    <string name="invite_by_mxid_or_mail">Invite by username or mail</string>
+    <string name="invite_by_username">Invite by username</string>
+    <string name="invite_by_username_or_mail">Invite by username or mail</string>
     <string name="invite_by_link">Share link</string>
     <string name="invite_to_space_with_name">Invite to %s</string>
     <string name="invite_to_space_with_name_desc">"They’ll be able to explore %s"</string>