diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:28:34 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:28:34 +0200 |
commit | 20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f (patch) | |
tree | 258667acf6ea0c995b47195492d453c7459b31ca /OpenKeychain/src/main/res/values | |
parent | 92ac2ded10548756922a4c22ebae0a19b8862426 (diff) | |
parent | 5c44f8400970de5943fd6c5e804dfa394f3deb01 (diff) | |
download | open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.tar.gz open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.tar.bz2 open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.zip |
Merge tag 'v3.2.1' into linked-identities
Version 3.2.1
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 19 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 7 |
2 files changed, 13 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 2c438370a..3de83f9d5 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -42,7 +42,7 @@ <!-- section --> <string name="section_user_ids">"Identities"</string> - <string name="section_yubikey">"Yubikey"</string> + <string name="section_yubikey">"YubiKey"</string> <string name="section_linked_system_contact">"Linked System Contact"</string> <string name="section_should_you_trust">"Should you trust this key?"</string> <string name="section_proof_details">Proof verification</string> @@ -138,7 +138,8 @@ <string name="label_file_compression">"File compression"</string> <string name="label_keyservers">"Keyservers"</string> <string name="label_key_id">"Key ID"</string> - <string name="label_creation">"Key created %s"</string> + <string name="label_key_created">"Key created %s"</string> + <string name="label_creation">"Creation"</string> <string name="label_expiry">"Expiry"</string> <string name="label_usage">"Usage"</string> <string name="label_key_size">"Key Size"</string> @@ -505,7 +506,7 @@ <string name="api_settings_delete_account">"Delete account"</string> <string name="api_settings_package_name">"Package Name"</string> <string name="api_settings_package_signature">"SHA-256 of Package Signature"</string> - <string name="api_settings_accounts">"Accounts (deprecated API)"</string> + <string name="api_settings_accounts">"Accounts (old API)"</string> <string name="api_settings_advanced">"Extended Information"</string> <string name="api_settings_allowed_keys">"Allowed Keys"</string> <string name="api_settings_settings">"Settings"</string> @@ -523,6 +524,7 @@ <string name="api_select_pub_keys_text_no_user_ids">"Please select the recipients!"</string> <string name="api_error_wrong_signature">"Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app's registration in OpenKeychain and then register the app again."</string> <string name="api_select_sign_key_text">"Please select one of your existing keys or create a new one."</string> + <string name="api_select_keys_text">"None of the allowed keys is able to decrypt the content. Please select the allowed keys."</string> <!-- Share --> <string name="share_qr_code_dialog_title">"Share with QR Code"</string> @@ -643,6 +645,7 @@ <string name="create_key_add_email">"Add email address"</string> <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string> <string name="create_key_email_already_exists_text">"Email address has already been added"</string> + <string name="create_key_email_invalid_email">"Email address format is invalid"</string> <!-- View key --> <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string> @@ -1302,13 +1305,15 @@ <string name="yubikey_serno">"Serial No: %s"</string> <string name="yubikey_key_holder">"Key holder: "</string> <string name="yubikey_key_holder_unset">"Key holder: <unset>"</string> - <string name="yubikey_status_bound">"Yubikey matches and is bound to key"</string> - <string name="yubikey_status_unbound">"Yubikey matches, can be bound to key"</string> - <string name="yubikey_status_partly">"Yubikey matches, partly bound to key"</string> + <string name="yubikey_status_bound">"YubiKey matches and is bound to key"</string> + <string name="yubikey_status_unbound">"YubiKey matches, can be bound to key"</string> + <string name="yubikey_status_partly">"YubiKey matches, partly bound to key"</string> + <string name="yubikey_create">"Hold YubiKey against the back of your device."</string> <string name="btn_import">"Import"</string> - <string name="snack_yubi_other">Different key stored on Yubikey!</string> + <string name="snack_yubi_other">Different key stored on YubiKey!</string> <string name="error_nfc">"NFC Error: %s"</string> <string name="error_pin_nodefault">Default PIN was rejected!</string> + <string name="error_bluetooth_file">Error creating temporary file. Bluetooth sharing will fail.</string> <string name="linked_create_https_1_1">"By creating a Linked Identity of this type, you can link your key to a website you control."</string> <string name="linked_create_https_1_2">"To do this, you publish a text file on this website, then create a Linked Identity which links to it."</string> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 96d09151d..6ac09c5d7 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -8,17 +8,12 @@ <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> + <!-- remove actionbar and title, we use toolbar! --> <item name="windowNoTitle">true</item> - <!-- remove actionbar, we use toolbar! --> <item name="windowActionBar">false</item> <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> <item name="windowActionModeOverlay">true</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> - - <!-- dark action bar... --> - <item name="theme">@style/ThemeOverlay.AppCompat.Dark</item> - <!-- ...but light popup menu (white background) --> - <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item> </style> <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html --> |