From 92059d6d3b1d449e18006157ba39d26a46c91c90 Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Sun, 18 Jul 2010 06:54:39 +0000
Subject: [PATCH] fixed the made-up word "authentification", also changed the
 title of that dialog to "Pass Phrase", dialog message then only contains the
 key details or "Symmetric encryption."

Update issue 39
I tried to change "title_athentication", "passPhraseForSymmetricEncryption", and "passPhraseFor" in all languages. I think the changes are correct, but if you guys could make sure I didn't do anything dumb, then that'd be better. :)
---
 res/values-da/strings.xml                                  | 6 +++---
 res/values-de/strings.xml                                  | 7 +++----
 res/values-it/strings.xml                                  | 6 +++---
 res/values-sl/strings.xml                                  | 6 +++---
 res/values/strings.xml                                     | 6 +++---
 .../thialfihar/android/apg/AskForSecretKeyPassPhrase.java  | 2 +-
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0fa617ebc..8e75695a5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -25,7 +25,7 @@
     <string name="title_selectSignature">Vælg Signatur</string>
     <string name="title_encrypt">Kryptér</string>
     <string name="title_decrypt">Afkryptér</string>
-    <string name="title_authentification">Autentificering</string>
+    <string name="title_authentication">Kodeord</string>
     <string name="title_createKey">Opret Nøgle</string>
     <string name="title_editKey">Redigér Nøgle</string>
     <string name="title_preferences">Indstillinger</string>
@@ -150,8 +150,8 @@
     <string name="noFilemanagerInstalled">Der er ikke installeret en kompatibel fil håndtering.</string>
     <string name="passPhrasesDoNotMatch">Kodeordet matchede ikke.</string>
     <string name="passPhraseMustNotBeEmpty">Et tomt kodeord er ikke tilladt.</string>
-    <string name="passPhraseForSymmetricEncryption">Kodeord til symmetrisk kryptering:</string>
-    <string name="passPhraseFor">Kodeord til %s:</string>
+    <string name="passPhraseForSymmetricEncryption">Symmetrisk kryptering.</string>
+    <string name="passPhraseFor">%s</string>
     <string name="fileDeleteConfirmation">Er du sikker på at du vil slette \n%s?</string>
     <string name="fileDeleteSuccessful">Filen er slettet.</string>
     <string name="noFileSelected">Vælg en fil først.</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ad53b44f5..2bca67ecd 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -27,7 +27,7 @@
     <string name="title_selectSignature">Signatur auswählen</string>
     <string name="title_encrypt">Verschlüsseln</string>
     <string name="title_decrypt">Entschlüsseln</string>
-    <string name="title_authentification">Authentifizierung</string>
+    <string name="title_authentication">Passwort</string>
     <string name="title_createKey">Schlüssel erzeugen</string>
     <string name="title_editKey">Schlüssel bearbeiten</string>
     <string name="title_preferences">Einstellungen</string>
@@ -158,9 +158,8 @@
     <string name="noFilemanagerInstalled">Kein kompatibler Dateimanager installiert.</string>
     <string name="passPhrasesDoNotMatch">Passwörter stimmen nicht überein.</string>
     <string name="passPhraseMustNotBeEmpty">Leere Passwörter sind unzulässig.</string>
-
-    <string name="passPhraseForSymmetricEncryption">Passwort für symmetrische Verschlüsselung:</string>
-    <string name="passPhraseFor">Passwort für %s:</string>
+    <string name="passPhraseForSymmetricEncryption">Symmetrische Verschlüsselung.</string>
+    <string name="passPhraseFor">%s</string>
     <string name="fileDeleteConfirmation">Soll\n%s wirklich gelöscht werden?</string>
     <string name="fileDeleteSuccessful">Erfolgreich gelöscht.</string>
     <string name="noFileSelected">Zuerst eine Datei auswählen.</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 18897cb88..1af23ad69 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -27,7 +27,7 @@
     <string name="title_selectSignature">Seleziona Firma</string>
     <string name="title_encrypt">Critta</string>
     <string name="title_decrypt">Decritta</string>
-    <string name="title_authentification">Autenticazione</string>
+    <string name="title_authentication">Pass Phrase</string>
     <string name="title_createKey">Crea Chiave</string>
     <string name="title_editKey">Modifica Chiave</string>
     <string name="title_preferences">Preferenze</string>
