From c35fa978a73e5d2848203f60a74990716caa2ce3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 4 Oct 2022 15:49:23 +0200 Subject: [PATCH] Use American English by default. --- .../src/main/res/values/strings.xml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml index 2ad3fdfb58..7bc514c73c 100644 --- a/library/ui-strings/src/main/res/values/strings.xml +++ b/library/ui-strings/src/main/res/values/strings.xml @@ -284,8 +284,8 @@ %1$s turned on end-to-end encryption. You turned on end-to-end encryption. - %1$s turned on end-to-end encryption (unrecognised algorithm %2$s). - You turned on end-to-end encryption (unrecognised algorithm %1$s). + %1$s turned on end-to-end encryption (unrecognized algorithm %2$s). + You turned on end-to-end encryption (unrecognized algorithm %1$s). System Default @@ -424,7 +424,7 @@ Notifications - Favourites + Favorites People Rooms @@ -774,7 +774,7 @@ Shows all threads from current room My Threads Shows all threads you’ve participated in - Keep discussions organised with threads + Keep discussions organized with threads Threads help keep your conversations on-topic and easy to track. Tip: Long tap a message and use “%s”. @@ -819,7 +819,7 @@ Show the application info in the system settings. Email addresses - No email has been added to your account + No email address has been added to your account Phone numbers Remove %s? Ensure that you have clicked on the link in the email we have sent to you. @@ -828,7 +828,7 @@ Notification importance by event Email notification - To receive email with notification, please associate an email to your Matrix account + To receive email with notification, please associate an email address to your Matrix account Enable email notifications for %s @@ -1094,7 +1094,7 @@ Show all messages from %s? Emails and phone numbers - Manage emails and phone numbers linked to your Matrix account + Manage emails addresses and phone numbers linked to your Matrix account Choose a country @@ -1642,7 +1642,7 @@ All Unreads - Favourites + Favorites People Reactions @@ -1801,20 +1801,20 @@ You are currently using %1$s to discover and be discoverable by existing contacts you know. You are not currently using an identity server. To discover and be discoverable by existing contacts you know, configure one below. Discoverable email addresses - Discovery options will appear once you have added an email. + Discovery options will appear once you have added an email address. Discovery options will appear once you have added a phone number. Disconnecting from your identity server will mean you won’t be discoverable by other users and you won’t be able to invite others by email or phone. Discoverable phone numbers - We sent you a confirm email to %s, check your email and click on the confirmation link - We sent you a confirm email to %s, please first check your email and click on the confirmation link + We sent an email to %s, check your email and click on the confirmation link + We sent an email to %s, please first check your email and click on the confirmation link Send emails and phone numbers - You have given your consent to send emails and phone numbers to this identity server to discover other users from your contacts. + You have given your consent to send email addresses and phone numbers to this identity server to discover other users from your contacts. Your contacts are private. To discover users from your contacts, we need your permission to send contact info to your identity server. Revoke my consent Give consent - Send emails and phone numbers to %s - To discover existing contacts, you need to send contact info (emails and phone numbers) to your identity server. We hash your data before sending for privacy. + Send email addresses and phone numbers to %s + To discover existing contacts, you need to send contact info (email addresses and phone numbers) to your identity server. We hash your data before sending for privacy. Do you agree to send this info? Enter an identity server URL @@ -2039,7 +2039,7 @@ It\'s your conversation. Own it. Chat with people directly or in groups Keep conversations private with encryption - Extend & customise your experience + Extend & customize your experience Get started Create account I already have an account @@ -2082,7 +2082,7 @@ Sorry, this server isn’t accepting new accounts. The application is not able to create an account on this homeserver.\n\nDo you want to signup using a web client? - This email is not associated to any account. + This email address is not associated to any account. Reset password on %1$s @@ -2095,7 +2095,7 @@ Changing your password will reset any end-to-end encryption keys on all of your sessions, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another session before resetting your password. Continue - This email is not linked to any account + This email address is not linked to any account Check your inbox @@ -2112,7 +2112,7 @@ Your password is not yet changed.\n\nStop the password change process? Set email address - Set an email to recover your account. Later, you can optionally allow people you know to discover you by your email. + Set an email address to recover your account. Later, you can optionally allow people you know to discover you by your this address. Email Email (optional) Next @@ -2263,8 +2263,8 @@ Shared their live location Waiting… - %s cancelled - You cancelled + %s canceled + You canceled %s accepted You accepted Verification Sent @@ -2406,7 +2406,7 @@ This session is trusted for secure messaging because %1$s (%2$s) verified it: %1$s (%2$s) signed in using a new session: - Until this user trusts this session, messages sent to and from it are labelled with warnings. Alternatively, you can manually verify it. + Until this user trusts this session, messages sent to and from it are labeled with warnings. Alternatively, you can manually verify it. Initialize CrossSigning @@ -2475,9 +2475,9 @@ One of the following may be compromised:\n\n- Your password\n- Your homeserver\n- This device, or the other device\n- The internet connection either device is using\n\nWe recommend you change your password & recovery key in Settings immediately. - Verification has been cancelled. You can start verification again. + Verification has been canceled. You can start verification again. This QR code looks malformed. Please try to verify with another method. - Verification Cancelled + Verification Canceled Recovery Passphrase Message Key @@ -2674,7 +2674,7 @@ Please first configure an identity server. Please first accepts the terms of the identity server in the settings. - For your privacy, ${app_name} only supports sending hashed user emails and phone number. + For your privacy, ${app_name} only supports sending hashed user email addresses and phone numbers. The association has failed. There is no current association with this identifier. The user consent has not been provided. @@ -2913,7 +2913,7 @@ Who are you working with? Make sure the right people have access to %s. Just me - A private space to organise your rooms + A private space to organize your rooms Me and teammates A private space for you & your teammates Public @@ -3071,7 +3071,7 @@ This invite to this space was sent to %s which is not associated with your account - Link this email with your account + Link this email address with your account %s in Settings to receive invites directly in ${app_name}.