corrected commit

mCurrentPassPhrase, mChangePassPhrase

Minor variable naming Issue #338

14 files changed, 20 insertions, 20 deletions

diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
index 182540dc5..fc4422cf0 100644
--- a/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
@@ -27,7 +27,7 @@
             android:text="@string/label_no_passphrase" />
 
         <com.beardedhen.androidbootstrap.BootstrapButton
-            android:id="@+id/edit_key_btn_change_pass_phrase"
+            android:id="@+id/edit_key_btn_change_passphrase"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:padding="4dp"
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
index 678f2bd4e..27e29eddb 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml
@@ -135,7 +135,7 @@
                     <TableRow>
 
                         <TextView
-                            android:id="@+id/label_passPhrase"
+                            android:id="@+id/label_passphrase"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
@@ -144,7 +144,7 @@
                             android:textAppearance="?android:attr/textAppearanceMedium" />
 
                         <EditText
-                            android:id="@+id/passPhrase"
+                            android:id="@+id/passphrase"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="textPassword" />
@@ -153,7 +153,7 @@
                     <TableRow>
 
                         <TextView
-                            android:id="@+id/label_passPhraseAgain"
+                            android:id="@+id/label_passphraseAgain"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
@@ -162,7 +162,7 @@
                             android:textAppearance="?android:attr/textAppearanceMedium" />
 
                         <EditText
-                            android:id="@+id/passPhraseAgain"
+                            android:id="@+id/passphraseAgain"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="textPassword" />
diff --git a/OpenPGP-Keychain/src/main/res/values-de/strings.xml b/OpenPGP-Keychain/src/main/res/values-de/strings.xml
index 493a3a9bb..ea1e550e3 100644
--- a/OpenPGP-Keychain/src/main/res/values-de/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-de/strings.xml
@@ -13,7 +13,7 @@
   <string name="title_preferences">Einstellungen</string>
   <string name="title_api_registered_apps">Registrierte Anwendungen</string>
   <string name="title_key_server_preference">Schlüsselserver</string>
-  <string name="title_change_pass_phrase">Passwort ändern</string>
+  <string name="title_change_passphrase">Passwort ändern</string>
   <string name="title_set_passphrase">Passwort setzen</string>
   <string name="title_send_email">E-Mail senden…</string>
   <string name="title_encrypt_to_file">In eine Datei verschlüsseln</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
index e43cecc2c..d1f0bd75b 100644
--- a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml
@@ -10,7 +10,7 @@
   <string name="title_edit_key">Editar clave</string>
   <string name="title_preferences">Preferencias</string>
   <string name="title_api_registered_apps">Aplicaciones registradas</string>
-  <string name="title_change_pass_phrase">Cambiar contraseña</string>
+  <string name="title_change_passphrase">Cambiar contraseña</string>
   <string name="title_set_passphrase">Establecer contraseña</string>
   <string name="title_send_email">Enviar correo electrónico…</string>
   <string name="title_encrypt_to_file">Cifrar a archivo</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-es/strings.xml b/OpenPGP-Keychain/src/main/res/values-es/strings.xml
index edf190184..de680337f 100644
--- a/OpenPGP-Keychain/src/main/res/values-es/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-es/strings.xml
@@ -13,7 +13,7 @@
   <string name="title_preferences"> Preferencias</string>
   <string name="title_api_registered_apps">Aplicaciones registradas</string>
   <string name="title_key_server_preference">Prioridad del servidor de claves</string>
-  <string name="title_change_pass_phrase">Cambiar la frase de contraseña</string>
+  <string name="title_change_passphrase">Cambiar la frase de contraseña</string>
   <string name="title_set_passphrase">Establecer frase de contraseña</string>
   <string name="title_send_email">Enviar email…</string>
   <string name="title_encrypt_to_file">Cifrar hacia archivo</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
index 171ce1fa5..aa9b59287 100644
--- a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml
@@ -13,7 +13,7 @@
   <string name="title_preferences">Préférences</string>
   <string name="title_api_registered_apps">Applications enregistrées</string>
   <string name="title_key_server_preference">Préférences du serveur de clefs</string>
-  <string name="title_change_pass_phrase">Changer la phrase de passe</string>
+  <string name="title_change_passphrase">Changer la phrase de passe</string>
   <string name="title_set_passphrase">Définir la phrase de passe</string>
   <string name="title_send_email">Envoyer un courriel…</string>
   <string name="title_encrypt_to_file">Chiffrer vers un fichier</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
index 5ceb4f45b..825115bc9 100644
--- a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml
@@ -13,7 +13,7 @@
   <string name="title_preferences">Preferenze</string>
   <string name="title_api_registered_apps">App Registrate</string>
   <string name="title_key_server_preference">Preferenze Server delle Chiavi</string>
