From 8c2f6a33331da6cbe0b90ce4cee591eaf78b5cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozancan=20Karata=C5=9F?= Date: Sun, 10 Nov 2019 16:43:01 +0300 Subject: [PATCH 1/6] Compatibility for other lowercased strings --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index a38e53cc6..d504f21f7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -169,7 +169,7 @@ Zoom out Save log Share location with all group members - Device Messages + Device messages Locally generated messages Mute for 1 hour From a118e2342ed6cd1259bce8aab5dc0dc4b0449084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozancan=20Karata=C5=9F?= Date: Sun, 10 Nov 2019 16:55:21 +0300 Subject: [PATCH 2/6] Update service names by getting from Google --- res/values/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index d504f21f7..321340fd2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -319,17 +319,17 @@ IMAP login-name IMAP server IMAP port - IMAP Security + IMAP security Outbox SMTP login-name - SMTP Password + SMTP password SMTP server SMTP port - SMTP Security + SMTP security Authorization method Continue with simplified setup? The entered e-mail-address supports a simplified setup (OAuth2).\n\nIn the next step, please allow Delta Chat to act as your Chat with E-Mail app.\n\nThere are no Delta Chat servers, your data stays on your device! - For GMail Accounts you need to create an App-Password if you have 2FA enabled. If this setting is not available, you need to enable Less Secure Apps. + For Gmail Accounts you need to create an App-Password if you have 2-Step Verification enabled. If this setting is not available, you need to enable less secure apps. Certificate checks Please enter a valid email address Please enter a valid server / IP address From 2fc092d0e40a219827900b888a36fddfdaac311d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozancan=20Karata=C5=9F?= Date: Sun, 10 Nov 2019 17:22:53 +0300 Subject: [PATCH 3/6] Fix typos, use correct writing rules, use Android interface texts --- res/values/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 321340fd2..1547fe5b9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -350,7 +350,7 @@ - Forward to … + Forward to… Do you want to send %1$d files to the selected chat?\n\nThe files are sent unmodified in their original size, eg. images and videos are not recoded. Sharing aborted due to missing permissions. @@ -390,7 +390,7 @@ Vibrate Chat settings Change secret - Change your pin / pattern / fingerprint via system settings + Change your PIN / pattern / fingerprint via system settings Screen security Request to block screenshots in the recents list and inside the app @@ -459,7 +459,7 @@ For accepted contacts All Delete e-mails from server - This function helps to free space on your IMAP server by deleting ALL e-mails, including chat-messages, in the given folders. Messages on this device will not be deleted. The deletion cannot be undone! + This function helps to free space on your IMAP server by deleting ALL e-mails, including chat-messages, in the given folders. Messages on this device will not be deleted. The deletion cannot be undone! Delete all e-mails in Inbox folder Delete all e-mails in DeltaChat folder Delete e-mails @@ -524,7 +524,7 @@ Scanned QR code text:\n\n%1$s Scanned QR code URL:\n\n%1$s Fingerprint - %1$s verified, introduce myself … + %1$s verified, introduce myself… QR invite code %1$s joins. %1$s verified. @@ -634,7 +634,7 @@ Could not create chat. Are you sure you want to delete this chat? Email address required. - Delete this login? Everything will be deleted, including your end-to-end setup, contacts, chats, messages and media. This action is final and can not be reversed. + Delete this login? Everything will be deleted, including your end-to-end setup, contacts, chats, messages and media. This action is final and cannot be reversed. me Group members Potential group members (not in group) From 8d32c47eb0eaf2a363ceb6cada05b073c3456cfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozancan=20Karata=C5=9F?= Date: Sun, 10 Nov 2019 23:21:52 +0300 Subject: [PATCH 4/6] Use lower case --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 1547fe5b9..05a3ad17a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -459,7 +459,7 @@ For accepted contacts All Delete e-mails from server - This function helps to free space on your IMAP server by deleting ALL e-mails, including chat-messages, in the given folders. Messages on this device will not be deleted. The deletion cannot be undone! + This function helps to free space on your IMAP server by deleting all e-mails, including chat-messages, in the given folders. Messages on this device will not be deleted. The deletion cannot be undone! Delete all e-mails in Inbox folder Delete all e-mails in DeltaChat folder Delete e-mails From 317ce0c4b17db99e3d8cd4d1b419e6d8b65783d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozancan=20Karata=C5=9F?= Date: Mon, 11 Nov 2019 00:00:15 +0300 Subject: [PATCH 5/6] Quoted Less secure apps --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 05a3ad17a..fa1ecde95 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -329,7 +329,7 @@ Authorization method Continue with simplified setup? The entered e-mail-address supports a simplified setup (OAuth2).\n\nIn the next step, please allow Delta Chat to act as your Chat with E-Mail app.\n\nThere are no Delta Chat servers, your data stays on your device! - For Gmail Accounts you need to create an App-Password if you have 2-Step Verification enabled. If this setting is not available, you need to enable less secure apps. + For Gmail Accounts you need to create an App-Password if you have 2-Step Verification enabled. If this setting is not available, you need to enable \"Less secure apps\". Certificate checks Please enter a valid email address Please enter a valid server / IP address From 5a6d5dfbe44e2bdb1a9744858f1a4a2b0a1e93e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozancan=20Karata=C5=9F?= Date: Mon, 11 Nov 2019 00:16:36 +0300 Subject: [PATCH 6/6] Quote 2-Step Verification --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index fa1ecde95..dba3456aa 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -329,7 +329,7 @@ Authorization method Continue with simplified setup? The entered e-mail-address supports a simplified setup (OAuth2).\n\nIn the next step, please allow Delta Chat to act as your Chat with E-Mail app.\n\nThere are no Delta Chat servers, your data stays on your device! - For Gmail Accounts you need to create an App-Password if you have 2-Step Verification enabled. If this setting is not available, you need to enable \"Less secure apps\". + For Gmail Accounts you need to create an App-Password if you have \"2-Step Verification\" enabled. If this setting is not available, you need to enable \"Less secure apps\". Certificate checks Please enter a valid email address Please enter a valid server / IP address