@@ -152,8 +152,8 @@
     <string name="noFilemanagerInstalled">Nessun file manager compatibile installato.</string>
     <string name="passPhrasesDoNotMatch">La Pass Phrase non è corretta</string>
     <string name="passPhraseMustNotBeEmpty">La Pass Phrases non può essere vuota.</string>
-    <string name="passPhraseForSymmetricEncryption">Pass Phrase per la crittazione simmetrica:</string>
-    <string name="passPhraseFor">Pass Phrase per %s:</string>
+    <string name="passPhraseForSymmetricEncryption">Crittazione simmetrica.</string>
+    <string name="passPhraseFor">%s</string>
     <string name="fileDeleteConfirmation">Sei sicuro di procedere con la cancellazione di\n%s?</string>
     <string name="fileDeleteSuccessful">Cancellazione eseguita..</string>
     <string name="noFileSelected">Selezionare un file.</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f57578846..94f237c5b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -27,7 +27,7 @@
     <string name="title_selectSignature">Izberi podpis</string>
     <string name="title_encrypt">Šifriraj</string>
     <string name="title_decrypt">Dešifriraj</string>
-    <string name="title_authentification">Avtentikacija</string>
+    <string name="title_authentication">Geslo</string>
     <string name="title_createKey">Ustvari ključ</string>
     <string name="title_editKey">Uredi ključ</string>
     <string name="title_preferences">Nastavitve</string>
@@ -152,8 +152,8 @@
     <string name="noFilemanagerInstalled">Nameščen ni noben združljiv upravitelj datotek.</string>
     <string name="passPhrasesDoNotMatch">Gesli se ne ujemata.</string>
     <string name="passPhraseMustNotBeEmpty">Prazna gesla niso dovoljena.</string>
-    <string name="passPhraseForSymmetricEncryption">Geslo za simetrično enkripcijo:</string>
-    <string name="passPhraseFor">Geslo za %s:</string>
+    <string name="passPhraseForSymmetricEncryption">Simetrično enkripcijo.</string>
+    <string name="passPhraseFor">%s</string>
     <string name="fileDeleteConfirmation">Ali ste prepričani, da želite izbrisati\n%s?</string>
     <string name="fileDeleteSuccessful">Uspešno izbrisano.</string>
     <string name="noFileSelected">Najprej izberite datoteko.</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 85d7d4b77..a5c9fd566 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -25,7 +25,7 @@
     <string name="title_selectSignature">Select Signature</string>
     <string name="title_encrypt">Encrypt</string>
     <string name="title_decrypt">Decrypt</string>
-    <string name="title_authentification">Authentification</string>
+    <string name="title_authentication">Pass Phrase</string>
     <string name="title_createKey">Create Key</string>
     <string name="title_editKey">Edit Key</string>
     <string name="title_preferences">Preferences</string>
@@ -150,8 +150,8 @@
     <string name="noFilemanagerInstalled">No compatible file manager installed.</string>
     <string name="passPhrasesDoNotMatch">The pass phrases didn\'t match.</string>
     <string name="passPhraseMustNotBeEmpty">Empty pass phrases are not allowed.</string>
-    <string name="passPhraseForSymmetricEncryption">Pass phrase for symmetric encryption:</string>
-    <string name="passPhraseFor">Pass phrase for %s:</string>
+    <string name="passPhraseForSymmetricEncryption">Symmetric encryption.</string>
+    <string name="passPhraseFor">%s</string>
     <string name="fileDeleteConfirmation">Are you sure you want to delete\n%s?</string>
     <string name="fileDeleteSuccessful">Successfully deleted.</string>
     <string name="noFileSelected">Select a file first.</string>
diff --git a/src/org/thialfihar/android/apg/AskForSecretKeyPassPhrase.java b/src/org/thialfihar/android/apg/AskForSecretKeyPassPhrase.java
index 7c582ef0c..1e3dd3726 100644
--- a/src/org/thialfihar/android/apg/AskForSecretKeyPassPhrase.java
+++ b/src/org/thialfihar/android/apg/AskForSecretKeyPassPhrase.java
@@ -40,7 +40,7 @@ public class AskForSecretKeyPassPhrase {
                                       PassPhraseCallbackInterface callback) {
         AlertDialog.Builder alert = new AlertDialog.Builder(context);
 
-        alert.setTitle(R.string.title_authentification);
+        alert.setTitle(R.string.title_authentication);
 
         final PGPSecretKey secretKey;
         final Activity activity = context;