-  <string name="title_change_pass_phrase">Cambia Frase di Accesso</string>
+  <string name="title_change_passphrase">Cambia Frase di Accesso</string>
   <string name="title_set_passphrase">Imposta Frase di Accesso</string>
   <string name="title_send_email">Invia Mail…</string>
   <string name="title_encrypt_to_file">Codifica File</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml
index 0ba511c1e..97d5a72f4 100644
--- a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml
@@ -13,7 +13,7 @@
   <string name="title_preferences">設定</string>
   <string name="title_api_registered_apps">登録済みのアプリケーション</string>
   <string name="title_key_server_preference">鍵サーバ設定</string>
-  <string name="title_change_pass_phrase">パスフレーズの変更</string>
+  <string name="title_change_passphrase">パスフレーズの変更</string>
   <string name="title_set_passphrase">パスフレーズの設定</string>
   <string name="title_send_email">メールの送信…</string>
   <string name="title_encrypt_to_file">暗号化してファイルに</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
index 35a0b5a03..863932a80 100644
--- a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
@@ -10,7 +10,7 @@
   <string name="title_edit_key">Sleutel bewerken</string>
   <string name="title_preferences">Instellingen</string>
   <string name="title_api_registered_apps">Geregistreerde apps</string>
-  <string name="title_change_pass_phrase">Wachtwoord wijzigen</string>
+  <string name="title_change_passphrase">Wachtwoord wijzigen</string>
   <string name="title_set_passphrase">Wachtwoord instellen</string>
   <string name="title_send_email">E-mail verzenden…</string>
   <string name="title_encrypt_to_file">Versleutelen naar bestand</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
index c8aff125b..f69cf8789 100644
--- a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml
@@ -13,7 +13,7 @@
   <string name="title_preferences">Настройки</string>
   <string name="title_api_registered_apps">Связанные приложения</string>
   <string name="title_key_server_preference">Настройки сервера ключей</string>
-  <string name="title_change_pass_phrase">Изменить пароль</string>
+  <string name="title_change_passphrase">Изменить пароль</string>
   <string name="title_set_passphrase">Задать пароль</string>
   <string name="title_send_email">Отправить…</string>
   <string name="title_encrypt_to_file">Зашифровать в файл</string>
diff --git a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
index c883ea583..8997ef5ce 100644
--- a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml
@@ -13,7 +13,7 @@
   <string name="title_preferences">Налаштування</string>
   <string name="title_api_registered_apps">Зареєстровані програми</string>
   <string name="title_key_server_preference">Налаштування сервера ключів</string>
-  <string name="title_change_pass_phrase">Змінити парольну фразу</string>
+  <string name="title_change_passphrase">Змінити парольну фразу</string>
   <string name="title_set_passphrase">Задати парольну фразу</string>
   <string name="title_send_email">Надіслати листа…</string>
   <string name="title_encrypt_to_file">Зашифрувати до файлу</string>
diff --git a/OpenPGP-Keychain/src/main/res/values/arrays.xml b/OpenPGP-Keychain/src/main/res/values/arrays.xml
index 974239110..5244de419 100644
--- a/OpenPGP-Keychain/src/main/res/values/arrays.xml
+++ b/OpenPGP-Keychain/src/main/res/values/arrays.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string-array name="pass_phrase_cache_ttl_entries" translatable="false">
+    <string-array name="passphrase_cache_ttl_entries" translatable="false">
         <item>@string/choice_15secs</item>
         <item>@string/choice_1min</item>
         <item>@string/choice_3mins</item>
@@ -15,7 +15,7 @@
         <item>@string/choice_8hours</item>
         <item>@string/choice_forever</item>
     </string-array>
-    <string-array name="pass_phrase_cache_ttl_values" translatable="false">
+    <string-array name="passphrase_cache_ttl_values" translatable="false">
         <item>15</item>
         <item>60</item>
         <item>180</item>
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 9689010ed..34dc26571 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="title_preferences">Preferences</string>
     <string name="title_api_registered_apps">Registered Applications</string>
     <string name="title_key_server_preference">Keyserver Preference</string>
-    <string name="title_change_pass_phrase">Change Passphrase</string>
+    <string name="title_change_passphrase">Change Passphrase</string>
     <string name="title_set_passphrase">Set Passphrase</string>
     <string name="title_send_email">"Send Mail…"</string>
     <string name="title_encrypt_to_file">Encrypt To File</string>
diff --git a/OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml b/OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml
index f83fcb0f6..9f1883df0 100644
--- a/OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml
+++ b/OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml
@@ -18,9 +18,9 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/section_general" >
         <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
-            android:entries="@array/pass_phrase_cache_ttl_entries"
-            android:entryValues="@array/pass_phrase_cache_ttl_values"
-            android:key="passPhraseCacheTtl"
+            android:entries="@array/passphrase_cache_ttl_entries"
+            android:entryValues="@array/passphrase_cache_ttl_values"
+            android:key="passphraseCacheTtl"
             android:persistent="false"
             android:title="@string/label_passphrase_cache_ttl" />