diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-02 01:57:15 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-02 02:30:49 +0530 |
| commit | af3868d54715cdb09932caedd565a9e2778faf83 (patch) | |
| tree | c5b57f7df0478ae5018c969cc432c2d6c28a139e /OpenKeychain/src/main/res/values | |
| parent | 64a3cc5a9f232b8e3831bc1081982625e0e313ee (diff) | |
| download | open-keychain-af3868d54715cdb09932caedd565a9e2778faf83.tar.gz open-keychain-af3868d54715cdb09932caedd565a9e2778faf83.tar.bz2 open-keychain-af3868d54715cdb09932caedd565a9e2778faf83.zip | |
reworked keyserver preferences with recyclerview
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 12 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/styles.xml | 8 |
2 files changed, 18 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index a59b63800..619c67ee3 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -109,6 +109,8 @@ <string name="menu_certify_fingerprint">"Confirm via fingerprint comparison"</string> <string name="menu_export_log">"Export Log"</string> + <string name="menu_keyserver_add">"Add"</string> + <!-- label --> <string name="label_message">"Text"</string> <string name="label_file">"File"</string> @@ -153,13 +155,17 @@ <string name="label_send_key">"Synchronize with the cloud"</string> <string name="label_fingerprint">"Fingerprint"</string> <string name="expiry_date_dialog_title">"Set expiry date"</string> - <string name="label_first_keyserver_is_used">"(First keyserver listed is preferred)"</string> + <string name="label_keyservers_title">"Keyservers"</string> + <string name="label_keyserver_settings_hint">"Drag to change order, tap to edit/delete"</string> + <string name="label_selected_keyserver_title">"Selected keyserver"</string> <string name="label_preferred">"preferred"</string> <string name="label_enable_compression">"Enable compression"</string> <string name="label_encrypt_filenames">"Encrypt filenames"</string> <string name="label_hidden_recipients">"Hide recipients"</string> + <string name="label_verify_keyserver">"Verify keyserver"</string> <string name="label_enter_keyserver_url">"Enter keyserver URL"</string> + <string name="label_keyserver_dialog_delete">"Delete keyserver"</string> <string name="pref_keyserver">"OpenPGP keyservers"</string> <string name="pref_keyserver_summary">"Search keys on selected OpenPGP keyservers (HKP protocol)"</string> @@ -672,12 +678,14 @@ <string name="view_key_fragment_no_system_contact">"<none>"</string> - <!-- Add keyserver --> + <!-- Add/Edit keyserver --> <string name="add_keyserver_dialog_title">"Add keyserver"</string> + <string name="edit_keyserver_dialog_title">"Edit keyserver"</string> <string name="add_keyserver_verified">"Keyserver verified!"</string> <string name="add_keyserver_without_verification">"Keyserver added without verification."</string> <string name="add_keyserver_invalid_url">"Invalid URL!"</string> <string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your internet connection."</string> + <string name="keyserver_deleted">"%s deleted"</string> <!-- Navigation Drawer --> <string name="nav_keys">"Keys"</string> diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index 9ac60c397..c7b326b7a 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -26,4 +26,12 @@ <item name="android:textColor">@color/white</item> </style> + <!-- This style is for use with our drag and drop RecyclerView since ItemDecoration did not + move with the drag --> + <style name="Divider"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">2dp</item> + <item name="android:background">?android:attr/listDivider</item> + </style> + </resources>
\ No newline at end of file |