cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-more

Browse Source
This commit is contained in:
mar-v-in
2014-06-22 16:45:07 +02:00
parent 79fb23b095 9f947aefe6
commit 9e7e0be82c
49 changed files with 1001 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/res/values/arrays.xml
View File

@@ -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>