diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml index cee186daf..ca203c1f2 100644 --- a/OpenPGP-Keychain/AndroidManifest.xml +++ b/OpenPGP-Keychain/AndroidManifest.xml @@ -88,7 +88,7 @@ @@ -104,7 +104,7 @@ @@ -120,13 +120,13 @@ @@ -142,7 +142,7 @@ @@ -248,11 +248,11 @@ + android:label="@string/title_key_server_query" /> + android:label="@string/title_send_key" /> + android:label="@string/title_sign_key" /> @@ -332,7 +332,7 @@ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png deleted file mode 100644 index 541781cd1..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png deleted file mode 100644 index 209278377..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png deleted file mode 100644 index 8f39c428a..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png deleted file mode 100644 index 6b98ad50c..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png deleted file mode 100644 index 58689b43a..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png deleted file mode 100644 index b119b1999..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/key.png b/OpenPGP-Keychain/res/drawable-hdpi/key.png deleted file mode 100644 index af4742ec0..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/key.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/key_large.png b/OpenPGP-Keychain/res/drawable-hdpi/key_large.png deleted file mode 100644 index 590f7d5a4..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/key_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-hdpi/signed.png b/OpenPGP-Keychain/res/drawable-hdpi/signed.png deleted file mode 100644 index ab9495e7b..000000000 Binary files a/OpenPGP-Keychain/res/drawable-hdpi/signed.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png deleted file mode 100644 index bcd8cfc8e..000000000 Binary files a/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png deleted file mode 100644 index 34c3d3f97..000000000 Binary files a/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-ldpi/key.png b/OpenPGP-Keychain/res/drawable-ldpi/key.png deleted file mode 100644 index c806b6041..000000000 Binary files a/OpenPGP-Keychain/res/drawable-ldpi/key.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-ldpi/key_large.png b/OpenPGP-Keychain/res/drawable-ldpi/key_large.png deleted file mode 100644 index aa499a5e1..000000000 Binary files a/OpenPGP-Keychain/res/drawable-ldpi/key_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-ldpi/signed.png b/OpenPGP-Keychain/res/drawable-ldpi/signed.png deleted file mode 100644 index 4202c3f97..000000000 Binary files a/OpenPGP-Keychain/res/drawable-ldpi/signed.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png deleted file mode 100644 index 34c3d3f97..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png deleted file mode 100644 index 541781cd1..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png deleted file mode 100644 index 7c57436fc..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png deleted file mode 100644 index 84557bbee..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png deleted file mode 100644 index 4ee0de4af..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png deleted file mode 100644 index 08fb51400..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/key.png b/OpenPGP-Keychain/res/drawable-mdpi/key.png deleted file mode 100644 index aa499a5e1..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/key.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/key_large.png b/OpenPGP-Keychain/res/drawable-mdpi/key_large.png deleted file mode 100644 index af4742ec0..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/key_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-mdpi/signed.png b/OpenPGP-Keychain/res/drawable-mdpi/signed.png deleted file mode 100644 index d2917644c..000000000 Binary files a/OpenPGP-Keychain/res/drawable-mdpi/signed.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png deleted file mode 100644 index 2641f142a..000000000 Binary files a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png deleted file mode 100644 index 23ee08bee..000000000 Binary files a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png deleted file mode 100644 index 04562f33a..000000000 Binary files a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png deleted file mode 100644 index 015e6c6a1..000000000 Binary files a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/encrypted.png b/OpenPGP-Keychain/res/drawable/encrypted.png deleted file mode 100644 index 2783804bc..000000000 Binary files a/OpenPGP-Keychain/res/drawable/encrypted.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/encrypted_large.png b/OpenPGP-Keychain/res/drawable/encrypted_large.png deleted file mode 100644 index 6d7c616a4..000000000 Binary files a/OpenPGP-Keychain/res/drawable/encrypted_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png b/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png deleted file mode 100644 index ed31ba580..000000000 Binary files a/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png b/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png deleted file mode 100644 index 5df8d60f0..000000000 Binary files a/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/key.png b/OpenPGP-Keychain/res/drawable/key.png deleted file mode 100644 index de7e72524..000000000 Binary files a/OpenPGP-Keychain/res/drawable/key.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/key_large.png b/OpenPGP-Keychain/res/drawable/key_large.png deleted file mode 100644 index 6f18c0240..000000000 Binary files a/OpenPGP-Keychain/res/drawable/key_large.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/drawable/signed.png b/OpenPGP-Keychain/res/drawable/signed.png deleted file mode 100644 index 490e94fbd..000000000 Binary files a/OpenPGP-Keychain/res/drawable/signed.png and /dev/null differ diff --git a/OpenPGP-Keychain/res/layout/account_item.xml b/OpenPGP-Keychain/res/layout/account_item.xml deleted file mode 100644 index 0aa76719a..000000000 --- a/OpenPGP-Keychain/res/layout/account_item.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml index 45dd11252..81b48be72 100644 --- a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml +++ b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml @@ -88,7 +88,7 @@ + android:text="@string/key_creation_el_gamal_info" /> @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:padding="4dp" - android:text="@string/label_keySize" /> + android:text="@string/label_key_size" /> + android:text="@string/label_delete_after_decryption" /> diff --git a/OpenPGP-Keychain/res/layout/edit_key.xml b/OpenPGP-Keychain/res/layout/edit_key.xml index 3ab5f1c52..20cc9f2ac 100644 --- a/OpenPGP-Keychain/res/layout/edit_key.xml +++ b/OpenPGP-Keychain/res/layout/edit_key.xml @@ -33,20 +33,20 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="4dp" - android:text="@string/label_passPhrase" /> + android:text="@string/label_passphrase" /> + android:text="@string/label_no_passphrase" />