diff options
Diffstat (limited to 'OpenPGP-Keychain/res')
63 files changed, 237 insertions, 415 deletions
diff --git a/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png Binary files differdeleted file mode 100644 index 541781cd1..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png Binary files differdeleted file mode 100644 index 209278377..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png Binary files differdeleted file mode 100644 index 8f39c428a..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png Binary files differdeleted file mode 100644 index 6b98ad50c..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png Binary files differdeleted file mode 100644 index 58689b43a..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png Binary files differdeleted file mode 100644 index b119b1999..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/key.png b/OpenPGP-Keychain/res/drawable-hdpi/key.png Binary files differdeleted file mode 100644 index af4742ec0..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/key.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/key_large.png b/OpenPGP-Keychain/res/drawable-hdpi/key_large.png Binary files differdeleted file mode 100644 index 590f7d5a4..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/key_large.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-hdpi/signed.png b/OpenPGP-Keychain/res/drawable-hdpi/signed.png Binary files differdeleted file mode 100644 index ab9495e7b..000000000 --- a/OpenPGP-Keychain/res/drawable-hdpi/signed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png Binary files differdeleted file mode 100644 index bcd8cfc8e..000000000 --- a/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png Binary files differdeleted file mode 100644 index 34c3d3f97..000000000 --- a/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-ldpi/key.png b/OpenPGP-Keychain/res/drawable-ldpi/key.png Binary files differdeleted file mode 100644 index c806b6041..000000000 --- a/OpenPGP-Keychain/res/drawable-ldpi/key.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-ldpi/key_large.png b/OpenPGP-Keychain/res/drawable-ldpi/key_large.png Binary files differdeleted file mode 100644 index aa499a5e1..000000000 --- a/OpenPGP-Keychain/res/drawable-ldpi/key_large.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-ldpi/signed.png b/OpenPGP-Keychain/res/drawable-ldpi/signed.png Binary files differdeleted file mode 100644 index 4202c3f97..000000000 --- a/OpenPGP-Keychain/res/drawable-ldpi/signed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png Binary files differdeleted file mode 100644 index 34c3d3f97..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png Binary files differdeleted file mode 100644 index 541781cd1..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png Binary files differdeleted file mode 100644 index 7c57436fc..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png Binary files differdeleted file mode 100644 index 84557bbee..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png Binary files differdeleted file mode 100644 index 4ee0de4af..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png Binary files differdeleted file mode 100644 index 08fb51400..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi/key.png b/OpenPGP-Keychain/res/drawable-mdpi/key.png Binary files differdeleted file mode 100644 index aa499a5e1..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi/key.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi/key_large.png b/OpenPGP-Keychain/res/drawable-mdpi/key_large.png Binary files differdeleted file mode 100644 index af4742ec0..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi/key_large.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-mdpi/signed.png b/OpenPGP-Keychain/res/drawable-mdpi/signed.png Binary files differdeleted file mode 100644 index d2917644c..000000000 --- a/OpenPGP-Keychain/res/drawable-mdpi/signed.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png Binary files differdeleted file mode 100644 index 2641f142a..000000000 --- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png Binary files differdeleted file mode 100644 index 23ee08bee..000000000 --- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png Binary files differdeleted file mode 100644 index 04562f33a..000000000 --- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png Binary files differdeleted file mode 100644 index 015e6c6a1..000000000 --- a/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/encrypted.png b/OpenPGP-Keychain/res/drawable/encrypted.png Binary files differdeleted file mode 100644 index 2783804bc..000000000 --- a/OpenPGP-Keychain/res/drawable/encrypted.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/encrypted_large.png b/OpenPGP-Keychain/res/drawable/encrypted_large.png Binary files differdeleted file mode 100644 index 6d7c616a4..000000000 --- a/OpenPGP-Keychain/res/drawable/encrypted_large.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png b/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png Binary files differdeleted file mode 100644 index ed31ba580..000000000 --- a/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png b/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png Binary files differdeleted file mode 100644 index 5df8d60f0..000000000 --- a/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/key.png b/OpenPGP-Keychain/res/drawable/key.png Binary files differdeleted file mode 100644 index de7e72524..000000000 --- a/OpenPGP-Keychain/res/drawable/key.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/key_large.png b/OpenPGP-Keychain/res/drawable/key_large.png Binary files differdeleted file mode 100644 index 6f18c0240..000000000 --- a/OpenPGP-Keychain/res/drawable/key_large.png +++ /dev/null diff --git a/OpenPGP-Keychain/res/drawable/signed.png b/OpenPGP-Keychain/res/drawable/signed.png Binary files differdeleted file mode 100644 index 490e94fbd..000000000 --- a/OpenPGP-Keychain/res/drawable/signed.png +++ /dev/null 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:singleLine="true" - android:layout_marginRight="?android:attr/scrollbarSize" - android:paddingLeft="6dip" - android:paddingTop="6dip" - android:paddingBottom="6dip" - android:layout_width="fill_parent" - android:layout_height="?android:attr/listPreferredItemHeight"> - - <TextView - android:id="@+id/accountName" - android:text="someone@gmail.com" - android:textAppearance="?android:attr/textAppearanceLarge" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical"/> - -</LinearLayout> 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 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/label_encryptionAlgorithm" + android:text="@string/label_encryption_algorithm" android:textAppearance="?android:attr/textAppearanceMedium" /> <Spinner @@ -99,7 +99,7 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/label_hashAlgorithm" + android:text="@string/label_hash_algorithm" android:textAppearance="?android:attr/textAppearanceMedium" /> <Spinner @@ -110,7 +110,7 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/label_messageCompression" + android:text="@string/label_message_compression" android:textAppearance="?android:attr/textAppearanceMedium" /> <Spinner diff --git a/OpenPGP-Keychain/res/layout/create_key.xml b/OpenPGP-Keychain/res/layout/create_key.xml index 8014dbefc..888f9f898 100644 --- a/OpenPGP-Keychain/res/layout/create_key.xml +++ b/OpenPGP-Keychain/res/layout/create_key.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:padding="4dp" - android:text="@string/keyCreationElGamalInfo" /> + android:text="@string/key_creation_el_gamal_info" /> <TableRow> @@ -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" /> <Spinner android:id="@+id/create_key_size" diff --git a/OpenPGP-Keychain/res/layout/decrypt.xml b/OpenPGP-Keychain/res/layout/decrypt.xml index 84f1fc298..0533e6d72 100644 --- a/OpenPGP-Keychain/res/layout/decrypt.xml +++ b/OpenPGP-Keychain/res/layout/decrypt.xml @@ -170,7 +170,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:text="@string/label_deleteAfterDecryption" /> + android:text="@string/label_delete_after_decryption" /> </LinearLayout> </LinearLayout> </ViewFlipper> 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" /> <CheckBox android:id="@+id/edit_key_no_passphrase" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/label_noPassPhrase" /> + android:text="@string/label_no_passphrase" /> <Button android:id="@+id/edit_key_btn_change_pass_phrase" android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="4dp" - android:text="@string/btn_setPassPhrase" /> + android:text="@string/btn_set_passphrase" /> <LinearLayout android:id="@+id/edit_key_container" diff --git a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml index 0cb312583..521e8ce2c 100644 --- a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:paddingRight="10dip" - android:text="@string/label_keyId" /> + android:text="@string/label_key_id" /> <TextView android:id="@+id/keyId" diff --git a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml index b2597cf31..a3955389f 100644 --- a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml @@ -24,7 +24,7 @@ android:id="@+id/isMainUserId" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/label_mainUserId" /> + android:text="@string/label_main_user_id" /> <LinearLayout android:layout_width="fill_parent" diff --git a/OpenPGP-Keychain/res/layout/encrypt.xml b/OpenPGP-Keychain/res/layout/encrypt.xml index 4ed9f6aff..c9c6be5df 100644 --- a/OpenPGP-Keychain/res/layout/encrypt.xml +++ b/OpenPGP-Keychain/res/layout/encrypt.xml @@ -119,7 +119,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" - android:text="@string/label_selectPublicKeys" + android:text="@string/label_select_public_keys" android:textAppearance="?android:attr/textAppearanceMedium" /> <Button @@ -127,7 +127,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:text="@string/btn_selectEncryptKeys" /> + android:text="@string/btn_select_encrypt_keys" /> </LinearLayout> </LinearLayout> @@ -146,7 +146,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:paddingRight="10dip" - android:text="@string/label_passPhrase" + android:text="@string/label_passphrase" android:textAppearance="?android:attr/textAppearanceMedium" /> <EditText @@ -164,7 +164,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:paddingRight="10dip" - android:text="@string/label_passPhraseAgain" + android:text="@string/label_passphrase_again" android:textAppearance="?android:attr/textAppearanceMedium" /> <EditText @@ -264,7 +264,7 @@ android:layout_gravity="center_vertical" android:layout_weight="1" android:paddingRight="10dip" - android:text="@string/label_fileCompression" + android:text="@string/label_file_compression" android:textAppearance="?android:attr/textAppearanceSmall" /> <Spinner @@ -284,7 +284,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:text="@string/label_deleteAfterEncryption" /> + android:text="@string/label_delete_after_encryption" /> </LinearLayout> <LinearLayout @@ -297,7 +297,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:text="@string/label_asciiArmour" /> + android:text="@string/label_ascii_armor" /> </LinearLayout> </LinearLayout> </ViewFlipper> diff --git a/OpenPGP-Keychain/res/layout/file_dialog.xml b/OpenPGP-Keychain/res/layout/file_dialog.xml index e33216042..ce3b1ea60 100644 --- a/OpenPGP-Keychain/res/layout/file_dialog.xml +++ b/OpenPGP-Keychain/res/layout/file_dialog.xml @@ -44,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:contentDescription="@string/filemanager_titleOpen" + android:contentDescription="@string/filemanager_title_open" android:src="@drawable/ic_menu_filebrowser" /> </LinearLayout> diff --git a/OpenPGP-Keychain/res/layout/filter_info.xml b/OpenPGP-Keychain/res/layout/filter_info.xml deleted file mode 100644 index 9fef6548e..000000000 --- a/OpenPGP-Keychain/res/layout/filter_info.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingBottom="5dip" - android:orientation="horizontal"> - - <TextView - android:id="@+id/filterInfo" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - android:ellipsize="end"/> - - <Button - android:id="@+id/btn_clear" - android:text="@string/btn_clearFilter" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> - -</LinearLayout> diff --git a/OpenPGP-Keychain/res/layout/general.xml b/OpenPGP-Keychain/res/layout/general.xml deleted file mode 100644 index c6702efac..000000000 --- a/OpenPGP-Keychain/res/layout/general.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <ListView - android:id="@+id/options" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:padding="5dip"/> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - style="@android:style/ButtonBar"> - - <Button - android:text="dummy" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:visibility="invisible"/> - - <Button - android:id="@+id/btn_cancel" - android:text="@android:string/cancel" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_weight="2"/> - - <Button - android:text="dummy" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:visibility="invisible"/> - - </LinearLayout> - -</LinearLayout> diff --git a/OpenPGP-Keychain/res/layout/help_activity.xml b/OpenPGP-Keychain/res/layout/help_activity.xml index fa233ac2c..89aac6476 100644 --- a/OpenPGP-Keychain/res/layout/help_activity.xml +++ b/OpenPGP-Keychain/res/layout/help_activity.xml @@ -5,10 +5,9 @@ android:orientation="vertical" > <android.support.v4.view.ViewPager - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/pager" - android:layout_width="match_parent" - android:layout_height="match_parent"> - </android.support.v4.view.ViewPager> + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="match_parent" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml index 5093e412f..896be3989 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:contentDescription="@string/filemanager_titleOpen" + android:contentDescription="@string/filemanager_title_open" android:src="@drawable/ic_menu_filebrowser" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml index 9e4771e65..18e87205b 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml @@ -7,7 +7,7 @@ android:id="@+id/import_keyserver_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/menu_keyServer" /> + android:text="@string/menu_key_server" /> <!-- <Spinner --> <!-- android:id="@+id/import_keys_server_key_server" --> diff --git a/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml index 1b782c4e8..b34bb80c3 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml @@ -8,6 +8,6 @@ android:id="@+id/import_nfc_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/menu_importFromNfc" /> + android:text="@string/menu_import_from_nfc" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml b/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml index ea8394333..0a49b014a 100644 --- a/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml @@ -8,7 +8,7 @@ android:id="@+id/import_qrcode_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/menu_importFromQrCode" /> + android:text="@string/menu_import_from_qr_code" /> <TextView android:id="@+id/import_qrcode_text" diff --git a/OpenPGP-Keychain/res/layout/key_list_public_activity.xml b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml index 43aabc9af..a35e23038 100644 --- a/OpenPGP-Keychain/res/layout/key_list_public_activity.xml +++ b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml @@ -20,6 +20,6 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:paddingTop="3dp" - android:text="@string/listInformation" /> + android:text="@string/list_information" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml b/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml index d41d5ace5..d4397c444 100644 --- a/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml +++ b/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml @@ -20,6 +20,6 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:paddingTop="3dp" - android:text="@string/listInformation" /> + android:text="@string/list_information" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_server_query_layout.xml b/OpenPGP-Keychain/res/layout/key_server_query_layout.xml index 610cf82ba..5eca10c45 100644 --- a/OpenPGP-Keychain/res/layout/key_server_query_layout.xml +++ b/OpenPGP-Keychain/res/layout/key_server_query_layout.xml @@ -35,7 +35,7 @@ android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:hint="@string/hint_secretKeys" + android:hint="@string/hint_secret_keys" android:imeOptions="actionSearch" android:inputType="textNoSuggestions" android:singleLine="true" /> diff --git a/OpenPGP-Keychain/res/layout/passphrase.xml b/OpenPGP-Keychain/res/layout/passphrase.xml index fc9cb1710..778ae6b80 100644 --- a/OpenPGP-Keychain/res/layout/passphrase.xml +++ b/OpenPGP-Keychain/res/layout/passphrase.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:padding="4dp" - android:text="@string/label_passPhrase" /> + android:text="@string/label_passphrase" /> <EditText android:id="@+id/passphrase_passphrase" diff --git a/OpenPGP-Keychain/res/layout/passphrase_repeat.xml b/OpenPGP-Keychain/res/layout/passphrase_repeat.xml index 8f1d42aac..1eef4eb68 100644 --- a/OpenPGP-Keychain/res/layout/passphrase_repeat.xml +++ b/OpenPGP-Keychain/res/layout/passphrase_repeat.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:padding="4dp" - android:text="@string/label_passPhrase" /> + android:text="@string/label_passphrase" /> <EditText android:id="@+id/passphrase_passphrase" @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:padding="4dp" - android:text="@string/label_passPhraseAgain" /> + android:text="@string/label_passphrase_again" /> <EditText android:id="@+id/passphrase_passphrase_again" diff --git a/OpenPGP-Keychain/res/layout/sign_key_layout.xml b/OpenPGP-Keychain/res/layout/sign_key_layout.xml index 17be03b21..4530831ee 100644 --- a/OpenPGP-Keychain/res/layout/sign_key_layout.xml +++ b/OpenPGP-Keychain/res/layout/sign_key_layout.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> <TextView android:id="@+id/textView1" android:layout_height="wrap_content" - android:text="@string/label_sendKey" android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/label_send_key" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="wrap_content"></TextView> <CheckBox android:text="" android:id="@+id/sendKey" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/OpenPGP-Keychain/res/menu/nfc_beam.xml b/OpenPGP-Keychain/res/menu/nfc_beam.xml index 9cb86892d..e1c088b86 100644 --- a/OpenPGP-Keychain/res/menu/nfc_beam.xml +++ b/OpenPGP-Keychain/res/menu/nfc_beam.xml @@ -5,6 +5,6 @@ android:id="@+id/menu_settings" android:icon="@drawable/ic_menu_settings" android:showAsAction="always|withText" - android:title="@string/menu_BeamPreferences"/> + android:title="@string/menu_beam_preferences"/> </menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/arrays.xml b/OpenPGP-Keychain/res/values/arrays.xml index aca70c488..bd644e616 100644 --- a/OpenPGP-Keychain/res/values/arrays.xml +++ b/OpenPGP-Keychain/res/values/arrays.xml @@ -50,11 +50,11 @@ <item>@string/key_size_4096</item> </string-array> <string-array name="import_action_list"> - <item>@string/menu_importFromFile</item> - <item>@string/menu_keyServer</item> - <item>@string/menu_importFromQrCode</item> + <item>@string/menu_import_from_file</item> + <item>@string/menu_key_server</item> + <item>@string/menu_import_from_qr_code</item> <item>@string/import_from_clipboard</item> - <item>@string/menu_importFromNfc</item> + <item>@string/menu_import_from_nfc</item> </string-array> </resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/static_strings.xml b/OpenPGP-Keychain/res/values/static_strings.xml index 6fe68affc..ac5b024b4 100644 --- a/OpenPGP-Keychain/res/values/static_strings.xml +++ b/OpenPGP-Keychain/res/values/static_strings.xml @@ -2,6 +2,5 @@ <resources> <string name="app_name" translate="false">OpenPGP Keychain</string> - <string name="about_url" translate="false">https://github.com/dschuermann/apg</string> </resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index 29b01a8aa..63f267277 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -18,154 +18,136 @@ <resources> - <!-- title_lowerCase: capitalized words, no punctuation --> - <string name="title_mailInbox">Mail Inbox</string> - <string name="title_managePublicKeys">Manage Public Keys</string> - <string name="title_manageSecretKeys">Manage Secret Keys</string> - <string name="title_selectRecipients">Select Public Key</string> - <string name="title_selectSignature">Select Secret Key</string> + <!-- title --> + <string name="title_manage_public_keys">Manage Public Keys</string> + <string name="title_manage_secret_keys">Manage Secret Keys</string> + <string name="title_select_recipients">Select Public Key</string> + <string name="title_select_secret_key">Select Secret Key</string> <string name="title_encrypt">Encrypt</string> <string name="title_decrypt">Decrypt</string> <string name="title_authentication">Passphrase</string> - <string name="title_createKey">Create Key</string> - <string name="title_editKey">Edit Key</string> + <string name="title_create_key">Create Key</string> + <string name="title_edit_key">Edit Key</string> <string name="title_preferences">Preferences</string> <string name="title_api_registered_apps">Registered Applications</string> - <string name="title_keyServerPreference">Key Server Preference</string> - <string name="title_changePassPhrase">Change Passphrase</string> - <string name="title_setPassPhrase">Set Passphrase</string> - <string name="title_sendEmail">"Send Mail…"</string> - <string name="title_encryptToFile">Encrypt To File</string> - <string name="title_decryptToFile">Decrypt To File</string> - <string name="title_importKeys">Import Keys</string> - <string name="title_exportKey">Export Key</string> - <string name="title_exportKeys">Export Keys</string> - <string name="title_keyNotFound">Key Not Found</string> - <string name="title_keyServerQuery">Query Key Server</string> - <string name="title_sendKey">Export to Key Server</string> - <string name="title_unknownSignatureKey">Unknown Signature Key</string> - <string name="title_signKey">Sign Key</string> - <string name="title_about">About</string> + <string name="title_key_server_preference">Key Server Preference</string> + <string name="title_change_pass_phrase">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> + <string name="title_decrypt_to_file">Decrypt To File</string> + <string name="title_import_keys">Import Keys</string> + <string name="title_export_key">Export Key</string> + <string name="title_export_keys">Export Keys</string> + <string name="title_key_not_found">Key Not Found</string> + <string name="title_key_server_query">Query Key Server</string> + <string name="title_send_key">Export to Key Server</string> + <string name="title_unknown_signature_key">Unknown Signature Key</string> + <string name="title_sign_key">Sign Key</string> <string name="title_help">Help</string> - <string name="title_shareByNfc">Share key with NFC</string> + <string name="title_share_by_nfc">Share key with NFC</string> - <!-- section_lowerCase: capitalized words, no punctuation --> - <string name="section_userIds">User IDs</string> + <!-- section --> + <string name="section_user_ids">User IDs</string> <string name="section_keys">Keys</string> <string name="section_general">General</string> <string name="section_defaults">Defaults</string> <string name="section_advanced">Advanced</string> - <!-- btn_lowerCase: capitalized words, no punctuation --> - <string name="btn_signToClipboard">Sign (Clipboard)</string> - <string name="btn_encryptToClipboard">Encrypt to Clipboard</string> - <string name="btn_encryptAndSend">Encrypt and send…</string> - <string name="btn_signAndSend">Sign and send…</string> - <string name="btn_encrypt">Encrypt</string> + <!-- button --> + <string name="btn_sign_to_clipboard">Sign (Clipboard)</string> + <string name="btn_encrypt_to_clipboard">Encrypt to Clipboard</string> + <string name="btn_encrypt_and_send">Encrypt and send…</string> + <string name="btn_sign_and_send">Sign and send…</string> <string name="btn_sign">Sign</string> <string name="btn_decrypt">Decrypt</string> <string name="btn_verify">Verify</string> - <string name="btn_selectEncryptKeys">Select Recipients</string> - <string name="btn_reply">Reply</string> - <string name="btn_encryptMessage">Encrypt Message</string> - <string name="btn_decryptMessage">Decrypt Message</string> - <string name="btn_encryptFile">Encrypt File</string> - <string name="btn_decryptFile">Decrypt File</string> + <string name="btn_select_encrypt_keys">Select Recipients</string> + <string name="btn_encrypt_file">Encrypt File</string> <string name="btn_save">Save</string> - <string name="btn_doNotSave">Cancel</string> + <string name="btn_do_not_save">Cancel</string> <string name="btn_delete">Delete</string> - <string name="btn_noDate">None</string> + <string name="btn_no_date">None</string> <string name="btn_okay">Okay</string> - <string name="btn_clearFilter">Clear Filter</string> - <string name="btn_changePassPhrase">Change Passphrase</string> - <string name="btn_setPassPhrase">Set Passphrase</string> + <string name="btn_change_passphrase">Change Passphrase</string> + <string name="btn_set_passphrase">Set Passphrase</string> <string name="btn_search">Search</string> <string name="btn_export_to_server">Export To Server</string> <string name="btn_next">Next</string> <string name="btn_back">Back</string> - <!-- menu_lowerCase: capitalized words, no punctuation --> - <string name="menu_about">About</string> - <string name="menu_deleteAccount">Delete Account</string> - <string name="menu_managePublicKeys">Manage Public Keys</string> - <string name="menu_manageSecretKeys">Manage Secret Keys</string> + <!-- menu --> <string name="menu_preferences">Settings</string> - <string name="menu_apiAppSettings">Registered Apps</string> - <string name="menu_importFromFile">Import from file</string> - <string name="menu_importFromQrCode">Import from QR Code</string> - <string name="menu_importFromNfc">Import from NFC</string> - <string name="menu_exportKeys">Export all keys</string> - <string name="menu_exportKey">Export to file</string> - <string name="menu_deleteKey">Delete key</string> - <string name="menu_createKey">Create key</string> - <string name="menu_createKeyExpert">Create key (expert)</string> - <string name="menu_editKey">Edit key</string> + <string name="menu_api_app_settings">Registered Apps</string> + <string name="menu_import_from_file">Import from file</string> + <string name="menu_import_from_qr_code">Import from QR Code</string> + <string name="menu_import_from_nfc">Import from NFC</string> + <string name="menu_export_keys">Export all keys</string> + <string name="menu_export_key">Export to file</string> + <string name="menu_delete_key">Delete key</string> + <string name="menu_create_key">Create key</string> + <string name="menu_create_key_expert">Create key (expert)</string> + <string name="menu_edit_key">Edit key</string> <string name="menu_search">Search</string> - <string name="menu_help">Help</string> - <string name="menu_keyServer">Import from key server</string> - <string name="menu_updateKey">Update from server</string> - <string name="menu_exportKeyToServer">Export to server</string> + <string name="menu_key_server">Import from key server</string> + <string name="menu_update_key">Update from server</string> + <string name="menu_export_key_to_server">Export to server</string> <string name="menu_share">Share with…</string> - <string name="menu_shareQrCode">Share with QR Code</string> - <string name="menu_shareNfc">Share with NFC</string> - <string name="menu_scanQRCode">Scan QR Code</string> - <string name="menu_signKey">Sign key</string> - <string name="menu_BeamPreferences">Beam settings</string> + <string name="menu_share_qr_code">Share with QR Code</string> + <string name="menu_share_nfc">Share with NFC</string> + <string name="menu_sign_key">Sign key</string> + <string name="menu_beam_preferences">Beam settings</string> - <!-- label_lowerCase: capitalized words, no punctuation --> + <!-- label --> <string name="label_sign">Sign</string> <string name="label_message">Message</string> <string name="label_file">File</string> - <string name="label_noPassPhrase">No Passphrase</string> - <string name="label_passPhrase">Passphrase</string> - <string name="label_passPhraseAgain">Again</string> + <string name="label_no_passphrase">No Passphrase</string> + <string name="label_passphrase">Passphrase</string> + <string name="label_passphrase_again">Again</string> <string name="label_algorithm">Algorithm</string> - <string name="label_asciiArmour">ASCII Armor</string> - <string name="label_selectPublicKeys">Public Key(s)</string> - <string name="label_deleteAfterEncryption">Delete After Encryption</string> - <string name="label_deleteAfterDecryption">Delete After Decryption</string> - <string name="label_deleteAfterImport">Delete After Import</string> - <string name="label_encryptionAlgorithm">Encryption Algorithm</string> - <string name="label_hashAlgorithm">Hash Algorithm</string> + <string name="label_ascii_armor">ASCII Armor</string> + <string name="label_select_public_keys">Public Key(s)</string> + <string name="label_delete_after_encryption">Delete After Encryption</string> + <string name="label_delete_after_decryption">Delete After Decryption</string> + <string name="label_encryption_algorithm">Encryption Algorithm</string> + <string name="label_hash_algorithm">Hash Algorithm</string> <string name="label_asymmetric">Public Key</string> <string name="label_symmetric">Passphrase</string> - <string name="label_passPhraseCacheTtl">Passphrase Cache</string> - <string name="label_messageCompression">Message Compression</string> - <string name="label_fileCompression">File Compression</string> - <string name="label_forceV3Signature">Force V3 Signatures</string> - <string name="label_keyServers">Key Servers</string> - <string name="label_keyId">Key ID</string> + <string name="label_passphrase_cache_ttl">Passphrase Cache</string> + <string name="label_message_compression">Message Compression</string> + <string name="label_file_compression">File Compression</string> + <string name="label_force_v3_signature">Force V3 Signatures</string> + <string name="label_key_servers">Key Servers</string> + <string name="label_key_id">Key ID</string> <string name="label_creation">Creation</string> <string name="label_expiry">Expiry</string> <string name="label_usage">Usage</string> - <string name="label_keySize">Key Size</string> - <string name="label_mainUserId">Main User ID</string> + <string name="label_key_size">Key Size</string> + <string name="label_main_user_id">Main User ID</string> <string name="label_name">Name</string> <string name="label_comment">Comment</string> <string name="label_email">Email</string> - <string name="label_sendKey">Send Key to Server?</string> - <string name="noKeysSelected">Select</string> - <string name="oneKeySelected">1 Selected</string> - <string name="nKeysSelected">Selected</string> - <string name="unknownUserId"><unknown></string> + <string name="label_send_key">Send Key to Server?</string> + <string name="no_keys_selected">Select</string> + <string name="one_key_selected">1 Selected</string> + <string name="n_keys_selected">Selected</string> + <string name="unknown_user_id"><unknown></string> <string name="none"><none></string> - <string name="noKey"><no key></string> - <string name="noDate">-</string> - <string name="noExpiry"><no expiry></string> - <string name="unknownStatus"></string> - <string name="canEncrypt">can encrypt</string> - <string name="canSign">can sign</string> + <string name="no_key"><no key></string> + <string name="unknown_status"></string> + <string name="can_encrypt">can encrypt</string> + <string name="can_sign">can sign</string> <string name="expired">expired</string> - <string name="notValid">not valid</string> - <string name="nKeyServers">%s key server(s)</string> + <string name="n_key_servers">%s key server(s)</string> <string name="fingerprint">Fingerprint:</string> - <string name="secretKey">Secret Key:</string> + <string name="secret_key">Secret Key:</string> - <!-- choice_lowerCase: capitalized first word, no punctuation --> + <!-- choice --> <string name="choice_none">None</string> - <string name="choice_signOnly">Sign only</string> - <string name="choice_encryptOnly">Encrypt only</string> - <string name="choice_signAndEncrypt">Sign and Encrypt</string> + <string name="choice_sign_only">Sign only</string> + <string name="choice_encrypt_only">Encrypt only</string> + <string name="choice_sign_and_encrypt">Sign and Encrypt</string> <string name="choice_15secs">15 secs</string> <string name="choice_1min">1 min</string> <string name="choice_3mins">3 mins</string> @@ -177,148 +159,127 @@ <string name="choice_2hours">2 hours</string> <string name="choice_4hours">4 hours</string> <string name="choice_8hours">8 hours</string> - <string name="choice_untilQuit">until quit</string> - <string name="choice_language_system">System default</string> <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_titleOpen">Open…</string> - <string name="filemanager_titleSave">Save As…</string> - <string name="filemanager_titleEncrypt">Select File To Encrypt…</string> - <string name="filemanager_titleDecrypt">Select File To Decrypt…</string> - <string name="filemanager_btnOpen">Open</string> - <string name="filemanager_btnSave">Save</string> + <string name="filemanager_title_open">Open…</string> <string name="warning">Warning</string> <string name="error">Error</string> - <string name="warningMessage">Warning: %s</string> - <string name="errorMessage">Error: %s</string> + <string name="error_message">Error: %s</string> <!-- sentences --> - <string name="wrongPassPhrase">Wrong passphrase.</string> - <string name="usingClipboardContent">Using clipboard content.</string> - <string name="keySaved">Key saved.</string> - <string name="setAPassPhrase">Set a passphrase first.</string> - <string name="noFilemanagerInstalled">No compatible file manager installed.</string> - <string name="passPhrasesDoNotMatch">The passphrases didn\'t match.</string> - <string name="passPhraseMustNotBeEmpty">Empty passphrases are not allowed.</string> - <string name="passPhraseForSymmetricEncryption">Symmetric encryption.</string> - <string name="passPhraseFor">Enter passphrase for \'%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> - <string name="decryptionSuccessful">Successfully decrypted.</string> - <string name="encryptionSuccessful">Successfully encrypted.</string> - <string name="encryptionToClipboardSuccessful">Successfully encrypted to clipboard.</string> - <string name="enterPassPhraseTwice">Enter the passphrase twice.</string> - <string name="selectEncryptionKey">Select at least one encryption key.</string> - <string name="selectEncryptionOrSignatureKey">Select at least one encryption key or a signature key.</string> - <string name="specifyFileToEncryptTo">Please specify which file to encrypt to.\nWARNING! File will be overwritten if it exists.</string> - <string name="specifyFileToDecryptTo">Please specify which file to decrypt to.\nWARNING! File will be overwritten if it exists.</string> - <string name="specifyFileToImportFrom">Please specify which file to import keys from. (.asc or .gpg)</string> - <string name="specifyFileToExportTo">Please specify which file to export to.\nWARNING! File will be overwritten if it exists.</string> - <string name="specifyFileToExportSecretKeysTo">Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.</string> - <string name="keyDeletionConfirmation">Do you really want to delete the key \'%s\'?\nYou can\'t undo this!</string> - <string name="secretKeyDeletionConfirmation">Do you really want to delete the SECRET key \'%s\'?\nYou can\'t undo this!</string> - <string name="keysAddedAndUpdated">Successfully added %1$s key(s) and updated %2$s key(s).</string> - <string name="keysAdded">Successfully added %s key(s).</string> - <string name="keysUpdated">Successfully updated %s key(s).</string> - <string name="noKeysAddedOrUpdated">No keys added or updated.</string> - <string name="keyExported">Successfully exported 1 key.</string> - <string name="keysExported">Successfully exported %s keys.</string> - <string name="noKeysExported">No keys exported.</string> - <string name="keyCreationElGamalInfo">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string> - <string name="keyNotFound">Couldn\'t find key %08X.</string> - <string name="keysFound">Found %s key(s).</string> - <string name="unknownSignatureKeyTouchToLookUp">Unknown signature, touch to look up key.</string> - <string name="badKeysEncountered">%s bad secret key(s) ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</string> - <string name="lookupUnknownKey">Unknown key %s, do you want to try finding it on a keyserver?</string> - <string name="keySendSuccess">Successfully sent key to server</string> - <string name="keySignSuccess">Successfully signed key</string> - <string name="qrScanImportSuccess">Successfully validated and imported key</string> - <string name="listInformation">Long press one entry in this list to show more options!</string> - <string name="listEmpty">This list is empty!</string> - <string name="nfcSuccessfull">Successfully sent key with NFC Beam!</string> + <string name="wrong_passphrase">Wrong passphrase.</string> + <string name="using_clipboard_content">Using clipboard content.</string> + <string name="set_a_passphrase">Set a passphrase first.</string> + <string name="no_filemanager_installed">No compatible file manager installed.</string> + <string name="passphrases_do_not_match">The passphrases didn\'t match.</string> + <string name="passphrase_must_not_be_empty">Empty passphrases are not allowed.</string> + <string name="passphrase_for_symmetric_encryption">Symmetric encryption.</string> + <string name="passphrase_for">Enter passphrase for \'%s\'</string> + <string name="file_delete_confirmation">Are you sure you want to delete\n%s?</string> + <string name="file_delete_successful">Successfully deleted.</string> + <string name="no_file_selected">Select a file first.</string> + <string name="decryption_successful">Successfully decrypted.</string> + <string name="encryption_successful">Successfully encrypted.</string> + <string name="encryption_to_clipboard_successful">Successfully encrypted to clipboard.</string> + <string name="enter_passphrase_twice">Enter the passphrase twice.</string> + <string name="select_encryption_key">Select at least one encryption key.</string> + <string name="select_encryption_or_signature_key">Select at least one encryption key or a signature key.</string> + <string name="specify_file_to_encrypt_to">Please specify which file to encrypt to.\nWARNING! File will be overwritten if it exists.</string> + <string name="specify_file_to_decrypt_to">Please specify which file to decrypt to.\nWARNING! File will be overwritten if it exists.</string> + <string name="specify_file_to_export_to">Please specify which file to export to.\nWARNING! File will be overwritten if it exists.</string> + <string name="specify_file_to_export_secret_keys_to">Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.</string> + <string name="key_deletion_confirmation">Do you really want to delete the key \'%s\'?\nYou can\'t undo this!</string> + <string name="secret_key_deletion_confirmation">Do you really want to delete the SECRET key \'%s\'?\nYou can\'t undo this!</string> + <string name="keys_added_and_updated">Successfully added %1$s key(s) and updated %2$s key(s).</string> + <string name="keys_added">Successfully added %s key(s).</string> + <string name="keys_updated">Successfully updated %s key(s).</string> + <string name="no_keys_added_or_updated">No keys added or updated.</string> + <string name="key_exported">Successfully exported 1 key.</string> + <string name="keys_exported">Successfully exported %s keys.</string> + <string name="no_keys_exported">No keys exported.</string> + <string name="key_creation_el_gamal_info">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string> + <string name="key_not_found">Couldn\'t find key %08X.</string> + <string name="keys_found">Found %s key(s).</string> + <string name="unknown_signature_key_touch_to_look_up">Unknown signature, touch to look up key.</string> + <string name="bad_keys_encountered">%s bad secret key(s) ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</string> + <string name="lookup_unknown_key">Unknown key %s, do you want to try finding it on a keyserver?</string> + <string name="key_send_success">Successfully sent key to server</string> + <string name="key_sign_success">Successfully signed key</string> + <string name="list_information">Long press one entry in this list to show more options!</string> + <string name="list_empty">This list is empty!</string> + <string name="nfc_successfull">Successfully sent key with NFC Beam!</string> <!-- - error_lowerCase: phrases, no punctuation, all lowercase, - they will be put after "errorMessage", e.g. "Error: file not found" + errors + no punctuation, all lowercase, + they will be put after "error_message", e.g. "Error: file not found" --> - <string name="error_fileDeleteFailed">deleting \'%s\' failed</string> - <string name="error_fileNotFound">file not found</string> - <string name="error_noSecretKeyFound">no suitable secret key found</string> - <string name="error_noKnownEncryptionFound">no known kind of encryption found</string> - <string name="error_externalStorageNotReady">external storage not ready</string> - <string name="error_addingAccountFailed">adding account \'%s\' failed</string> - <string name="error_invalidEmail">invalid email \'%s\'</string> - <string name="error_keySizeMinimum512bit">key size must be at least 512bit</string> - <string name="error_masterKeyMustNotBeElGamal">the master key cannot be an ElGamal key</string> - <string name="error_unknownAlgorithmChoice">unknown algorithm choice</string> - <string name="error_userIdNeedsAName">you need to specify a name</string> - <string name="error_userIdNeedsAnEmailAddress">you need to specify an email address</string> - <string name="error_keyNeedsAUserId">need at least one user id</string> - <string name="error_mainUserIdMustNotBeEmpty">main user id must not be empty</string> - <string name="error_keyNeedsMasterKey">need at least a master key</string> - <string name="error_expiryMustComeAfterCreation">expiry date must come after creation date</string> - <string name="error_noEncryptionKeysOrPassPhrase">no encryption key(s) or passphrase given</string> - <string name="error_signatureFailed">signature failed</string> - <string name="error_noSignaturePassPhrase">no passphrase given</string> - <string name="error_noSignatureKey">no signature key given</string> - <string name="error_invalidData">not valid encryption data</string> - <string name="error_corruptData">corrupt data</string> - <string name="error_noSymmetricEncryptionPacket">couldn\'t find a packet with symmetric encryption</string> - <string name="error_wrongPassPhrase">wrong passphrase</string> - <string name="error_savingKeys">error saving some key(s)</string> - <string name="error_couldNotExtractPrivateKey">could not extract private key</string> - <string name="error_onlyFilesAreSupported">Direct binary data without actual file in filesystem is not supported. This is only supported by ACTION_ENCRYPT_STREAM_AND_RETURN.</string> - <string name="error_jellyBeanNeeded">You need Android 4.1 alias Jelly Bean to use Androids NFC Beam feature!</string> - <string name="error_nfcNeeded">NFC is not available on your device!</string> - <string name="error_nothingImport">Nothing to import!</string> + <string name="error_file_delete_failed">deleting \'%s\' failed</string> + <string name="error_file_not_found">file not found</string> + <string name="error_no_secret_key_found">no suitable secret key found</string> + <string name="error_no_known_encryption_found">no known kind of encryption found</string> + <string name="error_external_storage_not_ready">external storage not ready</string> + <string name="error_invalid_email">invalid email \'%s\'</string> + <string name="error_key_size_minimum512bit">key size must be at least 512bit</string> + <string name="error_master_key_must_not_be_el_gamal">the master key cannot be an ElGamal key</string> + <string name="error_unknown_algorithm_choice">unknown algorithm choice</string> + <string name="error_user_id_needs_a_name">you need to specify a name</string> + <string name="error_user_id_needs_an_email_address">you need to specify an email address</string> + <string name="error_key_needs_a_user_id">need at least one user id</string> + <string name="error_main_user_id_must_not_be_empty">main user id must not be empty</string> + <string name="error_key_needs_master_key">need at least a master key</string> + <string name="error_no_encryption_keys_or_passphrase">no encryption key(s) or passphrase given</string> + <string name="error_signature_failed">signature failed</string> + <string name="error_no_signature_passphrase">no passphrase given</string> + <string name="error_no_signature_key">no signature key given</string> + <string name="error_invalid_data">not valid encryption data</string> + <string name="error_corrupt_data">corrupt data</string> + <string name="error_no_symmetric_encryption_packet">couldn\'t find a packet with symmetric encryption</string> + <string name="error_wrong_passphrase">wrong passphrase</string> + <string name="error_saving_keys">error saving some key(s)</string> + <string name="error_could_not_extract_private_key">could not extract private key</string> + <string name="error_only_files_are_supported">Direct binary data without actual file in filesystem is not supported. This is only supported by ACTION_ENCRYPT_STREAM_AND_RETURN.</string> + <string name="error_jelly_bean_needed">You need Android 4.1 alias Jelly Bean to use Androids NFC Beam feature!</string> + <string name="error_nfc_needed">NFC is not available on your device!</string> + <string name="error_nothing_import">Nothing to import!</string> - <!-- progress_lowerCase: lowercase, phrases, usually ending in '…' --> + <!-- progress dialogs, usually ending in '…' --> <string name="progress_done">done.</string> - <string name="progress_initializing">initializing…</string> <string name="progress_saving">saving…</string> <string name="progress_importing">importing…</string> <string name="progress_exporting">exporting…</string> <string name="progress_generating">generating key, this can take a while…</string> - <string name="progress_buildingKey">building key…</string> - <string name="progress_preparingMasterKey">preparing master key…</string> - <string name="progress_certifyingMasterKey">certifying master key…</string> - <string name="progress_buildingMasterKeyRing">building master key ring…</string> - <string name="progress_addingSubKeys">adding sub keys…</string> - <string name="progress_savingKeyRing">saving key key…</string> - <string name="progress_importingSecretKeys">importing secret keys…</string> - <string name="progress_importingPublicKeys">importing public keys…</string> - <string name="progress_exportingKey">exporting key…</string> - <string name="progress_exportingKeys">exporting keys…</string> - <string name="progress_extractingSignatureKey">extracting signature key…</string> - <string name="progress_extractingKey">extracting key…</string> - <string name="progress_preparingStreams">preparing streams…</string> + <string name="progress_building_key">building key…</string> + <string name="progress_preparing_master_key">preparing master key…</string> + <string name="progress_certifying_master_key">certifying master key…</string> + <string name="progress_building_master_key">building master ring…</string> + <string name="progress_adding_sub_keys">adding sub keys…</string> + <string name="progress_saving_key_ring">saving key key…</string> + <string name="progress_importing_secret_keys">importing secret keys…</string> + <string name="progress_exporting_key">exporting key…</string> + <string name="progress_exporting_keys">exporting keys…</string> + <string name="progress_extracting_signature_key">extracting signature key…</string> + <string name="progress_extracting_key">extracting key…</string> + <string name="progress_preparing_streams">preparing streams…</string> <string name="progress_encrypting">encrypting data…</string> <string name="progress_decrypting">decrypting data…</string> - <string name="progress_preparingSignature">preparing signature…</string> - <string name="progress_generatingSignature">generating signature…</string> - <string name="progress_processingSignature">processing signature…</string> - <string name="progress_verifyingSignature">verifying signature…</string> + <string name="progress_preparing_signature">preparing signature…</string> + <string name="progress_generating_signature">generating signature…</string> + <string name="progress_processing_signature">processing signature…</string> + <string name="progress_verifying_signature">verifying signature…</string> <string name="progress_signing">signing…</string> - <string name="progress_readingData">reading data…</string> - <string name="progress_findingKey">finding key…</string> - <string name="progress_decompressingData">decompressing data…</string> - <string name="progress_verifyingIntegrity">verifying integrity…</string> - <string name="progress_deletingSecurely">deleting \'%s\' securely…</string> + <string name="progress_reading_data">reading data…</string> + <string name="progress_finding_key">finding key…</string> + <string name="progress_decompressing_data">decompressing data…</string> + <string name="progress_verifying_integrity">verifying integrity…</string> + <string name="progress_deleting_securely">deleting \'%s\' securely…</string> <string name="progress_querying">querying…</string> - <string name="progress_queryingServer">querying %s…</string> <!-- action strings --> - <string name="action_encrypt">Encrypt</string> - <string name="action_decrypt">Decrypt</string> - <string name="action_importPublic">Import Public Keys</string> - <string name="action_importSecret">Import Secret Keys</string> - <string name="hint_publicKeys">Search Public Keys</string> - <string name="hint_secretKeys">Search Secret Keys</string> - <string name="hint_query">Name, E-Mail or Key ID</string> - <string name="filterInfo">Filter: \"%s\"</string> - <string name="shareKeyringWith">Share Key with…</string> + <string name="hint_public_keys">Search Public Keys</string> + <string name="hint_secret_keys">Search Secret Keys</string> + <string name="action_share_key_with">Share Key with…</string> <!-- key bit length selections --> <string name="key_size_512">512</string> @@ -326,13 +287,9 @@ <string name="key_size_2048">2048</string> <string name="key_size_4096">4096</string> - <!-- misc --> - <string name="fast">fast</string> - <string name="slow">slow</string> - <string name="very_slow">very slow</string> - - <!-- OpenPGP Keychain (2.0) --> - + <!-- compression --> + <string name="compression_fast">fast</string> + <string name="compression_very_slow">very slow</string> <!-- Dashboard --> <string name="dashboard_manage_keys">Manage Public Keys</string> @@ -352,7 +309,6 @@ <!-- Import --> <string name="import_import">Import selected keys</string> <string name="import_sign_and_upload">Import, Sign, and upload selected keys</string> - <string name="import_finish">Finish</string> <string name="import_from_clipboard">Import from Clipboard</string> <string name="import_qr_code_missing">Missing QR Codes: %1$s</string> <string name="import_qr_code_wrong">QR Code malformed! Please try again!</string> 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 |
