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-vi/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-vi/strings.xml')
-rw-r--r-- | OpenKeychain/src/main/res/values-vi/strings.xml | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/OpenKeychain/src/main/res/values-vi/strings.xml b/OpenKeychain/src/main/res/values-vi/strings.xml deleted file mode 100644 index 0713e39ad..000000000 --- a/OpenKeychain/src/main/res/values-vi/strings.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<resources> - <!--GENERAL: Please put all strings inside quotes as described in example 1 on - http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").--> - <!--title--> - <!--section--> - <!--button--> - <!--menu--> - <!--label--> - <!--Proxy Preferences--> - <!--proxy type choices and values--> - <!--OrbotHelper strings--> - <!--InstallDialogFragment strings--> - <!--StartOrbotDialogFragment strings--> - <!--choice--> - <!--key flags--> - <!--sentences--> - <!--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--> - <!--progress dialogs, usually ending in '…'--> - <!--action strings--> - <!--key bit length selections--> - <!--elliptic curve names--> - <!--not in for now, see SaveKeyringParcel - <string name="key_curve_bp_p256">"Brainpool P-256"</string> - <string name="key_curve_bp_p384">"Brainpool P-384"</string> - <string name="key_curve_bp_p512">"Brainpool P-512"</string>--> - <!--compression--> - <!--Help--> - <!--Import--> - <!--Import from URL--> - <!--Generic result toast--> - <!--Import result toast--> - <!--Delete result toast--> - <!--Certify result toast--> - <!--Intent labels--> - <!--Remote API--> - <!--Share--> - <!--Key list--> - <!--Key view--> - <!--Key trust--> - <!--keybase proof stuff--> - <!--Edit key--> - <!--Create key--> - <!--View key--> - <!--Add/Edit keyserver--> - <!--Navigation Drawer--> - <!--hints--> - <!--certs--> - <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !--> - <!--Import Public log entries--> - <!--Import Secret log entries--> - <!--Keyring Canonicalization log entries--> - <!--Keyring merging log entries--> - <!--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--> - <!--Messages for Keybase Verification operation--> - <!--Messages for Export Log operation--> - <!--PassphraseCache--> - <!--First Time--> - <!--unsorted--> - <!--Passphrase wizard--> - <!--TODO: rename all the things!--> - <!--<string name="enter_passphrase_twice">Enter password twice</string>--> - <!--<string name="nfc_text">Please place a NFC tag near your device</string>--> -</resources> |