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-09-071-0/+1
|\
| * add proper async check for correct passphrase to passphrasedialogVincent Breitmoser2014-09-071-0/+1
* | Two buttons to encrypt files and text, some fixesDominik Schürmann2014-09-071-1/+2
|/
* More UI reworkDominik Schürmann2014-09-071-7/+6
* Add experimental support for yubikey PINs, remove caching of empty passphrasesDominik Schürmann2014-09-051-0/+1
* Add yubikey default PIN preferenceDominik Schürmann2014-09-051-0/+2
* Fix stringsDominik Schürmann2014-09-021-2/+2
* Catch security exception, known problem...Dominik Schürmann2014-09-021-0/+1
* cache key s2k type in database, for later useVincent Breitmoser2014-09-021-3/+8
* split EncryptActivity into Encrypt{Text,File}ActivityVincent Breitmoser2014-09-011-2/+4
* remove "sign" and "verify" from drawer textsVincent Breitmoser2014-09-011-2/+2
* small ui changes in encryptVincent Breitmoser2014-09-011-3/+3
* remove "by holding..." explanation from button textVincent Breitmoser2014-09-011-1/+1
* Fix transifex linebreaks by adding apostrophs to strings with linebreaksDominik Schürmann2014-09-011-15/+15
* Prepare API for OpenPgpSignatureResult extensionsDominik Schürmann2014-08-311-3/+3
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-311-1/+6
|\
| * add cancel support to edit key actionVincent Breitmoser2014-08-311-1/+4
| * Add cancelable mechanism and support in key importVincent Breitmoser2014-08-311-0/+2
* | Better leyout for account settingsDominik Schürmann2014-08-311-0/+2
|/
* canonicalize: add check for algorithm typeVincent Breitmoser2014-08-301-2/+4
* Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-281-3/+23
|\
| * add ecc supportVincent Breitmoser2014-08-241-3/+21
| * Add ECDH and ECDSA valuesDominik Schürmann2014-08-211-0/+2
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-271-3/+5
|\ \
| * | small language fixes for previous commitVincent Breitmoser2014-08-271-3/+5
* | | Strip out duplicate user idsDominik Schürmann2014-08-271-1/+2
|/ /
* / Abort import of pubkeys where secret keys exist but new pubkey has more subke...Dominik Schürmann2014-08-271-0/+1
|/
* 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