aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
* fix unit tests (for real)Vincent Breitmoser2015-03-201-2/+4
|
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-3/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
| * Manage my keys wizardDominik Schürmann2015-03-191-3/+5
| |
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-1/+2
| |
* | yubikey certifications!Vincent Breitmoser2015-03-181-1/+1
|/
* Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-161-0/+1
|
* Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-161-1/+2
|
* Improve file deletion stringsDominik Schürmann2015-03-121-3/+4
|
* Updated fix for Issue #1116Manoj Khanna2015-03-111-3/+4
|
* Pull from transifexDominik Schürmann2015-03-101-1/+1
|
* API 7Dominik Schürmann2015-03-101-1/+2
|
* Merge branch 'contact-card' of ↵Dominik Schürmann2015-03-101-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card Conflicts: Graphics/get-material-icons.sh OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java OpenKeychain/src/main/res/layout/create_key_email_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| * Show passphrase checkbox in create keyDominik Schürmann2015-03-101-0/+1
| |
| * Make create key wizard step-by-stepDominik Schürmann2015-03-101-2/+4
| |
| * added contact linkingAdithya Abraham Philip2015-03-101-0/+2
| |
| * added cardAdithya Abraham Philip2015-03-101-0/+1
| |
* | Add additional email addresses in create keyDominik Schürmann2015-03-101-1/+4
| |
* | Show passphrase checkbox in create keyDominik Schürmann2015-03-091-0/+1
| |
* | Make create key wizard step-by-stepDominik Schürmann2015-03-091-2/+4
|/
* Some fixes for delete after encryptionDominik Schürmann2015-03-091-2/+2
|
* Improve iconsDominik Schürmann2015-03-091-7/+7
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-091-2/+5
|\ | | | | | | development
| * add support for certification of user attributesVincent Breitmoser2015-03-081-2/+5
| |
* | Tryout design for encrypt, decryptDominik Schürmann2015-03-061-2/+4
|/
* Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-051-0/+2
|
* Remove advanced preferences, move compression as menu item in encrypt ↵Dominik Schürmann2015-03-051-0/+1
| | | | activites, select hash and encryption algo based on hardcoded preferred lists
* Design fixes for decryption screenDominik Schürmann2015-03-051-1/+1
|
* Rewording secret_key_deletion_confirmationDominik Schürmann2015-03-041-1/+1
|
* Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-041-0/+11
|\ | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-03-021-2/+1
| |\ | | | | | | | | | into development
| * | added logging, notify for log exportAdithya Abraham Philip2015-03-011-0/+7
| | |
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-281-15/+16
| |\ \ | | | | | | | | | | | | into development
| * \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-281-0/+58
| |\ \ \ | | | | | | | | | | | | | | | into development
| * \ \ \ merged dialogAdithya Abraham Philip2015-02-261-4/+16
| |\ \ \ \
| * | | | | initial Log Display functionAdithya Abraham Philip2015-02-261-0/+4
| | | | | |
* | | | | | Simplified language: Confirm keysDominik Schürmann2015-03-041-16/+15
| | | | | |
* | | | | | More simplification of delete stringsDominik Schürmann2015-03-041-1/+1
| | | | | |
* | | | | | Simplify certify stringsDominik Schürmann2015-03-041-11/+2
| | | | | |
* | | | | | Simplify dialogs according to Material DesignDominik Schürmann2015-03-041-4/+4
| | | | | |
* | | | | | Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-031-2/+3
| |_|_|_|/ |/| | | |
* | | | | Search string simplifiedDominik Schürmann2015-03-021-2/+1
| |_|_|/ |/| | |
* | | | Strings: File sizeDominik Schürmann2015-02-281-2/+2
| | | |
* | | | Fix strings based on transifex reportsDominik Schürmann2015-02-281-13/+13
| | | |
* | | | Keybase header textDominik Schürmann2015-02-271-0/+1
| |_|/ |/| |
* | | Merge keybase-proof branchDominik Schürmann2015-02-271-0/+58
|\ \ \ | |_|/ |/| |
| * | Check fingerprint match between proof & databaseTim Bray2014-11-221-0/+1
| | |
| * | Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-211-4/+5
| |\ \
| * | | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵Tim Bray2014-11-191-0/+1
| | | | | | | | | | | | | | | | gracefully. Fixes #1007 & #1008.
| * | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵Tim Bray2014-11-181-0/+1
| | | | | | | | | | | | | | | | rest. Also mention Keybase stuff other than Twitter/GitHub/Website
| * | | All keybase proofs now in placeTim Bray2014-11-111-0/+7
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 22:57:26 +0000