diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 13:57:56 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 13:57:56 +0200 |
| commit | a4b7daf266b037c6a39cef0586aadedf32861ad5 (patch) | |
| tree | 8446f6aae86530a8546caa99af6f9bac4f095370 /OpenKeychain/src/main/res/values-et/strings.xml | |
| parent | d27925ad19b6800658a69670ceaed261776ba6d3 (diff) | |
| parent | dcaac4f85f07efff2fdfd8a2eec9ba8ee758659c (diff) | |
| download | open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.tar.gz open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.tar.bz2 open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/values-et/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values-et/strings.xml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml index f67ffb328..15b0c6c1e 100644 --- a/OpenKeychain/src/main/res/values-et/strings.xml +++ b/OpenKeychain/src/main/res/values-et/strings.xml @@ -61,11 +61,9 @@ <string name="wrong_passphrase">Vale salasõne</string> <string name="passphrases_do_not_match">Salasõned ei ühti.</string> <string name="passphrase_for_symmetric_encryption">Sümmeetriline krüpteering</string> - <string name="file_delete_successful"></string> - <string name="file_delete_confirmation"></string> - <!--errors - no punctuation, all lowercase, - they will be put after "error_message", e.g. "Error: file not found"--> + <!--errors + no punctuation, all lowercase, + they will be put after "error_message", e.g. "Error: file not found"--> <!--errors without preceeding Error:--> <!--results shown after decryption/verification--> <!--Add keys--> |