diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f7445bf86..066ecf612 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -41,14 +41,14 @@
Moderator
Participant
Visitor
- Would you like to remove %s from your roster? The conversation associated with this contact will not be removed.
+ Would you like to remove %s from your contact list? Conversations with this contact will not be removed.
Would you like to block %s from sending you messages?
Would you like to unblock %s and allow them to send you messages?
Block all contacts from %s?
Unblock all contacts from %s?
Contact blocked
Blocked
- Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.
+ Would you like to remove %s as a bookmark? Conversations with this bookmark will not be removed.
Register new account on server
Change password on server
Share with…
@@ -67,22 +67,22 @@
Save
OK
Conversations has crashed
- By sending in stack traces you are helping the ongoing development of Conversations\nWarning: This will use your XMPP account to send the stack trace to the developer.
+ Using your XMPP account to send in stack traces helps the ongoing development of Conversations.
Send now
Never ask again
- Unable to connect to account
- Unable to connect to multiple accounts
- Touch here to manage your accounts
+ Could not connect to account
+ Could not connect to multiple accounts
+ Tap to manage your accounts
Attach file
- The contact is not in your roster. Would you like to add it?
+ Add this missing contact to your contact list?
Add contact
delivery failed
- Preparing image for transmission
- Preparing images for transmission
+ Getting ready to send image
+ Getting ready to send images
Sharing files. Please wait…
Clear history
Clear Conversation History
- Are you sure you want to delete all messages within this conversation?\n\nWarning: This will not delete copies of those messages that are stored on other devices or servers.
+ Do you want to delete all messages in this conversation?\n\nWarning: This will not influence messages stored on other devices or servers.
Delete file
Are you sure you want to delete this file?\n\nWarning: This will not delete copies of this file that are stored on other devices or servers.
Close this conversation afterwards
@@ -93,20 +93,20 @@
Send OMEMO encrypted message
Send v\\OMEMO encrypted message
Send OpenPGP encrypted message
- Your nickname has been changed
+ New nickname in use
Send unencrypted
Decryption failed. Maybe you don’t have the proper private key.
OpenKeychain
- Conversations utilizes a third party app called OpenKeychain to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n(Please restart Conversations afterwards.)
+ Conversations uses OpenKeychain to encrypt and decrypt messages and manage your public keys.\n\nIt is licensed under GPLv3+ and available on F-Droid and Google Play.\n\n(Please restart Conversations afterwards.)
Restart
Install
Please install OpenKeychain
offering…
waiting…
No OpenPGP Key found
- Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\nPlease ask your contact to setup OpenPGP.
+ Could not encrypt your messages because your contacts are not announcing their public keys.\n\nPlease ask your contacts to set up OpenPGP.
No OpenPGP Keys found
- Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\nPlease ask your contacts to setup OpenPGP.
+ Could not encrypt your messages, as your contacts are not announcing their public keys.\n\nPlease ask them to set up OpenPGP.
General
Accept files
Automatically accept files smaller than…
@@ -124,11 +124,11 @@
The length of time notifications are silenced after detecting activity on one of your other devices.
Advanced
Never send crash reports
- By sending in stack traces you are helping the ongoing development of Conversations
+ By sending in stack traces you are helping the development
Confirm Messages
Let your contacts know when you have received and read their messages
UI
- OpenKeychain reported an error.
+ OpenKeychain produced an error.
Bad key for encryption.
Accept
An error has occurred
@@ -141,10 +141,10 @@
Take picture
Preemptively grant subscription request
The file you selected is not an image
- Error while converting the image file
+ Could not convert image file
File not found
General I/O error. Maybe you ran out of storage space?
- The app you used to select this image did not provide us with enough permissions to read the file.\n\nUse a different file manager to choose an image
+ The app you used to select this image did not provide enough permissions to read the file.\n\nUse a different file manager to choose an image.
Unknown
Temporarily disabled
Online
@@ -156,7 +156,7 @@
Registration failed
Username already in use
Registration completed
- Server does not support registration
+ Registration not supported by server
Invalid registration token
TLS negotiation failed
Policy violation
@@ -173,17 +173,17 @@
Publish OpenPGP public key
Remove OpenPGP public key
Are you sure you want to remove your OpenPGP public key from your presence announcement?\nYour contacts will no longer be able to send you OpenPGP encrypted messages.
- OpenPGP public key has been published.
+ OpenPGP public key published.
Enable account
Are you sure?
- If you delete your account, your entire conversation history will be lost
+ Deleting your account erases your entire conversation history
Record voice
XMPP address
Block XMPP address
username@example.com
Password
This is not a valid XMPP address
- Out of memory. Image is too large
+ Out of memory. Image too big
Do you want to add %s to your address book?
Server info
XEP-0313: MAM
@@ -200,14 +200,14 @@
unavailable
Missing public key announcements
last seen just now
- last seen 1 minute ago
+ last seen one minute ago
last seen %d minutes ago
- last seen 1 hour ago
+ last seen one hour ago
last seen %d hours ago
- last seen 1 day ago
+ last seen one day ago
last seen %d days ago
- Encrypted message. Please install OpenKeychain to decrypt.
- OpenPGP encrypted messages found
+ Encrypted message. Please install OpenKeychain to decrypt it.
+ New OpenPGP encrypted messages found
OpenPGP Key ID
OMEMO fingerprint
v\\OMEMO fingerprint
@@ -247,32 +247,32 @@
Add back
%s has read up to this point
%s have read up to this point
- %1$s +%2$d more have read up to this point
+ %1$s +%2$d others have read up to this point
Everyone has read up to this point
Publish
- Touch avatar to select picture from gallery
+ Tap avatar to select picture from gallery
Publishing…
The server rejected your publication
- Something went wrong while converting your picture
+ Could not convert your picture
Could not save avatar to disk
(Or long press to bring back default)
- Your server does not support the publication of avatars
+ Your server does not support publicizing avatars
whispered
to %s
Send private message to %s
Connect
This account already exists
Next
- Current session established
+ Session established
Skip
Disable notifications
Enable
Group chat requires password
Enter password
- Please request presence updates from your contact first.\n\nThis will be used to determine what client(s) your contact is using.
+ Please request presence updates from your contact first.\n\nThis will be used to determine what chat app your contact is using.
Request now
Ignore
- Warning: Sending this without mutual presence updates could cause unexpected problems.\n\nGo to contact details to verify your presence subscriptions.
+ Warning: Sending this without mutual presence updates could cause unexpected problems.\n\nGo to “Contact details” to verify your presence subscriptions.
Security
Allow message correction
Allow your contacts to retroactively edit their messages
@@ -286,8 +286,8 @@
Notifications will be silenced during quiet hours
Other
Synchronize with bookmarks
- Join and leave group chats according to auto-join flag in your bookmarks.
- OMEMO fingerprint copied to clipboard!
+ Join group chats automatically if the bookmark says so
+ OMEMO fingerprint copied to clipboard
You are banned from this group chat
This group chat is members only
Resource constraint
@@ -316,7 +316,7 @@
Account details
Confirm
Try again
- Keep service in foreground
+ Foreground service
Prevents the operating system from killing your connection
Create backup
Backup files will be stored in %s
@@ -333,27 +333,27 @@
file
Open %s
sending (%1$d%% completed)
- Preparing file for transmission
+ Getting ready to share file
%s offered for download
Cancel transmission
- file transmission failed
+ could not share file
file transmission cancelled
- The file has been deleted
- No application found to open file
- No application found to open link
- No application found to view contact
+ File deleted
+ No app found to open file
+ No app found to open link
+ No app found to view contact
Dynamic Tags
Display read-only tags underneath contacts
Enable notifications
No group chat server found
- Group chat creation failed!
+ Could not create group chat
Account avatar
Copy OMEMO fingerprint to clipboard
Regenerate OMEMO key
Clear devices
- Are you sure you want to clear all other devices from the OMEMO announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime.
- There are no usable keys available for this contact.\nFetching new keys from the server has been unsuccessful. Maybe there is something wrong with your contact’s server.
- There are no usable keys available for this contact.\nMake sure you have mutual presence subscription.
+ Are you sure you want to clear all other devices from the OMEMO announcement? The next time your devices connect, they will reannounce themselves, but might not receive messages sent meanwhile.
+ There are no usable keys available for this contact.\nCould not fetch new keys from the server. Maybe there is something wrong with your contact’s server?
+ There are no usable keys available for this contact.\nMake sure you both of you have presence subscription on.
Something went wrong
Fetching history from server
No more history on server
@@ -363,7 +363,7 @@
Change password
Current password
New password
- Password should not be empty
+ Password can’t be empty
Enable all accounts
Disable all accounts
Perform action with
@@ -383,7 +383,7 @@
Could not change affiliation of %s
Ban from group chat
Ban from channel
- You are trying to remove %s from a public channel. The only way to do that is to ban that user for ever.
+ You are trying to remove %s from a public channel. The only way to do that is to ban that user forever.
Ban now
Could not change role of %s
Private group chat configuration
@@ -422,7 +422,7 @@
Let your contacts know when you are writing messages to them
Send location
Show location
- No application found to display location
+ No app found to display location
Location
Conversation closed
Left private group chat
@@ -439,7 +439,7 @@
- %d certificate deleted
- %d certificates deleted
- Replace send button with quick action
+ Replace “Send” button with quick action
Quick Action
None
Most recently used
@@ -447,7 +447,7 @@
Search contacts
Search bookmarks
Send private message
- %1$s has left the group chat!
+ %1$s has left the group chat
Username
Username
This is not a valid username
@@ -457,7 +457,7 @@
Download failed: Could not write file
Tor network unavailable
Bind failure
- Server not responsible for domain
+ The server is not responsible for this domain
Broken
Availability
Away when screen is off
@@ -470,15 +470,15 @@
Show hostname and port settings when setting up an account
xmpp.example.com
Add account with certificate
- Unable to parse certificate
+ Could not parse certificate
Leave empty to authenticate w/ certificate
Archiving preferences
Server-side archiving preferences
Fetching archiving preferences. Please wait…
- Unable to fetch archiving preferences
- Captcha required
+ Could not fetch archiving preferences
+ CAPTCHA required
Enter the text from the image above
- Certificate chain is not trusted
+ Untrusted certificate chain
XMPP address does not match certificate
Renew certificate
Error fetching OMEMO key!
@@ -489,7 +489,7 @@
Tunnel all connections through the Tor network. Requires Orbot
Hostname
Port
- Server- or .onion-Address
+ Server- or .onion-address
This is not a valid port number
This is not a valid hostname
%1$d of %2$d accounts connected
@@ -498,14 +498,14 @@
- %d messages
Load more messages
- Shared file with %s
- Shared image with %s
- Shared images with %s
- Shared text with %s
- Conversations needs access to external storage
- Conversations needs access to the camera
+ File shared with %s
+ Image shared with %s
+ Images shared with %s
+ Text shared with %s
+ Grant Conversations access to external storage
+ Grant Conversations access to the camera
Synchronize with contacts
- Conversations wants to match your server side contact list with your local address book to show your contacts’ full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.
+ Conversations wants permission to access your contacts to match your contact list with your contacts to show their full names and avatars.\n\nIt will only read your contacts and match them locally without uploading them to your server.
We will not store a copy of those phone numbers.\n\nFor more information read our privacy policy.
You will now be asked to grant permission to access your contacts.]]>
Notify on all messages
Notify only when mentioned
@@ -516,24 +516,24 @@
Always
Large images only
Battery optimizations enabled
- Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\nIt is recommended to disable those.
- Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.
+ Your device is employing heavy battery optimizations for Conversations which may lead to delayed notifications or even message loss.\nIt is recommended to disable it.
+ Your device is employing heavy battery optimizations for Conversations which may lead to delayed notifications or even message loss.\n\nYou will now be asked to disable it.
Disable
The selected area is too large
(No activated accounts)
This field is required
Correct message
Send corrected message
- You already trust this contact. By selecting \'done\' you are just confirming that %s is part of this group chat.
+ You have already validated this persons fingerprint securely to confirm trust. By selecting “Done” you are just confirming that %s is part of this group chat.
You have disabled this account
- Security error: Invalid file access
- No application found to share URI
+ Security error: Invalid file access!
+ No app found to share URI
Share URI with…
Join the Conversation
Have some Quick Conversations
You sign up with your phone number and Quicksy will automatically—based on the phone numbers in your address book—suggest possible contacts to you.
By signing up you agree to our privacy policy.]]>
- Agree & continue
- We will guide you through the process of creating an account on conversations.im.¹\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full XMPP address.
+ Agree and continue
+ A guide is set up for account creation on conversations.im.¹\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full XMPP address.
Your full XMPP address will be: %s
Create Account
Use my own provider
@@ -557,17 +557,17 @@
Short
Medium
Long
- Broadcast Last User Interaction
- Let all your contacts know when you use Conversations
+ Broadcast use
+ Lets your contacts know when you use Conversations
Privacy
Theme
Select the color palette
Automatic
- Light theme
- Dark theme
+ Light
+ Dark
Green Background
Use green background for received messages
- Unable to connect to OpenKeychain
+ Could not connect to OpenKeychain
This device is no longer in use
Computer
Mobile phone
@@ -575,29 +575,29 @@
Web browser
Console
Payment required
- Missing internet permission
+ Grant permission to use the Internet
Me
Contact asks for presence subscription
Allow
No permission to access %s
Remote server not found
Remote server timeout
- Unable to update account
- Report this JID as sending unwanted messages.
+ Could not update account
+ Report this XMPP address for spamming.
Delete OMEMO identities
- Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort.
+ Regenerate your OMEMO keys. All your contacts will have to verify you again. Only use this as a last resort.
Delete selected keys
You need to be connected to publish your avatar.
Show error message
Error Message
Data saver enabled
- Your operating system is restricting Conversations from accessing the Internet when in background. To receive notifications of new messages you should allow Conversations unrestricted access when Data saver is on.\nConversations will still make an effort to save data when possible.
+ Your operating system is restricting Conversations from accessing the Internet when in background. To receive notifications of new messages you should allow Conversations unrestricted access when “Data saver” is on.\nConversations will still make an effort to save data when possible.
Your device does not support disabling Data saver for Conversations.
- Unable to create temporary file
+ Could not create temporary file
This device has been verified
Copy fingerprint
- All OMEMO keys have been verified
- Barcode does not contain fingerprints for this conversation.
+ You have verified all the OMEMO keys in your posession
+ The barcode does not contain fingerprints for this conversation.
Verified fingerprints
Use the camera to scan a contact’s barcode
Please wait for keys to be fetched
@@ -605,11 +605,11 @@
Share as XMPP URI
Share as HTTP link
Blind Trust Before Verification
- Automatically trust all new devices of contacts that haven’t been verified before, and prompt for manual confirmation each time a verified contact adds a new device.
- Blindly trusted OMEMO keys
+ Trust new devices from non-verified contacts, but prompt manual confirmation of new devices for verified contacts.
+ Blindly trusted OMEMO keys, meaning they could be someone else or someone could have tapped in.
Untrusted
Invalid 2D barcode
- Clean cache folder (used by Camera Application)
+ Clean cache folder (used by camera app)
Clean cache
Clean private storage
Clean private storage where files are kept (They can be re-downloaded from the server)
@@ -619,7 +619,7 @@
Show inactive
Hide inactive
Distrust device
- Are you sure you want to remove the verification for this device?\nThis device and messages coming from that device will be marked as untrusted.
+ Are you sure you want to remove the verification of this device?\nThis device and messages from it will be marked as “Untrusted”.
- %d second
- %d seconds
@@ -662,9 +662,9 @@
Downgraded SASL mechanism
Server requires registration on website
Open website
- No application found to open website
+ No app found to open website
Heads-up Notifications
- Show Heads-up Notifications
+ Show heads-up notifications
Today
Yesterday
Validate hostname with DNSSEC
@@ -692,8 +692,8 @@
Edit status message
Disable encryption
Conversations is unable to send encrypted messages to %1$s. This may be due to your contact using an outdated server or client that can not handle OMEMO.
- Unable to fetch device list
- Unable to fetch device bundles
+ Could not fetch device list
+ Could not fetch device bundles
Hint: In some cases this can be fixed by adding each other your contact lists.
Are you sure you want to disable OMEMO encryption for this conversation?\nThis will allow your server administrator to read your messages, but it might be the only way to communicate with people using outdated clients.
Disable now
@@ -722,9 +722,9 @@
Share location
Show location
Share
- Unable to start recording
+ Could not start recording
Please wait…
- Conversations needs access to the microphone
+ Grant Conversations access to the microphone
Search messages
GIF
View conversation
@@ -744,7 +744,7 @@
Providing a name is optional
Group chat name
This group chat has been destroyed
- Unable to save recording
+ Could not save recording
Foreground service
This notification category is used to display a permanent notification indicating that Conversations is running.
Status Information
@@ -800,9 +800,9 @@
The pin we have sent you has expired.
Unknown network error.
Unknown response from server.
- Unable to connect to server.
- Unable to establish secure connection.
- Unable to find server.
+ Could not connect to server.
+ Could not establish secure connection.
+ Could not find server.
Something went wrong processing your request.
Invalid user input
Temporarily unavailable. Try again later.
@@ -831,8 +831,8 @@
Restore
Enter your password for the account %s to restore the backup.
Do not use the restore backup feature in an attempt to clone (run simultaneously) an installation. Restoring a backup is only meant for migrations or in case you’ve lost the original device.
- Unable to restore backup.
- Unable to decrypt backup. Is the password correct?
+ Could not restore backup.
+ Could not decrypt backup. Is the password correct?
Backup & Restore
Enter XMPP address
Create group chat
@@ -847,7 +847,7 @@
Creating public channel…
This channel already exists
You’ve joined an existing channel
- Unable to set channel configuration
+ Could not save channel configuration
Allow anyone to edit the topic
Allow anyone to invite others
Anyone can edit the topic.
@@ -880,9 +880,9 @@
The file you selected is not a Conversations backup file
This account has already been setup
Please enter the password for this account
- Unable to perform this action
+ Could not perform this action
Join public channel…
- The sharing application did not grant permission to access this file.
+ The sharing app did not grant permission to access this file.
jabber.network
Local server
@@ -903,9 +903,9 @@
Locating devices
Ringing
Busy
- Unable to connect call
+ Could not connect call
Retracted call
- Application failure
+ App failure
Hang up
Ongoing call
Ongoing video call