From 6b164ad8bfd354002918ef705199b1e9e2b05ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 23 Mar 2015 22:18:29 +0100 Subject: [PATCH] Fix language problems reported by yahoe.001 on transifex --- OpenKeychain/src/main/res/raw/help_certification.md | 2 +- OpenKeychain/src/main/res/raw/help_start.md | 4 ++-- OpenKeychain/src/main/res/values/strings.xml | 13 +++++++++---- .../src/main/res/xml/cloud_search_prefs.xml | 8 ++++---- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/OpenKeychain/src/main/res/raw/help_certification.md b/OpenKeychain/src/main/res/raw/help_certification.md index 889768a75..3518adf73 100644 --- a/OpenKeychain/src/main/res/raw/help_certification.md +++ b/OpenKeychain/src/main/res/raw/help_certification.md @@ -2,7 +2,7 @@ ## Key Confirmation Without confirmation, you cannot be sure if a key really corresponds to a specific person. -The most simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC. +The simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC. To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys. ## Key Status diff --git a/OpenKeychain/src/main/res/raw/help_start.md b/OpenKeychain/src/main/res/raw/help_start.md index 19ac820c0..4b3531480 100644 --- a/OpenKeychain/src/main/res/raw/help_start.md +++ b/OpenKeychain/src/main/res/raw/help_start.md @@ -3,7 +3,7 @@ ## How do I activate OpenKeychain in K-9 Mail? To use OpenKeychain with K-9 Mail, you want to follow these steps: 1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with. - 2. Select "Account settings" and scroll to the very bottom and click "Cryptography". + 2. Select "Account settings", scroll to the very bottom and click "Cryptography". 3. Click on "OpenPGP Provider" and select OpenKeychain from the list. ## I found a bug in OpenKeychain! @@ -13,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code). ## Translations -Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/). +Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/). diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index ffb88b05c..472bddc4c 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -172,6 +172,11 @@ "Encrypt filenames" "Hide recipients" + "Search Keyserver" + "Search HKP keyserver" + "Search Keybase.io" + "Search Keybase.io index" + "<no name>" "<none>" @@ -234,9 +239,9 @@ "Successfully signed and/or encrypted to clipboard." "Select at least one encryption key." "Select at least one encryption key or a signature key." - "Please specify which file to encrypt to.\nWARNING: File will be overwritten if it exists." - "Please specify which file to decrypt to.\nWARNING: File will be overwritten if it exists." - "Please specify which file to export to.\nWARNING: File will be overwritten if it exists." + "Please specify which file to encrypt to.\nWARNING: File will be overwritten if it exists!" + "Please specify which file to decrypt to.\nWARNING: File will be overwritten if it exists!" + "Please specify which file to export to.\nWARNING: File will be overwritten if it exists!" "Do you really want to delete all selected keys?" "After deletion you will not be able to read messages encrypted with this key and lose all key confirmations done with it!" "Delete key '%s'?" @@ -1213,7 +1218,7 @@ "No certificates for this key" "Only validated self-certificates and validated certificates created with your keys are displayed here." "Identities for " - "The keys you are importing contain “identities”: names and emails. Select exactly those for confirmation which match what you expected." + "The keys you are importing contain “identities”: names and email addresses. Select exactly those for confirmation which match what you expected." "Compare the displayed fingerprint, character by character, with the one displayed on your partners device." "Do the displayed fingerprints match?" "Revocation Reason" diff --git a/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml index c87c4df7b..08855fa22 100644 --- a/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml +++ b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml @@ -2,15 +2,15 @@