aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
Commit message (Expand)AuthorAgeFilesLines
* even more linked id ui workVincent Breitmoser2015-03-291-0/+1
* more (subtle) ui workVincent Breitmoser2015-03-261-8/+8
* some linked id ui fine tuningVincent Breitmoser2015-03-261-1/+9
* secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-241-0/+9
* work on cookie scanning during creationVincent Breitmoser2015-03-241-0/+7
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-4/+8
|\
| * Manage my keys wizardDominik Schürmann2015-03-191-3/+5
| * 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
* | support github resource (re)Vincent Breitmoser2015-03-241-1/+10
* | support github resource (pa)Vincent Breitmoser2015-03-241-0/+3
* | work on certification uiVincent Breitmoser2015-03-151-6/+10
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-5/+8
|\|
| * 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
* | work on second step of identity creationVincent Breitmoser2015-03-131-14/+15
* | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-131-20/+18
* | remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+0
* | change finish button label to "link identity"Vincent Breitmoser2015-03-131-0/+1
* | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-101-1/+7
|\|
| * Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain...Dominik Schürmann2015-03-101-0/+3
| |\
| | * 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
* | | add expand item to linked id listVincent Breitmoser2015-03-101-0/+4
* | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-101-12/+17
|\| |
| * | 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 dev...Dominik Schürmann2015-03-091-2/+5
| |\
| * | Tryout design for encrypt, decryptDominik Schürmann2015-03-061-2/+4
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-081-3/+9
|\ \ \ | | |/ | |/|
| * | add support for certification of user attributesVincent Breitmoser2015-03-081-2/+5
| |/
| * 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 activit...Dominik Schürmann2015-03-051-0/+1
| * Design fixes for decryption screenDominik Schürmann2015-03-051-1/+1
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-30/+32
|\|
| * 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
| |\
| | * Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-03-021-2/+1
| | |\
| | * | 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
| | |\ \
| | * \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Adithya Abraham Philip2015-02-281-0/+58
| | |\ \ \
| | * \ \ \ merged dialogAdithya Abraham Philip2015-02-261-4/+16
| | |\ \ \ \
| | * | | | | initial Log Display functionAdithya Abraham Philip2015-02-261-0/+4