diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
| commit | e457d4c9097cb3f2e1c6305609cfacff1c5c38c2 (patch) | |
| tree | 9d6410b554b68aca6aa49539e045e9db5d703cbf /OpenKeychain/src/main/res/values-et | |
| parent | 9a3a032d99064cd16ca065a214d8f7fd09d54088 (diff) | |
| parent | 40751bceb586d12da671966c1ad5661223819c5b (diff) | |
| download | open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.gz open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.bz2 open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/res/values-de/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values-et')
| -rw-r--r-- | OpenKeychain/src/main/res/values-et/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml index dac1a5d46..be09f36de 100644 --- a/OpenKeychain/src/main/res/values-et/strings.xml +++ b/OpenKeychain/src/main/res/values-et/strings.xml @@ -103,6 +103,9 @@ <!--createSecretKeyRing--> <!--modifySecretKeyRing--> <!--Consolidate--> + <!--Other messages used in OperationLogs--> + <!--Messages for DecryptVerify operation--> + <!--Messages for SignEncrypt operation--> <!--PassphraseCache--> <!--unsorted--> <!--First Time--> |