From 7aa9f88cebd5ead7df094092bb32a5658e790dfa Mon Sep 17 00:00:00 2001 From: Onuray Sahin Date: Wed, 1 Jul 2020 14:43:35 +0300 Subject: [PATCH] New string resources created by changing brand name. --- .../troubleshoot/TestFirebaseToken.kt | 6 ++-- .../settings/troubleshoot/TestPlayServices.kt | 2 +- .../vector/riotx/core/error/ErrorFormatter.kt | 4 +-- .../riotx/features/call/VectorCallActivity.kt | 6 ++-- .../setup/KeysBackupSetupActivity.kt | 2 +- .../setup/KeysBackupSetupStep2Fragment.kt | 2 +- .../setup/KeysBackupSetupStep3Fragment.kt | 2 +- .../change/SetIdentityServerViewModel.kt | 2 +- .../home/room/detail/RoomDetailFragment.kt | 4 +-- .../home/room/detail/RoomDetailViewModel.kt | 2 +- .../timeline/factory/DefaultItemFactory.kt | 4 +-- .../riotx/features/login/LoginFragment.kt | 2 +- .../login/LoginServerUrlFormFragment.kt | 4 +-- .../RoomPreviewNoPreviewFragment.kt | 2 +- .../VectorSettingsSecurityPrivacyFragment.kt | 2 +- .../troubleshoot/TestDeviceSettings.kt | 2 +- .../signout/soft/SoftLogoutActivity.kt | 2 +- .../res/layout/dialog_disclaimer_content.xml | 2 +- .../layout/fragment_login_server_url_form.xml | 2 +- .../layout/item_notification_troubleshoot.xml | 2 +- .../item_timeline_event_default_stub.xml | 2 +- .../res/layout/item_verification_wait.xml | 8 ++--- vector/src/main/res/values/strings.xml | 31 +++++++++++++++++++ .../xml/vector_settings_advanced_settings.xml | 2 +- .../xml/vector_settings_security_privacy.xml | 2 +- .../res/xml/vector_settings_voice_video.xml | 2 +- 26 files changed, 67 insertions(+), 36 deletions(-) diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt index 3806893d98..9b5133433d 100644 --- a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt +++ b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt @@ -41,11 +41,11 @@ class TestFirebaseToken @Inject constructor(private val context: AppCompatActivi val errorMsg = if (task.exception == null) "Unknown" else task.exception!!.localizedMessage // Can't find where this constant is (not documented -or deprecated in docs- and all obfuscated) if ("SERVICE_NOT_AVAILABLE".equals(errorMsg)) { - description = stringProvider.getString(R.string.settings_troubleshoot_test_fcm_failed_service_not_available, errorMsg) + description = stringProvider.getString(R.string.element_settings_troubleshoot_test_fcm_failed_service_not_available, errorMsg) } else if ("TOO_MANY_REGISTRATIONS".equals(errorMsg)) { - description = stringProvider.getString(R.string.settings_troubleshoot_test_fcm_failed_too_many_registration, errorMsg) + description = stringProvider.getString(R.string.element_settings_troubleshoot_test_fcm_failed_too_many_registration, errorMsg) } else if ("ACCOUNT_MISSING".equals(errorMsg)) { - description = stringProvider.getString(R.string.settings_troubleshoot_test_fcm_failed_account_missing, errorMsg) + description = stringProvider.getString(R.string.element_settings_troubleshoot_test_fcm_failed_account_missing, errorMsg) quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_fcm_failed_account_missing_quick_fix) { override fun doFix() { startAddGoogleAccountIntent(context, NotificationTroubleshootTestManager.REQ_CODE_FIX) diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt index c28a02d350..e72d951a0f 100644 --- a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt +++ b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt @@ -48,7 +48,7 @@ class TestPlayServices @Inject constructor(private val context: AppCompatActivit Timber.e("Play Services apk error $resultCode -> ${apiAvailability.getErrorString(resultCode)}.") } - description = stringProvider.getString(R.string.settings_troubleshoot_test_play_services_failed, apiAvailability.getErrorString(resultCode)) + description = stringProvider.getString(R.string.element_settings_troubleshoot_test_play_services_failed, apiAvailability.getErrorString(resultCode)) status = TestStatus.FAILED } } diff --git a/vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt index b2e02d564c..9fa9d5ab5d 100644 --- a/vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt +++ b/vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt @@ -112,11 +112,11 @@ class DefaultErrorFormatter @Inject constructor( private fun identityServerError(identityServiceError: IdentityServiceError): String { return stringProvider.getString(when (identityServiceError) { - IdentityServiceError.OutdatedIdentityServer -> R.string.identity_server_error_outdated_identity_server + IdentityServiceError.OutdatedIdentityServer -> R.string.element_identity_server_error_outdated_identity_server IdentityServiceError.OutdatedHomeServer -> R.string.identity_server_error_outdated_home_server IdentityServiceError.NoIdentityServerConfigured -> R.string.identity_server_error_no_identity_server_configured IdentityServiceError.TermsNotSignedException -> R.string.identity_server_error_terms_not_signed - IdentityServiceError.BulkLookupSha256NotSupported -> R.string.identity_server_error_bulk_sha256_not_supported + IdentityServiceError.BulkLookupSha256NotSupported -> R.string.element_identity_server_error_bulk_sha256_not_supported IdentityServiceError.BindingError -> R.string.identity_server_error_binding_error IdentityServiceError.NoCurrentBindingError -> R.string.identity_server_error_no_current_binding_error }) diff --git a/vector/src/main/java/im/vector/riotx/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/riotx/features/call/VectorCallActivity.kt index bbfd8b20fc..d5b9e8e984 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/VectorCallActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/call/VectorCallActivity.kt @@ -199,11 +199,11 @@ class VectorCallActivity : VectorBaseActivity(), CallControlsView.InteractionLis .disposeOnDestroy() if (callArgs.isVideoCall) { - if (checkPermissions(PERMISSIONS_FOR_VIDEO_IP_CALL, this, CAPTURE_PERMISSION_REQUEST_CODE, R.string.permissions_rationale_msg_camera_and_audio)) { + if (checkPermissions(PERMISSIONS_FOR_VIDEO_IP_CALL, this, CAPTURE_PERMISSION_REQUEST_CODE, R.string.element_permissions_rationale_msg_camera_and_audio)) { start() } } else { - if (checkPermissions(PERMISSIONS_FOR_AUDIO_IP_CALL, this, CAPTURE_PERMISSION_REQUEST_CODE, R.string.permissions_rationale_msg_record_audio)) { + if (checkPermissions(PERMISSIONS_FOR_AUDIO_IP_CALL, this, CAPTURE_PERMISSION_REQUEST_CODE, R.string.element_permissions_rationale_msg_record_audio)) { start() } } @@ -367,7 +367,7 @@ class VectorCallActivity : VectorBaseActivity(), CallControlsView.InteractionLis // TODO ask to use default stun, etc... AlertDialog .Builder(this) - .setTitle(R.string.call_failed_no_connection) + .setTitle(R.string.element_call_failed_no_connection) .setMessage(getString(R.string.call_failed_no_connection_description)) .setNegativeButton(R.string.ok) { _, _ -> callViewModel.handle(VectorCallViewActions.EndCall) diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt index c7d3da30ea..78f0368248 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt @@ -131,7 +131,7 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() { if (checkPermissions(PERMISSIONS_FOR_WRITING_FILES, this, PERMISSION_REQUEST_CODE_EXPORT_KEYS, - R.string.permissions_rationale_msg_keys_backup_export)) { + R.string.element_permissions_rationale_msg_keys_backup_export)) { ExportKeysDialog().show(this, object : ExportKeysDialog.ExportKeyDialogListener { override fun onPassphrase(passphrase: String) { showWaitingView() diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt index 93d6f43763..0ede6dffd2 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt @@ -192,7 +192,7 @@ class KeysBackupSetupStep2Fragment @Inject constructor() : VectorBaseFragment() } else -> { // User has entered a passphrase but want to skip this step. - viewModel.passphraseError.value = context?.getString(R.string.keys_backup_passphrase_not_empty_error_message) + viewModel.passphraseError.value = context?.getString(R.string.element_keys_backup_passphrase_not_empty_error_message) } } } diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt index 1478b99d3b..6a778baad8 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt @@ -134,7 +134,7 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment() PERMISSIONS_FOR_WRITING_FILES, this, PERMISSION_REQUEST_CODE_EXPORT_KEYS, - R.string.permissions_rationale_msg_keys_backup_export + R.string.element_permissions_rationale_msg_keys_backup_export ) if (permissionsChecked) { exportRecoveryKeyToFile(recoveryKey) diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt b/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt index 9bec24548e..f03dc4b51c 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt @@ -105,7 +105,7 @@ class SetIdentityServerViewModel @AssistedInject constructor( } catch (failure: Throwable) { when { failure is IdentityServiceError.OutdatedIdentityServer -> - _viewEvents.post(SetIdentityServerViewEvents.Failure(R.string.identity_server_error_outdated_identity_server, isDefault)) + _viewEvents.post(SetIdentityServerViewEvents.Failure(R.string.element_identity_server_error_outdated_identity_server, isDefault)) failure is Failure.NetworkConnection && failure.ioException is UnknownHostException -> _viewEvents.post(SetIdentityServerViewEvents.Failure(R.string.settings_discovery_bad_identity_server, isDefault)) else -> diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt index 4995c16bf9..c03533e4cc 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt @@ -563,14 +563,14 @@ class RoomDetailFragment @Inject constructor( if (isVideoCall) { if (checkPermissions(PERMISSIONS_FOR_VIDEO_IP_CALL, this, VIDEO_CALL_PERMISSION_REQUEST_CODE, - R.string.permissions_rationale_msg_camera_and_audio)) { + R.string.element_permissions_rationale_msg_camera_and_audio)) { roomDetailViewModel.pendingAction = null roomDetailViewModel.handle(startCallAction) } } else { if (checkPermissions(PERMISSIONS_FOR_AUDIO_IP_CALL, this, AUDIO_CALL_PERMISSION_REQUEST_CODE, - R.string.permissions_rationale_msg_record_audio)) { + R.string.element_permissions_rationale_msg_record_audio)) { roomDetailViewModel.pendingAction = null roomDetailViewModel.handle(startCallAction) } diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt index b481c00be7..6d49310a1a 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt @@ -1032,7 +1032,7 @@ class RoomDetailViewModel @AssistedInject constructor( // Check if this request is still active and handled by me room.getTimeLineEvent(action.eventId)?.let { session.cryptoService().reRequestRoomKeyForEvent(it.root) - _viewEvents.post(RoomDetailViewEvents.ShowMessage(stringProvider.getString(R.string.e2e_re_request_encryption_key_dialog_content))) + _viewEvents.post(RoomDetailViewEvents.ShowMessage(stringProvider.getString(R.string.element_e2e_re_request_encryption_key_dialog_content))) } } diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt index 89e21e04a2..7b9a4f6d4b 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt @@ -58,9 +58,9 @@ class DefaultItemFactory @Inject constructor(private val avatarSizeProvider: Ava callback: TimelineEventController.Callback?, throwable: Throwable? = null): DefaultItem { val text = if (throwable == null) { - stringProvider.getString(R.string.rendering_event_error_type_of_event_not_handled, event.root.getClearType()) + stringProvider.getString(R.string.element_rendering_event_error_type_of_event_not_handled, event.root.getClearType()) } else { - stringProvider.getString(R.string.rendering_event_error_exception, event.root.eventId) + stringProvider.getString(R.string.element_rendering_event_error_exception, event.root.eventId) } val informationData = informationDataFactory.create(event, null) return create(text, informationData, highlight, callback) diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt index eaf0a3cc78..547cb8b07a 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt @@ -115,7 +115,7 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() { } if (error == 0) { - loginViewModel.handle(LoginAction.LoginOrRegister(login, password, getString(R.string.login_mobile_device_riotx))) + loginViewModel.handle(LoginAction.LoginOrRegister(login, password, getString(R.string.element_login_mobile_device_riotx))) } } diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt index cb90ef2397..c231effa5f 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt @@ -68,7 +68,7 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment() loginServerUrlFormText.text = getString(R.string.login_server_url_form_modular_text) loginServerUrlFormLearnMore.isVisible = true loginServerUrlFormHomeServerUrlTil.hint = getText(R.string.login_server_url_form_modular_hint) - loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_modular_notice) + loginServerUrlFormNotice.text = getString(R.string.element_login_server_url_form_modular_notice) } ServerType.Other -> { loginServerUrlFormIcon.isVisible = false @@ -76,7 +76,7 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment() loginServerUrlFormText.text = getString(R.string.login_connect_to_a_custom_server) loginServerUrlFormLearnMore.isVisible = false loginServerUrlFormHomeServerUrlTil.hint = getText(R.string.login_server_url_form_other_hint) - loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_other_notice) + loginServerUrlFormNotice.text = getString(R.string.element_login_server_url_form_other_notice) } else -> error("This fragment should not be displayed in matrix.org mode") } diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt index 04ecdb2305..dd550f368a 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt @@ -58,7 +58,7 @@ class RoomPreviewNoPreviewFragment @Inject constructor( roomPreviewNoPreviewTopic.setTextOrHide(roomPreviewData.topic) if (roomPreviewData.worldReadable) { - roomPreviewNoPreviewLabel.setText(R.string.room_preview_world_readable_room_not_supported_yet) + roomPreviewNoPreviewLabel.setText(R.string.element_room_preview_world_readable_room_not_supported_yet) } else { roomPreviewNoPreviewLabel.setText(R.string.room_preview_no_preview) } diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt index 3a1d4859af..946f6fe068 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt @@ -187,7 +187,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor( if (checkPermissions(PERMISSIONS_FOR_WRITING_FILES, this, PERMISSION_REQUEST_CODE_EXPORT_KEYS, - R.string.permissions_rationale_msg_keys_backup_export)) { + R.string.element_permissions_rationale_msg_keys_backup_export)) { activity?.let { activity -> ExportKeysDialog().show(activity, object : ExportKeysDialog.ExportKeyDialogListener { override fun onPassphrase(passphrase: String) { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt index 8344211a2c..cd327f3472 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt @@ -39,7 +39,7 @@ class TestDeviceSettings @Inject constructor(private val vectorPreferences: Vect manager?.retry() } } - description = stringProvider.getString(R.string.settings_troubleshoot_test_device_settings_failed) + description = stringProvider.getString(R.string.element_settings_troubleshoot_test_device_settings_failed) status = TestStatus.FAILED } } diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt b/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt index 88ddc85ac1..a6bbeca3bd 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt @@ -73,7 +73,7 @@ class SoftLogoutActivity : LoginActivity() { // And inform the user showError(getString( - R.string.soft_logout_sso_not_same_user_error, + R.string.element_soft_logout_sso_not_same_user_error, softLogoutViewEvents.currentUserId, softLogoutViewEvents.newUserId) ) diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml index c45933eb40..ddf5a5ca55 100644 --- a/vector/src/main/res/layout/dialog_disclaimer_content.xml +++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml @@ -39,7 +39,7 @@ android:layout_marginStart="24dp" android:layout_marginTop="21dp" android:layout_marginEnd="24dp" - android:text="@string/alpha_disclaimer_content_line_1" + android:text="@string/element_alpha_disclaimer_content_line_1" android:textColor="?riotx_text_primary" android:textSize="16sp" /> diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml index 5298087e09..2f09d10543 100644 --- a/vector/src/main/res/layout/fragment_login_server_url_form.xml +++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml @@ -81,7 +81,7 @@ android:layout_marginTop="6dp" android:gravity="start" android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" - tools:text="@string/login_server_url_form_modular_notice" /> + tools:text="@string/element_login_server_url_form_modular_notice" /> + tools:text="@string/element_rendering_event_error_type_of_event_not_handled" /> diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml index a5c4ae6f1b..3300878a93 100644 --- a/vector/src/main/res/layout/item_verification_wait.xml +++ b/vector/src/main/res/layout/item_verification_wait.xml @@ -4,7 +4,7 @@ android:id="@+id/itemVerificationNoticeText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:contentDescription="@string/use_other_session_content_description" + android:contentDescription="@string/element_use_other_session_content_description" android:paddingStart="16dp" android:paddingEnd="16dp" android:paddingBottom="8dp"> @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start" - android:text="@string/use_latest_riot" + android:text="@string/element_use_latest_riot" android:textColor="?riotx_text_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:gravity="center" - android:text="@string/riot_desktop_web" + android:text="@string/element_riot_desktop_web" android:textColor="?riotx_text_primary" app:layout_constraintEnd_toEndOf="@id/monitorIcon" app:layout_constraintStart_toStartOf="@id/monitorIcon" @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:gravity="center" - android:text="@string/riot_ios_android" + android:text="@string/element_riot_ios_android" android:textColor="?riotx_text_primary" app:layout_constraintEnd_toEndOf="@id/smartphoneIcon" app:layout_constraintStart_toStartOf="@id/smartphoneIcon" diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index 5ac50b2484..e198e50a95 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -2496,4 +2496,35 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming Save your Security Key Store your Security Key somewhere safe, like a password manager or a safe. + + Element Call Failed + Please launch Element on another device that can decrypt the message so it can send the keys to this session. + Use default Element ringtone for incoming calls + Element needs permission to access your microphone to perform audio calls. + Element needs permission to access your camera and your microphone to perform video calls.\n\nPlease allow access on the next pop-ups to be able to make the call. + Notifications are not enabled for this session.\nPlease check the Element settings. + Element uses Google Play Services to deliver push messages but it doesn’t seem to be configured correctly:\n%1$s + [%1$s]\nThis error is out of control of Element and according to Google, this error indicates that the device has too many apps registered with FCM. The error only occurs in cases where there are extreme numbers of apps, so it should not affect the average user. + [%1$s]\nThis error is out of control of Element. It can occur for several reasons. Maybe it will work if you retry later, you can also check that Google Play Service is not restricted in data usage in the system settings, or that your device clock is correct, or it can happen on custom ROM. + [%1$s]\nThis error is out of control of Element. There is no Google account on the phone. Please open the account manager and add a Google account. + Background restrictions are disabled for Element. This test should be run using mobile data (no WIFI).\n%1$s + Element collects anonymous analytics to allow us to improve the application. + Please delete the passphrase if you want Element to generate a recovery key. + "The preview of world-readable room is not supported yet in Element" + "While Element is in early development, some features may be missing and you may experience bugs." + Element needs permission to save your E2E keys on disk.\n\nPlease allow access on the next pop-up to be able to export your keys manually. + Enter the address of the Modular Element or Server you want to use + Enter the address of a server or a Element you want to connect to + The current session is for user %1$s and you provide credentials for user %2$s. This is not supported by Element.\nPlease first clear data, then sign in again on another account. + Element may crash more often when an unexpected error occurs + "Element does not handle events of type '%1$s'" + "Element encountered an issue when rendering content of event with id '%1$s'" + Element Android + Use the latest Element on your other devices, Element Web, Element Desktop, Element iOS, Element for Android, or another cross-signing capable Matrix client + Element Web\nElement Desktop + Element iOS\nElement for Android + Use the latest Element on your other devices: + This identity server is outdated. Element support only API V2. + For your privacy, Element only supports sending hashed user emails and phone number. + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_advanced_settings.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml index e92aae3ff9..ed49a8746f 100644 --- a/vector/src/main/res/xml/vector_settings_advanced_settings.xml +++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml @@ -27,7 +27,7 @@ android:defaultValue="false" android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY" android:key="SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY" - android:summary="@string/settings_developer_mode_fail_fast_summary" + android:summary="@string/element_settings_developer_mode_fail_fast_summary" android:title="@string/settings_developer_mode_fail_fast_title" /> diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml index f394e319c7..3afe3a80c8 100644 --- a/vector/src/main/res/xml/vector_settings_security_privacy.xml +++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml @@ -77,7 +77,7 @@ diff --git a/vector/src/main/res/xml/vector_settings_voice_video.xml b/vector/src/main/res/xml/vector_settings_voice_video.xml index 787935b884..e7a311b16f 100644 --- a/vector/src/main/res/xml/vector_settings_voice_video.xml +++ b/vector/src/main/res/xml/vector_settings_voice_video.xml @@ -9,7 +9,7 @@ android:defaultValue="true" android:disableDependentsState="true" android:key="SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY" - android:title="@string/settings_call_ringtone_use_riot_ringtone" /> + android:title="@string/element_settings_call_ringtone_use_riot_ringtone" />