Skip to content
Snippets Groups Projects
Commit cb352b2f authored by ovari's avatar ovari
Browse files

main/res/values/strings_account.xml: en-US and unify with iOS

Cancelled (en-GB) → Canceled (en-US)

Registration of the username is in progress.
→
Username registration is in progress.
https://app.transifex.com/savoirfairelinux/jami/translate/#fr/localizablestrings/285993168

Unify `profile_message_warning` and `wizard_profile_info` values

Change-Id: Iff8a3108fb10389e59bc7d75ec2646703a04af0a
parent f4216334
No related branches found
No related tags found
No related merge requests found
...@@ -115,7 +115,7 @@ object TextUtils { ...@@ -115,7 +115,7 @@ object TextUtils {
TransferStatus.TRANSFER_AWAITING_HOST -> context.getString(R.string.file_transfer_status_wait_host_acceptance) 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_ONGOING -> context.getString(R.string.file_transfer_status_ongoing)
TransferStatus.TRANSFER_FINISHED -> context.getString(R.string.file_transfer_status_finished) 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_UNJOINABLE_PEER -> context.getString(R.string.file_transfer_status_unjoinable_peer)
TransferStatus.TRANSFER_ERROR -> context.getString(R.string.file_transfer_status_error) TransferStatus.TRANSFER_ERROR -> context.getString(R.string.file_transfer_status_error)
TransferStatus.TRANSFER_TIMEOUT_EXPIRED -> context.getString(R.string.file_transfer_status_timed_out) TransferStatus.TRANSFER_TIMEOUT_EXPIRED -> context.getString(R.string.file_transfer_status_timed_out)
......
...@@ -409,7 +409,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. ...@@ -409,7 +409,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
<!-- Account summary --> <!-- Account summary -->
<string name="profile">Profile</string> <string name="profile">Profile</string>
<string name="profile_name">Profile name</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="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="open_the_gallery">Open the gallery</string>
<string name="take_a_photo">Take photo</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/>. ...@@ -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_closed_by_peer">Closed by peer</string>
<string name="file_transfer_status_invalid_pathname">Invalid pathname</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_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_error">An error occurred while transferring the file.</string>
<string name="file_transfer_status_timed_out">Timed out</string> <string name="file_transfer_status_timed_out">Timed out</string>
<string name="file_saved_in">File saved in %s.</string> <string name="file_saved_in">File saved in %s.</string>
......
...@@ -269,7 +269,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. ...@@ -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="no_registered_name_for_account">No registered username</string>
<string name="username_available">The username is available.</string> <string name="username_available">The username is available.</string>
<string name="register_name">Register Name</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="registered_username">Registered username</string>
<string name="register_username">Register public username</string> <string name="register_username">Register public username</string>
<string name="register_recommended">Recommended</string> <string name="register_recommended">Recommended</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment