diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
| commit | 881a50207af0a9f9f5aa69f451110de786779b54 (patch) | |
| tree | 776bf4363c3e8736c3678eba93017387fffd8463 /OpenKeychain/src/main/res/values-sk/strings.xml | |
| parent | 0bfac9989f801aa93d8bc336307d60b817995688 (diff) | |
| parent | 6ba7536838b8fbc69684bec7c3e847afcb5e9d6a (diff) | |
| download | open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.gz open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.bz2 open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
extern/openpgp-api-lib
settings.gradle
Diffstat (limited to 'OpenKeychain/src/main/res/values-sk/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values-sk/strings.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values-sk/strings.xml b/OpenKeychain/src/main/res/values-sk/strings.xml index 593fc2d11..4cf33460a 100644 --- a/OpenKeychain/src/main/res/values-sk/strings.xml +++ b/OpenKeychain/src/main/res/values-sk/strings.xml @@ -25,6 +25,9 @@ <!--Share--> <!--Key list--> <!--Key view--> + <!--Edit key--> + <!--Create key--> + <!--View key--> <!--Navigation Drawer--> <!--hints--> <!--certs--> @@ -32,6 +35,9 @@ <!--Import Secret log entries--> <!--Keyring Canonicalization log entries--> <!--Keyring merging log entries--> + <!--createSecretKeyRing--> <!--modifySecretKeyRing--> + <!--PassphraseCache--> <!--unsorted--> + <!--First Time--> </resources> |