diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 14:39:28 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 14:39:28 +0100 |
| commit | 2f83291920e024b0f8038fe0caa747051b41cf1c (patch) | |
| tree | 780fc0975e56b3dbd8a1eb4cb2988ac3e2e23ea1 /OpenKeychain/src/main/res/values-pt/strings.xml | |
| parent | aa22a0defcf94d5f734d3a00288f5c8d916d2e57 (diff) | |
| parent | 4e29d027af05fc574dc5398d2fb3afcdf3defc70 (diff) | |
| download | open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.tar.gz open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.tar.bz2 open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.zip | |
NON-WORKING Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
OpenKeychain/src/main/res/values/strings.xml
extern/spongycastle
Diffstat (limited to 'OpenKeychain/src/main/res/values-pt/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values-pt/strings.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values-pt/strings.xml b/OpenKeychain/src/main/res/values-pt/strings.xml index 460c5462e..233347bd3 100644 --- a/OpenKeychain/src/main/res/values-pt/strings.xml +++ b/OpenKeychain/src/main/res/values-pt/strings.xml @@ -36,6 +36,8 @@ <!--Share--> <!--Key list--> <!--Key view--> + <!--Key trust--> + <!--keybase proof stuff--> <!--Edit key--> <!--Create key--> <!--View key--> @@ -50,10 +52,18 @@ <!--createSecretKeyRing--> <!--modifySecretKeyRing--> <!--Consolidate--> + <!--Edit Key (higher level than modify)--> + <!--Promote key--> <!--Other messages used in OperationLogs--> <!--Messages for DecryptVerify operation--> + <!--Messages for VerifySignedLiteralData operation--> <!--Messages for SignEncrypt operation--> + <!--Messages for PgpSignEncrypt operation--> <!--PassphraseCache--> - <!--unsorted--> <!--First Time--> + <!--unsorted--> + <!--Passphrase wizard--> + <!--TODO: rename all the things!--> + <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>--> + <!--<string name="nfc_text">Please place a NFC tag near your device</string>--> </resources> |