diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-14 23:46:06 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-15 00:18:50 +0100 |
| commit | a73e91c49c96f950bcd1892a738558cbbb523741 (patch) | |
| tree | cdeb775c08480323b8fd1e296b7d59beca59f45c /OpenPGP-Keychain/src/main/res/values/strings.xml | |
| parent | a9c9b6132c7b122f8155ce9fc6c21c89e5b8c298 (diff) | |
| parent | efab1d27ac7ffb9e39fe5acd8064c708dc588452 (diff) | |
| download | open-keychain-a73e91c49c96f950bcd1892a738558cbbb523741.tar.gz open-keychain-a73e91c49c96f950bcd1892a738558cbbb523741.tar.bz2 open-keychain-a73e91c49c96f950bcd1892a738558cbbb523741.zip | |
Merge branch 'master' into certs
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/values/strings.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index d2e02efcb..7461dbaf7 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -78,6 +78,7 @@ <string name="menu_import">Import</string> <string name="menu_import_from_nfc">Import from NFC</string> <string name="menu_export_keys">Export all keys</string> + <string name="menu_export_secret_keys">Export all secret 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> @@ -317,8 +318,8 @@ </plurals> <!-- progress dialogs, usually ending in '…' --> - <string name="progress_done">done.</string> - <string name="progress_cancel">cancel</string> + <string name="progress_done">Done.</string> + <string name="progress_cancel">Cancel</string> <string name="progress_saving">saving…</string> <string name="progress_importing">importing…</string> <string name="progress_exporting">exporting…</string> @@ -373,6 +374,7 @@ <!-- Help --> <string name="help_tab_start">Start</string> + <string name="help_tab_faq">FAQ</string> <string name="help_tab_nfc_beam">NFC Beam</string> <string name="help_tab_changelog">Changelog</string> <string name="help_tab_about">About</string> |