diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 13:09:27 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 13:09:27 +0100 |
| commit | 9e663237b6dc4880bcdb1c763374c44f9f4416d2 (patch) | |
| tree | 3c317cf8a9e320db0b6ff5c451b82e7b32014627 /OpenKeychain/src/main/res/values-sr | |
| parent | 2223cdd4056341576a540b065bcb34a1e579b141 (diff) | |
| parent | ccde6add70ea9b5c559910d42dfb2e0bf79f5989 (diff) | |
| download | open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.tar.gz open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.tar.bz2 open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values-sr')
| -rw-r--r-- | OpenKeychain/src/main/res/values-sr/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index 31ed39440..5ba833972 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -9,7 +9,7 @@ <string name="title_encrypt_text">Шифруј текст</string> <string name="title_encrypt_files">Шифруј фајлове</string> <string name="title_decrypt">Дешифруј</string> - <string name="title_authentication">Лозинка</string> + <string name="title_unlock">Лозинка</string> <string name="title_add_subkey">Додај поткључ</string> <string name="title_edit_key">Уреди кључ</string> <string name="title_preferences">Поставке</string> @@ -191,7 +191,7 @@ <string name="passphrase_must_not_be_empty">Унесите лозинку.</string> <string name="passphrase_for_symmetric_encryption">Симетрично шифровање.</string> <string name="passphrase_for">Унесите лозинку за „%s“</string> - <string name="yubikey_pin">Унесите ПИН за приступ Јубикључу за „%s“</string> + <string name="yubikey_pin_for">Унесите ПИН за приступ Јубикључу за „%s“</string> <string name="file_delete_confirmation">Желите ли заиста да обришете\n%s?</string> <string name="file_delete_successful">Брисање је успело.</string> <string name="no_file_selected">Најпре изаберите фајл.</string> |