From b64d4b8f3c5b9f293739bcb3ce0e736eb497c8c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 9 Jan 2018 03:30:30 +0100 Subject: [PATCH 1/2] Language rework --- .../app/src/main/res/values/strings.xml | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml index b9c25715a7..170577f0f3 100644 --- a/ring-android/app/src/main/res/values/strings.xml +++ b/ring-android/app/src/main/res/values/strings.xml @@ -32,17 +32,17 @@ along with this program; if not, write to the Free Software Feedback <u>Send us an email</u> License - Ring is a free software developed and supported by + Ring is copyleft libre software, developed and supported by Copyright Contribute Version - No email app found, install one to send us a report + No e-mail app found, install one to send reports No web browser app found, install one to view this page - Send mail using… + Send e-mail using… View website using… This software is provided \"as is\", without warranty of any kind. For details, see <u>GNU General Public License version 3 or later</u> - Ring is free software for universal communication which respects the freedoms and privacy of its users. + Ring is copyleft libre software for universal communication, respecting the freedoms and privacy of its users. Credits @@ -53,7 +53,7 @@ along with this program; if not, write to the Free Software Ring No network connectivity - Please grant access to cellular network in the settings screen. + Please grant cellular network access in the app settings. Text messaging @@ -65,11 +65,11 @@ along with this program; if not, write to the Free Software Home Contact requests - Manage accounts - Manage account + Accounts + My account Settings - Share my contact - About Ring + Share contact info + About Dial a number @@ -94,11 +94,11 @@ along with this program; if not, write to the Free Software - Missed incoming call - Missed outgoing call - Incoming call from %1$s + Missed call + Unanswered call + Call from %1$s Incoming call - Outgoing call to %1$s + Call to %1$s Outgoing call Current call with %1$s Current call @@ -113,19 +113,19 @@ along with this program; if not, write to the Free Software Ongoing call Incoming call of %1$s Outgoing call of %1$s - Can\'t start Ring ! - Ring requires the microphone permission to work. + Can\'t start Ring! + Ring requires microphone permission to work. Take call Decline Enable speaker Add to contacts - Add to contacts ? + Add to contacts? Audio call Video call Change screen orientation Share via Write a message - Scan QR Code + Scan QR code Flip camera @@ -135,40 +135,40 @@ along with this program; if not, write to the Free Software Camera permission - Video conversations require the camera permission to work. Please consider enabling it. + Video conversations require camera permission to work. Please consider enabling it. Error This format is not supported. - This file is too big. The maximum size is %1$ikB. + This file exceeds the maximum size of %1$ikB. - Ring needs the "Read contacts" permission to enable this feature. Please grant it. + Grant Ring permission to read contacts to use this feature. - Ring needs the "Write call log" permission to enable this feature. Please grant it. + Grant Ring permission to write to the call log to use this feature. - Scan the QR Code of the account you want to add. + Scan the QR code of the account you want to add. - Clear history ? + Clear history? This action can not be undone. - History has been cleared. + History cleared. Delete this conversation - Delete this conversation ? + Delete this conversation? This action can not be undone. Copy number - %1$s copied to clipboard + %1$s copied Select a number Block this contact - Add %1$s ? + Add %1$s? New password New password (optional) Repeat new password - Create a Ring account + Create new Ring account Enter new username Choose a strong password you will remember to protect your Ring account. Enter your main Ring account password @@ -184,9 +184,9 @@ along with this program; if not, write to the Free Software Enter your name (optional) - Scan this QRCode with the embedded scanner of the Ring application that wants to communicate with you. + Scan this QR code using Ring on the device you want to share your contact info to. Please select an account to share. - Share my contact information + Share my contact info Error An error occurred during migration @@ -197,15 +197,15 @@ along with this program; if not, write to the Free Software New contact request You have %1$s contact requests For %1$s - 0 contact requests + No contact requests Send Send a contact request - You must send a contact request to communicate with this user. As long as your contact has not accepted the request, you can send messages but your contact can\'t read them. + Complete a contact request to communicate with this user, messages sent meanwhile can be read when done. - 0 blocked contacts + No blocked contacts No contact request sent @@ -213,8 +213,8 @@ along with this program; if not, write to the Free Software Search Results Contacts - No Gallery app found - No application found on device to open Gallery + No gallery app found + No app found to open gallery An unknown error occurred From e6475290b57bbc50db3eb667f2d640aa2361b3f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 9 Jan 2018 03:43:49 +0100 Subject: [PATCH 2/2] strings_account rework --- .../src/main/res/values/strings_account.xml | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ring-android/app/src/main/res/values/strings_account.xml b/ring-android/app/src/main/res/values/strings_account.xml index 8a1a81a0b4..8db5cae2c3 100644 --- a/ring-android/app/src/main/res/values/strings_account.xml +++ b/ring-android/app/src/main/res/values/strings_account.xml @@ -45,18 +45,18 @@ along with this program; if not, write to the Free Software Create empty SIP account ? You are about to create a SIP account with no valid hostname. - You will only be able to make and receive direct ip calls. + You will only be able to make and receive direct IP calls. You can edit your account later IP account - A Ring account allows you to reach people securely in peer to peer through a fully distributed network. + A Ring account allows you to reach people securely peer to peer, through a fully distributed network. Add your SIP account Configure an existing SIP account. Add SIP account - Delete account ? + Delete account? This action can not be undone. @@ -65,7 +65,7 @@ along with this program; if not, write to the Free Software Known devices linked to this Ring account Revoke device Success - Device is now revoked! + Device revoked. Can\'t revoke device Wrong password. Unknown device. @@ -100,11 +100,11 @@ along with this program; if not, write to the Free Software Advanced Allow all calls/messages - Registration Expire + Registration Expires Local Interface Local Port - Use Stun - Stun Server + Use STUN + STUN Server Use TURN TURN server @@ -149,7 +149,7 @@ along with this program; if not, write to the Free Software 6 characters minimum Passwords do not match Please wait… - Publishing new account information + Publishing new account info Couldn\'t unlock your account using the provided password. Network error Couldn\'t export account on the network. Check your connectivity. @@ -157,27 +157,27 @@ along with this program; if not, write to the Free Software Couldn\'t export account. An unknown error occurred. Enter password Contact me using \'%1$s\' on the Ring distributed communication platform: https://ring.cx - Contact me using \'%1$s\' or my public username \'%2$s\' on the Ring distributed communication platform: https://ring.cx - Contact me on Ring ! + Contact me using \'%1$s\', or my public username \'%2$s\' on the Ring distributed communication platform: https://ring.cx + Contact me on Ring. Update account Your Ring account can be updated.\nPlease enter your password. Ring account Identity Account migration - Your accounts need to be updated. Do you want to go the Account management screen to perform this operation ? + Your accounts need to be updated. Do you want to go the "\Account management"\ to perform this operation? Update needed Can\'t find account - Account couldn\'t be found on the Ring network.\nMake sure it was exported on Ring from an existing device, and that provided credentials are correct. + Account couldn\'t be found on the Ring network.\nMake sure it was exported on Ring from an existing device, and that the provided credentials are correct. You can continue with the account creation process or edit your information here. Edition is still possible later in the account settings. Can\'t connect to the network - Could not add account because Ring coudn\'t connect to the distributed network. Check your device connectivity. + Could not add account, since Ring coudn\'t connect to the distributed network. Check your device connectivity. Account device added - You have successfully setup your Ring account on this device. + You have now set up your Ring account for use on this device. Account device updated - You have successfully updated your Ring account. + You have updated your Ring account. Account device couldn\'t be update. Please check your password. Sip account registered - You have successfully registered your Sip account. + You have registered your SIP account. Register anyway Link this device to an account @@ -200,7 +200,7 @@ along with this program; if not, write to the Free Software Register public username (recommended) Username already taken Invalid username - Looking for username availability… + Looking up username availability… Connecting Connection error Online @@ -221,7 +221,7 @@ along with this program; if not, write to the Free Software Enter password to confirm Enter password Revoke device - Are you sure you want to revoke %1$s ? + Are you sure you want to revoke %1$s? Please wait… Revoking device Rename this device