From e97cdbd9ad06b66c67f7778eafce1970590aa654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 6 May 2014 23:16:08 +0200
Subject: Clarify language

---
 .../keychain/ui/CertifyKeyActivity.java                  |  2 +-
 .../src/main/res/layout/certify_key_activity.xml         |  2 +-
 OpenKeychain/src/main/res/layout/view_cert_activity.xml  |  2 +-
 OpenKeychain/src/main/res/values-de/strings.xml          |  6 +++---
 OpenKeychain/src/main/res/values-es/strings.xml          |  4 ++--
 OpenKeychain/src/main/res/values-fr/strings.xml          |  4 ++--
 OpenKeychain/src/main/res/values-it-rIT/strings.xml      |  4 ++--
 OpenKeychain/src/main/res/values-ja/strings.xml          |  4 ++--
 OpenKeychain/src/main/res/values-pl/strings.xml          |  4 ++--
 OpenKeychain/src/main/res/values-ru/strings.xml          |  4 ++--
 OpenKeychain/src/main/res/values-sl/strings.xml          |  4 ++--
 OpenKeychain/src/main/res/values-tr/strings.xml          |  2 +-
 OpenKeychain/src/main/res/values-uk/strings.xml          |  4 ++--
 OpenKeychain/src/main/res/values/strings.xml             | 16 ++++++++--------
 14 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'OpenKeychain/src')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
