spring-cleaning: remove unused resources, rename strings from camelCase to snake_case to follow standard practice

3 files changed, 10 insertions, 10 deletions

diff --git a/OpenPGP-Keychain/res/xml/preferences.xml b/OpenPGP-Keychain/res/xml/preferences.xml
index 6b040f8a7..f5b46c232 100644
--- a/OpenPGP-Keychain/res/xml/preferences.xml
+++ b/OpenPGP-Keychain/res/xml/preferences.xml
@@ -23,41 +23,41 @@
             android:entryValues="@array/pass_phrase_cache_ttl_values"
             android:key="passPhraseCacheTtl"
             android:persistent="false"
-            android:title="@string/label_passPhraseCacheTtl" />
+            android:title="@string/label_passphrase_cache_ttl" />
 
         <PreferenceScreen
             android:key="keyServers"
             android:persistent="false"
-            android:title="@string/label_keyServers" />
+            android:title="@string/label_key_servers" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/section_defaults" >
         <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:key="defaultEncryptionAlgorithm"
             android:persistent="false"
-            android:title="@string/label_encryptionAlgorithm" />
+            android:title="@string/label_encryption_algorithm" />
         <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:key="defaultHashAlgorithm"
             android:persistent="false"
-            android:title="@string/label_hashAlgorithm" />
+            android:title="@string/label_hash_algorithm" />
         <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:key="defaultMessageCompression"
             android:persistent="false"
-            android:title="@string/label_messageCompression" />
+            android:title="@string/label_message_compression" />
         <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:key="defaultFileCompression"
             android:persistent="false"
-            android:title="@string/label_fileCompression" />
+            android:title="@string/label_file_compression" />
 
         <CheckBoxPreference
             android:key="defaultAsciiArmour"
             android:persistent="false"
-            android:title="@string/label_asciiArmour" />
+            android:title="@string/label_ascii_armor" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/section_advanced" >
         <CheckBoxPreference
             android:key="forceV3Signatures"
             android:persistent="false"
-            android:title="@string/label_forceV3Signature" />
+            android:title="@string/label_force_v3_signature" />
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/xml/searchable_public_keys.xml b/OpenPGP-Keychain/res/xml/searchable_public_keys.xml
index e9602b121..f07a809a0 100644
--- a/OpenPGP-Keychain/res/xml/searchable_public_keys.xml
+++ b/OpenPGP-Keychain/res/xml/searchable_public_keys.xml
@@ -16,7 +16,7 @@
 -->
 
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:hint="@string/hint_publicKeys"
+    android:hint="@string/hint_public_keys"
     android:label="@string/app_name" >
 
 </searchable>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/xml/searchable_secret_keys.xml b/OpenPGP-Keychain/res/xml/searchable_secret_keys.xml
index a7e8873d6..59b9841db 100644
--- a/OpenPGP-Keychain/res/xml/searchable_secret_keys.xml
+++ b/OpenPGP-Keychain/res/xml/searchable_secret_keys.xml
@@ -16,7 +16,7 @@
 -->
 
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:hint="@string/hint_secretKeys"
+    android:hint="@string/hint_secret_keys"
     android:label="@string/app_name" >
 
 </searchable>
\ No newline at end of file