diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
commit | 7dd5e2235339401b44eda13b124f3482472539d4 (patch) | |
tree | d7f1e6ad18a258e6467a75731ab44968fe005c9a /OpenKeychain/src/main/res/values-sl/strings.xml | |
parent | a2dcb579ff5d3565e7e6c6afe37878855361595b (diff) | |
parent | d4612b5e173455a24adbae2bfd4654ae065556cc (diff) | |
download | open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.gz open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.bz2 open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.zip |
Merge branch 'master' into backup-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
extern/openpgp-api-lib
Diffstat (limited to 'OpenKeychain/src/main/res/values-sl/strings.xml')
-rw-r--r-- | OpenKeychain/src/main/res/values-sl/strings.xml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml index 79b70f9f3..943add07f 100644 --- a/OpenKeychain/src/main/res/values-sl/strings.xml +++ b/OpenKeychain/src/main/res/values-sl/strings.xml @@ -139,19 +139,9 @@ <string name="choice_4hours">4 ure</string> <string name="choice_8hours">8 ur</string> <string name="choice_forever">za vedno</string> - <string name="dsa">DSA</string> - <string name="elgamal">ElGamal</string> - <string name="rsa">RSA</string> - <string name="ecdh">ECDH</string> - <string name="ecdsa">ECDSA</string> <string name="filemanager_title_open">Odpri...</string> <string name="error">Napaka</string> <string name="error_message">Napaka: %s</string> - <!--key flags--> - <string name="flag_certify">Overi</string> - <string name="flag_sign">Podpiši</string> - <string name="flag_encrypt">Šifriraj</string> - <string name="flag_authenticate">Preveri avtentičnost</string> <!--sentences--> <string name="no_filemanager_installed">Nimate nameščenega združljivega upravljalnika datotek.</string> <string name="pin_for">Vnesite PIN kodo za \'%s\'</string> @@ -473,7 +463,6 @@ <string name="edit_key_edit_user_id_revoked">Identiteta je bila preklicana. Ta poteza ne more biti razveljavljena.</string> <string name="edit_key_edit_subkey_title">Izberite dejanje!</string> <string name="edit_key_new_subkey">nov podključ</string> - <string name="edit_key_select_flag">Izberite vsaj eno oznako!</string> <string name="edit_key_error_add_identity">Dodajte vsaj eno identiteto!</string> <string name="edit_key_error_add_subkey">Dodajte vsaj en podključ!</string> <!--Create key--> @@ -742,12 +731,6 @@ <string name="msg_crt_warn_not_found">Ključ ni bil najden!</string> <string name="msg_crt_warn_cert_failed">Generacija potrdila ni uspela!</string> <!--Linked Identity verification--> - <plurals name="error_import_non_pgp_part"> - <item quantity="one">Del naložene datoteke je veljavnen objekt OpenPGP a ni ključ.</item> - <item quantity="two">Deli naložene datoteke so veljavni objekti OpenPGP a niso ključi.</item> - <item quantity="few">Deli naložene datoteke so veljavni objekti OpenPGP a niso ključi.</item> - <item quantity="other">Deli naložene datoteke so veljavni objekti OpenPGP a niso ključi.</item> - </plurals> <!--Messages for Keybase Verification operation--> <!--Messages for Mime parsing operation--> <!--PassphraseCache--> |