aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-201-1/+3
|\
| * move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-201-0/+1
| * consolidate: small ui thingsVincent Breitmoser2014-08-201-1/+2
* | improve certs_textDominik Schürmann2014-08-201-1/+1
|/
* modifyKey: small logging changesVincent Breitmoser2014-08-201-2/+2
* consolidate: prevent concurrent calls of step 2Vincent Breitmoser2014-08-201-1/+2
* consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-201-1/+1
* Fix stringsDominik Schürmann2014-08-191-4/+4
* consolidate: a lot more log output, better recoveryVincent Breitmoser2014-08-191-5/+23
* consolidate: split into two steps, can pick up at second step if anything failsVincent Breitmoser2014-08-191-0/+3
* Header for certs viewDominik Schürmann2014-08-191-0/+1
* Add subkey: at least one flag should be selected!Dominik Schürmann2014-08-181-0/+1
* consolidate: working implementation, lacking uiVincent Breitmoser2014-08-171-0/+15
* modify*Key: improve handling of passphrase modification (add tests, too)Vincent Breitmoser2014-08-161-1/+5
* typed expected failures and a couple minor thingsVincent Breitmoser2014-08-161-2/+2
* support for master key modifications, among other stuffVincent Breitmoser2014-08-161-1/+3
* modifySecretKey: err out on "use previous" expiry date for (sub)key creationVincent Breitmoser2014-08-161-0/+2
* modifySecretKey: err out on revocation of nonexistent user idVincent Breitmoser2014-08-161-0/+1
* API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pr...Dominik Schürmann2014-08-161-2/+3
* merge: check fingerprints on merge operation! (this needs a testcase!)Vincent Breitmoser2014-08-141-1/+1
* change keybase hint following pull request #755Dominik Schürmann2014-08-141-2/+2
* move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-141-1/+1
* Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-141-1/+2
* Remove support for v3 sig generationDominik Schürmann2014-08-141-1/+0
* Dont write version header by defaultDominik Schürmann2014-08-141-2/+2
* Add user info dialogDominik Schürmann2014-08-131-0/+8
* API: User interaction when account keys are deletedDominik Schürmann2014-08-131-0/+1
* Readd missing stringDominik Schürmann2014-08-071-0/+1
* Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-051-1/+1
* Increase maximum custom RSA sizeDominik Schürmann2014-08-051-1/+1
* Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ...Dominik Schürmann2014-08-051-1/+1
* More work on add subkey dialog designDominik Schürmann2014-08-051-1/+1
* Better handling of user id revocation in UI codeDominik Schürmann2014-08-051-0/+5
* Refactor expiry dialogDominik Schürmann2014-08-051-1/+1
* KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-051-1/+1
* Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-75/+0
* Even more smaller nitpicksDominik Schürmann2014-08-041-0/+1
* button language in encryptDominik Schürmann2014-08-041-2/+1
* Smaller UI fixesDominik Schürmann2014-08-041-2/+3
* Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-041-2/+10
|\
| * Minor cleanupmar-v-in2014-08-021-0/+1
| * Merge branch 'master' into improve-file-moremar-v-in2014-08-011-1/+1
| |\
| * \ Merge branch 'master' into improve-file-moremar-v-in2014-08-011-18/+18
| |\ \
| * | | Fix string resourcesmar-v-in2014-07-311-4/+5
| * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-311-11/+77
| |\ \ \
| * | | | - add multi select for storage api (kitkat)mar-v-in2014-07-311-0/+2
| * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-061-7/+20
| |\ \ \ \
| * | | | | Many changes to file ... and still incompletemar-v-in2014-07-061-0/+1
| * | | | | Encrypt/Decrypt UI workmar-v-in2014-07-021-0/+2
| * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-011-12/+26
| |\ \ \ \ \