Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Language rework #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Ring/Ring/Resources/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"smartlist.yesterday" = "Yesterday";
"smartlist.userFound" = "User found";
"smartlist.conversations" = "Conversations";
"smartlist.searching" = "Searching...";
"smartlist.searching" = "Searching";
"smartlist.noResults" = "No results";
"smartlist.noNetworkConnectivity" = "No network connectivity";
"smartlist.cellularAccess" = "Be sure cellular access is granted in your settings";
Expand All @@ -37,7 +37,7 @@

//Welcome Screen
"welcome.title" = "Welcome to Ring";
"welcome.text" = "Ring is a free and universal communication platform which preserves the users' privacy and freedoms";
"welcome.text" = "Ring is a free and universal communication platform which preserves user privacy and freedoms";
"welcome.linkDevice" = "Link this device to an account";
"welcome.createAccount" = "Create a Ring account";

Expand All @@ -48,13 +48,13 @@

//Create Account form
"createAccount.createAccountFormTitle" = "Create your Ring account";
"createAccount.chooseStrongPassword" = "Choose strong password you will remember to protect your Ring account.";
"createAccount.chooseStrongPassword" = "Choose a strong password you will remember to protect your Ring account.";
"createAccount.enterNewUsernamePlaceholder" = "username";
"createAccount.newPasswordPlaceholder" = "password";
"createAccount.repeatPasswordPlaceholder" = "confirm password";
"createAccount.passwordCharactersNumberError" = "6 characters minimum";
"createAccount.passwordNotMatchingError" = "passwords do not match";
"createAccount.lookingForUsernameAvailability" = "looking for username availability";
"createAccount.lookingForUsernameAvailability" = "looking up username availability";
"createAccount.invalidUsername" = "invalid username";
"createAccount.usernameAlreadyTaken" = "username already taken";
"createAccount.loading" = "Loading";
Expand All @@ -71,7 +71,7 @@

//Alerts
"alerts.accountCannotBeFoundTitle" = "Can't find account";
"alerts.accountCannotBeFoundMessage" = "Account couldn't be found on the Ring network. Make sure it was exported on Ring from an existing device, and that provided credentials are correct.";
"alerts.accountCannotBeFoundMessage" = "Account couldn't be found on the Ring network. Make sure it was exported on Ring from an existing device, and that the provided credentials are correct.";
"alerts.accountAddedTitle" = "Account Added";
"alerts.accountNoNetworkTitle" = "Can't connect to the network";
"alerts.accountNoNetworkMessage" = "Could not add account because Ring couldn't connect to the distributed network. Check your device connectivity.";
Expand All @@ -81,9 +81,9 @@
"alerts.profileUploadPhoto" = "Upload photo";
"alerts.profileCancelPhoto" = "Cancel";
"alerts.accountLinkedTitle" = "Linking account";
"alerts.dbFailedTitle" = "An error happned when launching Ring";
"alerts.dbFailedMessage" = "Please close application and try to open it again";
"alerts.confirmBlockContact" = "Are you sure you want to block this contact? The conversation history with this contact will also be deleted permanently.";
"alerts.dbFailedTitle" = "An error occured when launching Ring";
"alerts.dbFailedMessage" = "Please close the app and try to open it again";
"alerts.confirmBlockContact" = "Are you sure you want to block this contact? All conversation history with this contact will also be deleted permanently.";
"alerts.confirmBlockContactTitle" = "Block Contact";
"alerts.confirmDeleteConversation" = "Are you sure you want to delete this conversation permanently?";
"alerts.confirmDeleteConversationTitle" = "Delete Conversation";
Expand All @@ -101,5 +101,5 @@
"linkDevice.passwordError" = "The password you entered does not unlock this account";
"linkDevice.networkError" = "A network error occured during the export";
"linkDevice.defaultError" = "An error occured during the export";
"linkDevice.explanationMessage" = "To complete the process, you need to open Ring on the new device and choose the option \"Link this device to an account.\" Your pin is valid for 10 minutes";
"linkDevice.explanationMessage" = "To complete the process, you need to open Ring on the new device and choose the option \"Link this device to an account.\" Your PIN is valid for 10 minutes";
"linkDevice.hudMessage" = "Verifying";