diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 626086230..e1641f50c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,40 +29,40 @@
Other important messages
Synchronization
Synchronization errors
- Important errors which stop synchronization like unexpected server replies
+ Errors stopping synchronization, like unexpected server replies.
Synchronization warnings
- Non-fatal synchronization problems like dismissed changes of read-only collections
+ Small syncing problems like dismissed changes of read-only collections
Status messages
Informational status messages like the sync change summary
- EteSync has crashed!
+ EteSync crashed!
Please send stack trace to developers.
- If possible, please include any other relevant information such as what you did to trigger this error.
+ If possible, please include any other relevant info such as what you did before this happened.
Did you know?
Battery Optimization
- Android may disable/reduce EteSync synchronization after a few days. To prevent this, turn off battery optimization.
+ Turn off battery optimization to prevent Android turning off/reducing EteSync syncing after a few days.
Turn off for EteSync
Don\'t show again
EteSync Preview Release
- This is a development version of EteSync. Be aware that things may not work as expected. Please give us constructive feedback to improve EteSync.
- Give feedback
+ This is a development version of EteSync. Be aware that things may not work as expected. Please give us constructive feedback to improve it.
+ Provide feedback
Potential Vendor Bugs
- EteSync has detected you are using an Android version that may contain vendor specific bugs.\nPlease take a look at the FAQ for more information.
+ Your Android device may have vendor specific bugs.\nPlease refer to the FAQ for more info..
Open FAQ
License terms
- This program comes with ABSOLUTELY NO WARRANTY. It is free software, and you are welcome to redistribute it under certain conditions.
+ This copylefted libre software licensed GPLv3+ comes with ABSOLUTELY NO WARRANTY. Use, browse, change and share at will; with all. https://simple.wikipedia.org/wiki/GNU_General_Public_License
- EteSync file logging is ON
+ EteSync file logging ON
Logging to external storage: %s
- Disabling will delete logs
+ Turning this off deletes all logs
Couldn\'t create external log file: %s
External storage not found
@@ -80,9 +80,9 @@
Contact
Welcome to EteSync!
- System-wide automatic synchronization is disabled
- Enable
- You need to add an account in order to use EteSync. Click here to add one...
+ System-wide automatic syncing is off
+ Turn on
+ You need to add an account in order to use EteSync. Click here to add one…
Missing permissions: %s
@@ -107,19 +107,19 @@
Notification settings
Manage notification channels and their settings
Reset hints
- Re-enables hints which have been dismissed previously
+ Reactivates dismissed hints
All hints will be shown again
Sync
Prefer Tasks.org tasks provider
Will sync tasks with Tasks.org if available
Will sync tasks with OpenTasks if available
- You may need to remove and re-add your account for these changes to take effect.
+ Remove and re-add your account if you don't see the changes right away.
Connection
Override proxy settings
Use custom proxy settings
Use system default proxy settings
- HTTP proxy host name
- HTTP proxy port
+ HTTP(S) proxy host name
+ HTTP(S) proxy port
Security
Distrust system certificates
System and user-added CAs won\'t be trusted
@@ -129,19 +129,19 @@
All custom certificates have been cleared
Debugging
Log to file
- Disable to hide the notification and delete the logs
- Enable to save log messages to file
+ Turn off to hide the notification and delete the logs
+ Turn on to save log messages to file
Verbose logging
- Verbose logs may contain private information
+ Verbose logs may contain private info
Show debug info
- View/share software and configuration details
+ View/share software and setup details
Force Language
Auto
Show change notifications
- Synchronize now
- Synchronizing now
+ Sync now
+ Syncing…
Account settings
Remove account
Show Fingerprint
@@ -149,7 +149,7 @@
All local copies of address books, calendars and task lists will be deleted.
Can\'t delete last collection
Deleting the last collection is not allowed, please create a new one if you\'d like to delete this one.
- You can click on an item to view the collection. From there you can view the journal, import, and much more...
+ You can click on an item to view the collection. From there you can view the journal, import, and much more…
Click here to install OpenTasks!
* Not syncing tasks (install a provider)
@@ -166,11 +166,11 @@
Only the owner of this collection is allowed to edit it.
Sharing of old-style journals is not allowed. In order to share this journal, create a new one, and copy its contents over using the \"import\" dialog. If you are experiencing any issues, please contact support.
Did you know?
- EteSync seamlessly integrates with Android, so to use it, just use your existing address book and calendar apps!\n\nFor more information, please check out the user guide.
+ EteSync integrates with your existing address book and calendar apps.\n\nPlease check out the user guide for more info.
Members
- Loading members...
+ Loading members…
No members
Invite user
Read only
@@ -179,11 +179,11 @@
Invitation sent. User will be added once the invitation has been accepted.
Verify security fingerprint
Verify %s\'s security fingerprint to ensure the encryption is secure.
- User (%s) not found
+ Could not find the user \"%s\". Has the user set up an encryption password from one of the apps?
Removing member
- Error removing member
+ Could not remove member
Remove member
- Would you like to revoke %s\'s access?\nPlease be advised that a malicious user would potentially be able to retain access to encryption keys. Please refer to the FAQ for more information.
+ Would you like to revoke %s\'s access?\nA malicious user could retain access to their encryption keys. Please refer to the FAQ for more info.
Removing access to admins is currently not supported.
Only admins are allowed to manage collection memberships. Would you like to leave the collection?
Leave
@@ -204,7 +204,7 @@
Attendees
Reminders
Phone
- Email
+ E-mail
Organization
Job Description
Instant Messaging
@@ -218,30 +218,30 @@
Member
Member Count
Restore state
- Successfully restored the entry to previous state.
+ Entry restored to previous state.
EteSync permissions
- Calendar permissions
- To synchronize calendar events with your local calendars, EteSync needs to access your calendars.
+ Calendar permission
+ Grant calendar access to sync calendar events with your local calendars.
Request calendar permissions
- Contacts permissions
- To synchronize address books with your local contacts, EteSync needs to access your contacts.
- Request contacts permissions
- OpenTasks permissions
- To synchronize tasks with your local task lists, EteSync needs to access OpenTasks.
- Request OpenTasks permissions
- Tasks.org permissions
- To synchronize tasks with your local task lists, EteSync needs to access Tasks.org.
- Request Tasks.org permissions
+ Contact permission
+ Grant contact access to sync address books with your local contacts.
+ Request contact permission
+ OpenTasks permission
+ Grant access to OpenTasks to sync tasks with your local task lists.
+ Request OpenTasks permission
+ Tasks.org permission
+ Grant access to Tasks.org to sync tasks with your local task lists.
+ Request Tasks.org permission
Add account
Username
- Username should be at least 6 characters long and consist of only letters, digits and ./-/_.
- Email
- Valid email required
+ Enter a username of at least 6 characters using letters, digitis and ./-/_.
+ E-mail
+ Enter a valid e-mail address
Password
EteSync Server URL
Invalid URL found, did you forget to include https://?
@@ -249,8 +249,8 @@
Encryption Password
Please set your encryption password below, and make sure you got it right, as it *can\'t* be recovered if lost!
You are logged in as \"%s\". Please enter your encryption password to continue, or log out from the side menu.
- * Please make sure you remember your password, as it can\'t be recovered if lost!
- * This password is used to encrypt your data, unlike the previous one, which is used to log into the service.\nYou are asked to choose a separate encryption password for security reasons. For more information, please refer to the FAQ at: %s
+ * Please double-check the password, as it can\'t be recovered if lost!
+ * This password is used to encrypt your data, unlike the previous one, which is used to log in.\nYou are asked to choose a separate encryption password for security reasons. For more info, please refer to the FAQ at: %s
Password required
Log In
Sign Up
@@ -260,17 +260,17 @@
Secret Encryption Password
Account:
This is your login password, *not* your encryption password!
- Forgot password?
+ Forgot your password?
- Couldn\'t authenticate (probably wrong username or password).\nHave you registered?
+ Could not log in (probably wrong username or password).\nHave you registered?
View logs
Setting up encryption
Please wait, setting up encryption…
- Account creation failed
+ Could not create account
Wrong encryption password
- Got an integrity error while accessing your account, which most likely means you put in the wrong encryption password.\nPlease note that the username is case sensitive, so please also try different capitalizations, for example make the first character uppercase.\n\nError: %s
+ Could not access your account. Most likely you entered the wrong encryption password.\nPlease note that the username is case sensitive, so please also try different capitalizations, for example make the first character uppercase.\n\nError: %s
Enter Signup Details
Password should be at least 8 characters long
@@ -280,20 +280,20 @@
New Encryption Password
Are you sure you would like to continue? The process can not be stopped half way or be undone, and may take a while to complete.
Encryption Password Change
- Encryption password has been successfully changed!
+ The password has been changed.
- Error Setting User Info
+ Could Not Set User Info
Import
- Import Failed
+ Could not import data
Reason: %s\nReport to developers?
- Loading file (may take a while)...
- Adding entries...
+ Loading file (may take a while)…
+ Adding entries…
Processed %1$d entries.\nAdded: %2$d\nChanged: %3$d\nSkipped (failed): %4$d
- Reading storage permission is required for import.
- Please choose an account to import all of its entries from.
+ Grant access to storage before importing.
+ Please choose an account to import all its entries from.
Choose file
@@ -302,13 +302,13 @@
Account Dashboard
Change your payment info, plan and other account settings
Encryption
- Authentication Password
- Use a different authentication password
+ Login Password
+ Use a different login password
Enter your password:
Encryption Password
Change your encryption password
Enter your encryption password:
- Synchronization
+ Syncing
Sync interval
Only manually
%s and immediately on local changes
@@ -329,13 +329,13 @@
- Every 4 hours
- Once a day
- Sync over WiFi only
- Synchronization is restricted to WiFi connections
+ Only sync over Wi-Fi
+ Syncing is restricted to Wi-Fi connections
Connection type is not taken into consideration
- WiFi SSID restriction
- Will only synchronize over %s
- All WiFi connections may be used
- Enter the name of a WiFi network (SSID) to restrict synchronization to this network, or leave blank for all WiFi connections.
+ Wi-Fi SSID restriction
+ Will only sync over %s
+ All Wi-Fi connections may be used
+ Enter the name of a Wi-Fi network (SSID) if you want to restrict syncing to a network.
Contacts
Calendar
Tasks
@@ -353,7 +353,7 @@
Set the collection\'s color
Creating collection
Display name (title) of this collection:
- Title is required
+ Add a title
Description (optional):
Edit
Import
@@ -365,33 +365,33 @@
Deleting collection
- Collection is empty.\nMaybe it\'s still syncing?
- Loading change log entries...
+ The collection is empty.\n(Maybe it\'s still syncing?)
+ Loading changelog entries…
- An error has occurred.
- An HTTP error has occurred.
- An I/O error has occurred.
+ An error occurred.
+ An HTTP error occurred.
+ An I/O error occurred.
Show details
com.etesync.syncadapter.log
Debug info
- Clicking share will send developers the data below, as well as some additional debug information, attached. Please note that it may contain some private information.
+ Clicking \"Share\" will open your e-mail app with the data below, as well as some additional debug info, attached. It may contain some private info.
EteSync permissions
Additional permissions required
Sync failed (%s)
- Calendar sync failed (%s)
- Contacts sync failed (%s)
- Tasks sync failed (%s)
+ Could not sync calendar (%s)
+ Could not sync contacts (%s)
+ Fould not sync tasks (%s)
Error while %s
Integrity error while %s
Server error while %s
Could not connect to server while %s
Database error while %s
- Journal is read only
+ The journal is read-only
Permission denied: %s
- preparing synchronization
+ preparing syncing
syncronizing journals
preparing for fetch
preparing local entries
@@ -401,16 +401,15 @@
reapplying local entries
pushing entries
post processing
- Authentication failed
- User is inactive
+ The session expired
+ Inactive user
Calendar \"%s\" modified (%s)
Contacts modified (%s)
Tasks \"%s\" modified (%s)
%s modified.
- %s updated.\n%s deleted.
- Journal \"%s\" is read only
- The journal is read only so all of your changes (%d) have been reverted.
-
+ %s added.\n%s updated.\n%s deleted.
+ Journal \"%s\" is read-only
+ The journal is read-only, so all of your changes (%d) have been reverted.
%s
@@ -421,13 +420,13 @@
EteSync: Connection security
- EteSync has encountered an unknown certificate. Do you want to trust it?
+ An unknown certificate was received. Would you like to trust it?
- Loading...
+ Loading…
Loading Error
Refresh
- Failed opening link: link is not supported!
+ Could not open link, as it is not supported.
From File