diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
| commit | 3814ae7d53a22ba89f1e39d7a4661016f76cf8c8 (patch) | |
| tree | d83d41d3c424a784da144515665fb41ef650aa52 /OpenKeychain/src/main/res/values-et/strings.xml | |
| parent | dbaf7070ead596f5c70ad48fc55aada2f77a856a (diff) | |
| parent | d5dd6a49c8156a699b3fbbbeef06658e1c232c16 (diff) | |
| download | open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.gz open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.bz2 open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.zip | |
Merge branch 'master' into mime4j
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values-et/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values-et/strings.xml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml index 8a0481cac..7952c6ab0 100644 --- a/OpenKeychain/src/main/res/values-et/strings.xml +++ b/OpenKeychain/src/main/res/values-et/strings.xml @@ -6,8 +6,6 @@ <string name="title_decrypt">Dekrüpteeri</string> <string name="title_edit_key">Muuda võtit</string> <string name="title_import_keys">Impordi võtmeid</string> - <string name="title_export_key">Ekspordi võti</string> - <string name="title_export_keys">Ekspordi võtmed</string> <string name="title_key_not_found">Võtit ei leitud</string> <string name="title_send_key">Lae võtmeserverisse</string> <string name="title_help">Abi</string> @@ -32,6 +30,7 @@ <string name="label_name">Nimi</string> <string name="label_comment">Kommentaar</string> <string name="label_email">E-mail</string> + <!--label shown in Android settings under the OpenKeychain account--> <!--Proxy Preferences--> <!--proxy type choices and values--> <!--OrbotHelper strings--> @@ -80,10 +79,14 @@ <!--Generic result toast--> <!--Import result toast--> <!--Delete result toast--> + <!--Revoke result toast (snackbar)--> <!--Certify result toast--> <!--Intent labels--> <!--Remote API--> <!--Share--> + <!--retry upload dialog--> + <!--Delete or revoke private key dialog--> + <!--Delete Or Revoke Dialog spinner--> <!--Key list--> <!--Key view--> <!--Key trust--> @@ -113,8 +116,10 @@ <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> + <!--Keyserver sync--> <!--First Time--> <!--unsorted--> + <!--Android Account--> <!--Passphrase wizard--> <!--TODO: rename all the things!--> <!--<string name="enter_passphrase_twice">Enter password twice</string>--> |