diff --git a/jami-android/app/src/main/java/cx/ring/utils/TextUtils.kt b/jami-android/app/src/main/java/cx/ring/utils/TextUtils.kt index 9a743e5d76088b9727f0546f9ea006c65a7576eb..d8ba88fa3db0342ac895b92ed51f656384c50276 100644 --- a/jami-android/app/src/main/java/cx/ring/utils/TextUtils.kt +++ b/jami-android/app/src/main/java/cx/ring/utils/TextUtils.kt @@ -115,7 +115,7 @@ object TextUtils { TransferStatus.TRANSFER_AWAITING_HOST -> context.getString(R.string.file_transfer_status_wait_host_acceptance) TransferStatus.TRANSFER_ONGOING -> context.getString(R.string.file_transfer_status_ongoing) TransferStatus.TRANSFER_FINISHED -> context.getString(R.string.file_transfer_status_finished) - TransferStatus.TRANSFER_CANCELED -> context.getString(R.string.file_transfer_status_cancelled) + TransferStatus.TRANSFER_CANCELED -> context.getString(R.string.file_transfer_status_canceled) TransferStatus.TRANSFER_UNJOINABLE_PEER -> context.getString(R.string.file_transfer_status_unjoinable_peer) TransferStatus.TRANSFER_ERROR -> context.getString(R.string.file_transfer_status_error) TransferStatus.TRANSFER_TIMEOUT_EXPIRED -> context.getString(R.string.file_transfer_status_timed_out) diff --git a/jami-android/app/src/main/res/values/strings.xml b/jami-android/app/src/main/res/values/strings.xml index 999796cd464eb1441c3b7ba3759846240540b327..468c29045a88c698a74d35accd271f88c788a3f8 100644 --- a/jami-android/app/src/main/res/values/strings.xml +++ b/jami-android/app/src/main/res/values/strings.xml @@ -409,7 +409,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. <!-- Account summary --> <string name="profile">Profile</string> <string name="profile_name">Profile name</string> - <string name="profile_message_warning">The profile is only shared with the account contacts</string> + <string name="profile_message_warning">Profile is only shared with contacts</string> <string name="custom_profile_message_warning">The custom profile is only visible to the account on this device</string> <string name="open_the_gallery">Open the gallery</string> <string name="take_a_photo">Take photo</string> @@ -477,7 +477,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. <string name="file_transfer_status_closed_by_peer">Closed by peer</string> <string name="file_transfer_status_invalid_pathname">Invalid pathname</string> <string name="file_transfer_status_unjoinable_peer">Unreachable peer</string> - <string name="file_transfer_status_cancelled">Cancelled</string> + <string name="file_transfer_status_canceled">Canceled</string> <string name="file_transfer_status_error">An error occurred while transferring the file.</string> <string name="file_transfer_status_timed_out">Timed out</string> <string name="file_saved_in">File saved in %s.</string> diff --git a/jami-android/app/src/main/res/values/strings_account.xml b/jami-android/app/src/main/res/values/strings_account.xml index 85d25762de43430a90331e7c1d7fb85fc5cebfbd..979fe8aa3980339c68e40e3781c92db8324109d0 100644 --- a/jami-android/app/src/main/res/values/strings_account.xml +++ b/jami-android/app/src/main/res/values/strings_account.xml @@ -269,7 +269,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. <string name="no_registered_name_for_account">No registered username</string> <string name="username_available">The username is available.</string> <string name="register_name">Register Name</string> - <string name="trying_to_register_name">Registration of the username is in progress. Please wait…</string> + <string name="trying_to_register_name">Username registration is in progress. Please wait…</string> <string name="registered_username">Registered username</string> <string name="register_username">Register public username</string> <string name="register_recommended">Recommended</string>