index 2d31e0de8..1c851de0a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
@@ -131,7 +131,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements
             public void onClick(View v) {
                 if (mPubKeyId != 0) {
                     if (mMasterKeyId == 0) {
-                        mSelectKeyFragment.setError(getString(R.string.select_key_to_sign));
+                        mSelectKeyFragment.setError(getString(R.string.select_key_to_certify));
                     } else {
                         initiateSigning();
                     }
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index cba73a3c7..76f1e8a96 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -108,7 +108,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
-            android:text="@string/section_uids_to_sign" />
+            android:text="@string/section_uids_to_certify" />
 
         <org.sufficientlysecure.keychain.ui.widget.FixedListView
             android:id="@+id/view_key_user_ids"
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index 76bf91757..264b84239 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -159,7 +159,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
-            android:text="@string/section_signer_id" />
+            android:text="@string/section_certifier_id" />
 
         <TableLayout
             android:layout_width="wrap_content"
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 46c5a0aa6..6b71380ad 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -238,7 +238,7 @@
   <string name="key_copied_to_clipboard">Schlüssel wurde in die Zwischenablage kopiert!</string>
   <string name="fingerprint_copied_to_clipboard">Fingerabdruck wurde in die Zwischenablage kopiert!</string>
   <string name="key_has_already_been_certified">Schlüssel wurde bereits beglaubigt</string>
-  <string name="select_key_to_sign">Bitte wähle einen Signaturschlüssel!</string>
+  <string name="select_key_to_certify">Bitte wähle einen Signaturschlüssel!</string>
   <string name="key_too_big_for_sharing">Schlüssel ist zu groß um so geteilt zu werden!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -445,12 +445,12 @@
   <string name="cert_verify_error">Fehler!</string>
   <string name="cert_verify_unavailable">Schlüssel nicht verfügbar</string>
   <!--unsorted-->
-  <string name="section_signer_id">Unterzeichner</string>
+  <string name="section_certifier_id">Unterzeichner</string>
   <string name="section_cert">Zertifikatdetails</string>
   <string name="label_user_id">Identität</string>
   <string name="unknown_uid">&lt;unbekannt&gt;</string>
   <string name="empty_certs">Keine Beglaubigungen für diesen Schlüssel</string>
-  <string name="section_uids_to_sign">Zu signierende Identitäten</string>
+  <string name="section_uids_to_certify">Zu signierende Identitäten</string>
   <string name="label_revocation">Widerrufsgrund</string>
   <string name="label_verify_status">Verificationsstatus</string>
   <string name="label_cert_type">Typ</string>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 195ce9743..e36db1885 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -229,7 +229,7 @@
   <string name="nfc_successful">¡Clave enviada con éxito vía NFC Beam (haz NFC)!</string>
   <string name="key_copied_to_clipboard">¡La clave ha sido copiada al portapapeles!</string>
   <string name="key_has_already_been_certified">¡La clave ya ha sido certificada!</string>
-  <string name="select_key_to_sign">¡Por favor, selecciona la clave que se usará para firmar!</string>
+  <string name="select_key_to_certify">¡Por favor, selecciona la clave que se usará para firmar!</string>
   <string name="key_too_big_for_sharing">¡La clave es demasiado grande para ser compartida de esta forma!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -426,7 +426,7 @@
   <string name="cert_verify_error">¡error!</string>
   <string name="cert_verify_unavailable">clave no disponible</string>
   <!--unsorted-->
-  <string name="section_signer_id">Firmante</string>
+  <string name="section_certifier_id">Firmante</string>
   <string name="section_cert">Detalles del certificado</string>
   <string name="unknown_uid">&lt;desconocido&gt;</string>
   <string name="empty_certs">No hay certificados para esta clave</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 19d304276..73ccb730b 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -229,7 +229,7 @@
   <string name="nfc_successful">Clef envoyée par Beam NFC avec succès |</string>
   <string name="key_copied_to_clipboard">La clef a été copié vers le presse-papiers !</string>
   <string name="key_has_already_been_certified">La clef a déjà été certifiée !</string>
-  <string name="select_key_to_sign">Veuillez choisir une clef a utiliser pour la signature !</string>
+  <string name="select_key_to_certify">Veuillez choisir une clef a utiliser pour la signature !</string>
   <string name="key_too_big_for_sharing">La clef est trop grosse pour être partagée ainsi !</string>
   <!--errors
          no punctuation, all lowercase,
@@ -426,7 +426,7 @@
   <string name="cert_verify_error">erreur!</string>
   <string name="cert_verify_unavailable">clef non disponible</string>
   <!--unsorted-->
-  <string name="section_signer_id">Signataire</string>
+  <string name="section_certifier_id">Signataire</string>
   <string name="section_cert">Détails du certificat</string>
   <string name="unknown_uid">&lt;inconnu&gt;</string>
   <string name="empty_certs">Aucun certificat pour cette clef</string>
diff --git a/OpenKeychain/src/main/res/values-it-rIT/strings.xml b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
index d79bc7ee6..be4fc5ccc 100644
--- a/OpenKeychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
@@ -229,7 +229,7 @@
   <string name="nfc_successful">Chiave correttamente inviata tramite NFC Beam!</string>
   <string name="key_copied_to_clipboard">Chiave copiata negli appunti!</string>
   <string name="key_has_already_been_certified">La chiave è già certificata!</string>
-  <string name="select_key_to_sign">Per favore seleziona la chiave per la firma!</string>
+  <string name="select_key_to_certify">Per favore seleziona la chiave per la firma!</string>
   <string name="key_too_big_for_sharing">Chiave troppo grande per essere condivisa in questo modo!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -426,7 +426,7 @@
   <string name="cert_verify_error">errore!</string>
   <string name="cert_verify_unavailable">chiave non disponibile</string>
   <!--unsorted-->
-  <string name="section_signer_id">Firmatario</string>
+  <string name="section_certifier_id">Firmatario</string>
   <string name="section_cert">Dettagli Certificato</string>
   <string name="unknown_uid">&lt;sconosciuto&gt;</string>
   <string name="empty_certs">Nessun certificato per questa chiave</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index a6b802152..e3b797fc9 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -220,7 +220,7 @@
   <string name="nfc_successful">NFCビームで鍵を送信しました!</string>
   <string name="key_copied_to_clipboard">鍵はクリプボードにコピーされました!</string>
   <string name="key_has_already_been_certified">鍵はすでに検証されています!</string>
-  <string name="select_key_to_sign">署名に使う鍵を選択して下さい!</string>
+  <string name="select_key_to_certify">署名に使う鍵を選択して下さい!</string>
   <string name="key_too_big_for_sharing">この共有方法では鍵が大きすぎます!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -412,7 +412,7 @@
   <string name="cert_verify_error">エラー!</string>
   <string name="cert_verify_unavailable">鍵がありません</string>
   <!--unsorted-->
-  <string name="section_signer_id">署名者</string>
+  <string name="section_certifier_id">署名者</string>
   <string name="section_cert">証明の詳細</string>
   <string name="unknown_uid">&lt;不明&gt;</string>
   <string name="empty_certs">この鍵に証明がない</string>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index 1d67f2223..e4bfc75ec 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -238,7 +238,7 @@
   <string name="nfc_successful">Pomyślnie wysłano klucz przez NFC Beam!</string>
   <string name="key_copied_to_clipboard">Klucz został skopiowany do schowka!</string>
   <string name="key_has_already_been_certified">Klucz został już wcześniej certyfikowany!</string>
-  <string name="select_key_to_sign">Wybierz klucz, który zostanie użyty do podpisania!</string>
+  <string name="select_key_to_certify">Wybierz klucz, który zostanie użyty do podpisania!</string>
   <string name="key_too_big_for_sharing">Klucz ma za duży rozmiar by być udostępniony w ten sposób!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -440,7 +440,7 @@
   <string name="cert_verify_error">błąd!</string>
   <string name="cert_verify_unavailable">klucz niedostępny</string>
   <!--unsorted-->
-  <string name="section_signer_id">Podpisujący</string>
+  <string name="section_certifier_id">Podpisujący</string>
   <string name="section_cert">Szczegóły certyfikatu</string>
   <string name="unknown_uid">&lt;nieznany&gt;</string>
   <string name="empty_certs">Nie ma certyfikatów dla tego klucza</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 1dc0a6e36..97c36b328 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -230,7 +230,7 @@
   <string name="nfc_successful">Ключ успешно передан через NFC!</string>
   <string name="key_copied_to_clipboard">Ключ скопирован в буфер обмена!</string>
   <string name="key_has_already_been_certified">Ключ уже был сертифицирован ранее!</string>
-  <string name="select_key_to_sign">Выберите ключ, используемый для подписи!</string>
+  <string name="select_key_to_certify">Выберите ключ, используемый для подписи!</string>
   <string name="key_too_big_for_sharing">Ключ слишком большой для этого способа передачи!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -426,7 +426,7 @@
   <string name="cert_verify_error">ошибка!</string>
   <string name="cert_verify_unavailable">ключ не доступен</string>
   <!--unsorted-->
-  <string name="section_signer_id">Подписант</string>
+  <string name="section_certifier_id">Подписант</string>
   <string name="section_cert">Детали сертификации</string>
   <string name="unknown_uid">&lt;неизв.&gt;</string>
   <string name="empty_certs">Этот ключ не сертифицирован</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index f2bf134e5..73c51d31d 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -247,7 +247,7 @@
   <string name="nfc_successful">Ključ uspešno poslan preko NFC Beam!</string>
   <string name="key_copied_to_clipboard">Ključ je bil prekopiran v odložišče!</string>
   <string name="key_has_already_been_certified">Ključ je že bil overjen!</string>
-  <string name="select_key_to_sign">Izberite ključ, ki ga boste uporabljali za podpisovanje</string>
+  <string name="select_key_to_certify">Izberite ključ, ki ga boste uporabljali za podpisovanje</string>
   <string name="key_too_big_for_sharing">Ključ je prevelik za delitev na ta način!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -454,7 +454,7 @@
   <string name="cert_verify_error">napaka!</string>
   <string name="cert_verify_unavailable">ključ ni na voljo</string>
   <!--unsorted-->
-  <string name="section_signer_id">Podpisnik</string>
+  <string name="section_certifier_id">Podpisnik</string>
   <string name="section_cert">Podrobnosti potrdil</string>
   <string name="unknown_uid">&lt;neznan&gt;</string>
   <string name="empty_certs">Ni potrdil za ta ključ</string>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index 19115e141..6440b43bf 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -181,6 +181,6 @@
   <string name="cert_verify_error">hata!</string>
   <string name="cert_verify_unavailable">anahtar mevcut değil</string>
   <!--unsorted-->
-  <string name="section_signer_id">İmzalayan</string>
+  <string name="section_certifier_id">İmzalayan</string>
   <string name="can_sign_not">imzalanamadı</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index a8c7243b3..dc9fe2d6a 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -223,7 +223,7 @@
   <string name="key_send_success">Успішно завантажено ключ на сервер</string>
   <string name="list_empty">Цей список - порожній!</string>
   <string name="key_copied_to_clipboard">Ключ вже скопійовано у буфер обміну!</string>
-  <string name="select_key_to_sign">Будь ласка, виберіть ключ, використаний для підписування!</string>
+  <string name="select_key_to_certify">Будь ласка, виберіть ключ, використаний для підписування!</string>
   <string name="key_too_big_for_sharing">Ключ надто великий для цього способу поширення!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -420,7 +420,7 @@
   <string name="cert_verify_error">Помилка!</string>
   <string name="cert_verify_unavailable">Недоступний ключ</string>
   <!--unsorted-->
-  <string name="section_signer_id">Підписувач</string>
+  <string name="section_certifier_id">Підписувач</string>
   <string name="section_cert">Дані сертифікату</string>
   <string name="empty_certs">Немає сертифікатів для цього ключа</string>
   <string name="label_revocation">Причина відхилення</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index e82bc2a8f..2109476c3 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -25,7 +25,7 @@
     <string name="title_export_keys">Export Keys</string>
     <string name="title_key_not_found">Key Not Found</string>
     <string name="title_send_key">Upload to Keyserver</string>
-    <string name="title_certify_key">Certify Key</string>
+    <string name="title_certify_key">Certify Identities</string>
     <string name="title_key_details">Key Details</string>
     <string name="title_help">Help</string>
 
@@ -66,7 +66,7 @@
     <string name="btn_lookup_key">Lookup key</string>
     <string name="btn_encryption_advanced_settings_show">Show advanced settings</string>
     <string name="btn_encryption_advanced_settings_hide">Hide advanced settings</string>
-    <string name="btn_share_encrypted_signed">Share encrypted/signed...</string>
+    <string name="btn_share_encrypted_signed">Share encrypted/signed…</string>
 
     <!-- menu -->
     <string name="menu_preferences">Settings</string>
@@ -253,13 +253,13 @@
     </plurals>
 
     <string name="key_send_success">Successfully uploaded key to server</string>
-    <string name="key_certify_success">Successfully certified key</string>
+    <string name="key_certify_success">Successfully certified identities</string>
     <string name="list_empty">This list is empty!</string>
     <string name="nfc_successful">Successfully sent key with NFC Beam!</string>
     <string name="key_copied_to_clipboard">Key has been copied to the clipboard!</string>
     <string name="fingerprint_copied_to_clipboard">Fingerprint has been copied to the clipboard!</string>
     <string name="key_has_already_been_certified">Key has already been certified!</string>
-    <string name="select_key_to_sign">Please select a key to be used for signing!</string>
+    <string name="select_key_to_certify">Please select a key to be used for certification!</string>
     <string name="key_too_big_for_sharing">Key is too big to be shared this way!</string>
 
     <!--
@@ -464,7 +464,7 @@
     <string name="key_view_tab_main">Main Info</string>
     <string name="key_view_tab_share">Share</string>
     <string name="key_view_tab_keys_details">Key Details</string>
-    <string name="key_view_tab_certs">Certifications</string>
+    <string name="key_view_tab_certs">Certificates</string>
 
     <!-- Navigation Drawer -->
     <string name="nav_keys">Keys</string>
@@ -484,7 +484,7 @@
     <string name="encrypt_content_edit_text_hint">Write message here to encrypt and/or sign…</string>
     <string name="decrypt_content_edit_text_hint">Enter ciphertext here to decrypt and/or verify…</string>
 
-    <!-- certifications -->
+    <!-- certs -->
     <string name="cert_default">default</string>
     <string name="cert_none">none</string>
     <string name="cert_casual">casual</string>
@@ -496,12 +496,12 @@
     <string name="cert_verify_unavailable">key unavailable</string>
 
     <!-- unsorted -->
-    <string name="section_signer_id">Signer</string>
+    <string name="section_certifier_id">Certifier</string>
     <string name="section_cert">Certificate Details</string>
     <string name="label_user_id">Identity</string>
     <string name="unknown_uid">&lt;unknown&gt;</string>
     <string name="empty_certs">No certificates for this key</string>
-    <string name="section_uids_to_sign">Identities to sign</string>
+    <string name="section_uids_to_certify">Identities to certify</string>
     <string name="label_revocation">Revocation Reason</string>
     <string name="label_verify_status">Verification Status</string>
     <string name="label_cert_type">Type</string>
-- 
cgit v1.2.3