diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-22 16:45:07 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-22 16:45:07 +0200 |
| commit | 9e7e0be82cafc6dc98bbc31099ce0efc36a789a0 (patch) | |
| tree | 1a3fa3971d953b1bd8a57479e216ad01e153868a /OpenKeychain/src/main/res/values | |
| parent | 79fb23b095fba273d77066204ee44d2b8d1edf8d (diff) | |
| parent | 9f947aefe63055045b4dfa7087b858f8f3d2987e (diff) | |
| download | open-keychain-9e7e0be82cafc6dc98bbc31099ce0efc36a789a0.tar.gz open-keychain-9e7e0be82cafc6dc98bbc31099ce0efc36a789a0.tar.bz2 open-keychain-9e7e0be82cafc6dc98bbc31099ce0efc36a789a0.zip | |
Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-more
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/arrays.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml index 699c02aff..44bbe00cc 100644 --- a/OpenKeychain/src/main/res/values/arrays.xml +++ b/OpenKeychain/src/main/res/values/arrays.xml @@ -48,13 +48,5 @@ <item>@string/key_size_1024</item> <item>@string/key_size_custom</item> </string-array> - <string-array name="import_action_list" translatable="false"> - <item>@string/menu_import_from_key_server</item> - <item>@string/menu_import_from_file</item> - <item>@string/menu_import_from_qr_code</item> - <item>@string/import_from_clipboard</item> - <item>@string/menu_import_from_nfc</item> - <item>@string/menu_import_from_keybase</item> - </string-array> </resources> |