diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-19 02:02:51 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-19 02:02:51 +0200 |
| commit | 3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd (patch) | |
| tree | d8d7ad9ea2b8fac8c988ec38885d4645242c5168 /OpenPGP-Keychain/res/values | |
| parent | 4c461c1b445eb339382b5ffd174e6d19b93f25d0 (diff) | |
| download | open-keychain-3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd.tar.gz open-keychain-3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd.tar.bz2 open-keychain-3c4cb1c2d31ff472dc09d4f71f3f5e9af7547cdd.zip | |
Work on new Import activity
Diffstat (limited to 'OpenPGP-Keychain/res/values')
| -rw-r--r-- | OpenPGP-Keychain/res/values/arrays.xml | 7 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/values/strings.xml | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/res/values/arrays.xml b/OpenPGP-Keychain/res/values/arrays.xml index 950a70821..dc9de0f38 100644 --- a/OpenPGP-Keychain/res/values/arrays.xml +++ b/OpenPGP-Keychain/res/values/arrays.xml @@ -49,4 +49,11 @@ <item>@string/key_size_2048</item> <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_importFromNfc</item> + </string-array> + </resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index 06d51b6e7..5975665e9 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -346,10 +346,10 @@ <string name="help_tab_about">About</string> <string name="help_about_version">Version:</string> - <!-- Import from QR Code --> - <string name="import_from_qr_code_import">Import key(s) (only locally)</string> - <string name="import_from_qr_code_import_sign_and_upload">Import, Sign, and upload key(s)</string> - <string name="import_from_qr_code_finish">Finish</string> + <!-- Import --> + <string name="import_import">Import key(s) (only locally)</string> + <string name="import_sign_and_upload">Import, Sign, and upload key(s)</string> + <string name="import_finish">Finish</string> <!-- Intent labels --> <string name="intent_decrypt_file">OpenPGP: Decrypt File</string> |