aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-261-2/+2
| |\ | | | | | | | | | development
| * | Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-261-0/+1
| | | | | | | | | | | | Fixes #974
* | | Fixes from transifexDominik Schürmann2014-10-261-37/+37
| |/ |/|
* | Move some multi select items in overflow menu, rename importDominik Schürmann2014-10-261-2/+2
|/
* Remove empty layoutDominik Schürmann2014-10-251-5/+1
|
* shorter certification explanationVincent Breitmoser2014-10-251-1/+1
|
* more rewordingVincent Breitmoser2014-10-251-4/+4
|
* slightly change wording in merge logsVincent Breitmoser2014-10-251-2/+2
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-251-6/+1
|\ | | | | | | development
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-251-0/+10
| |\ | | | | | | | | | development
| * | Safe slinger activity prepsDominik Schürmann2014-10-251-6/+1
| | |
* | | change the way merging is loggedVincent Breitmoser2014-10-251-1/+5
| |/ |/|
* | more work on import loggingVincent Breitmoser2014-10-251-5/+5
| |
* | add logging to import and change order of import, keyservers firstVincent Breitmoser2014-10-251-0/+10
|/
* Qr code button textDominik Schürmann2014-10-241-1/+1
|
* reword sync messageTim Bray2014-10-221-1/+1
|
* Make the Certify screen a little more self-explanatoryTim Bray2014-10-211-3/+3
|
* Group passphrase cache settingsDominik Schürmann2014-10-131-1/+2
|
* wordingDominik Schürmann2014-10-131-3/+3
|
* Added option for num keypad for YubiKeyJerzy Kołosowski2014-10-131-0/+1
|
* rewrite export with new operation styleVincent Breitmoser2014-10-131-0/+24
|
* DeleteResult: add custom createNotifyVincent Breitmoser2014-10-111-0/+20
|
* move delete into operation classVincent Breitmoser2014-10-111-0/+18
|
* different wording in share tabVincent Breitmoser2014-10-101-1/+1
|
* Big error screen if signature is invalid or key is revoked/expired, also ↵Dominik Schürmann2014-10-081-0/+2
| | | | fixes signature status for expired and revoked keys
* Handle revoked and expired keys in decrypt activityDominik Schürmann2014-10-081-1/+3
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-081-1/+1
|\ | | | | | | development
| * slightly change text in certify dialogVincent Breitmoser2014-10-081-1/+1
| |
* | New decryption screen UI with modernPGP iconsDominik Schürmann2014-10-081-10/+11
|/
* Filter key list by certified keysDominik Schürmann2014-10-081-0/+2
|
* Fix MSG_MF_UID_PRIMARY logDominik Schürmann2014-10-071-1/+1
|
* Certify designDominik Schürmann2014-10-071-1/+1
|
* Certify designDominik Schürmann2014-10-071-4/+5
|
* multicertify: move key spinner to the bottomVincent Breitmoser2014-10-061-0/+1
|
* UI stuffDominik Schürmann2014-10-051-3/+0
|
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Vincent Breitmoser2014-10-051-1/+1
|\ | | | | | | | | | | | | into jacobshack-certify Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
| * preselect certify keyDominik Schürmann2014-10-051-1/+1
| |
* | more layout neatificationVincent Breitmoser2014-10-051-0/+1
|/
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Vincent Breitmoser2014-10-041-10/+24
|\ | | | | | | into jacobshack-certify
| * Workings on new parcel for key downloadsDominik Schürmann2014-10-041-10/+13
| |
| * Pass imported master key ids via result parcelDominik Schürmann2014-10-041-0/+11
| |
* | implement preliminary MultiCertifyActivity (most heavy lifting is done)Vincent Breitmoser2014-10-041-1/+1
| |
* | certify: get rid of fingerprint checkVincent Breitmoser2014-10-041-1/+0
|/ | | | | | Master key ids are unambiguous by database design, and only keys which are in the database are signed. There is no reason to check the fingerprint again during the certify operation.
* Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Vincent Breitmoser2014-10-041-0/+2
|\ | | | | | | into jacobshack-certify
| * Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵Dominik Schürmann2014-10-041-1/+19
| |\ | | | | | | | | | into jacobshack-certify
| * | New add keys activityDominik Schürmann2014-10-041-0/+2
| | |
* | | improve CertifyResult, add custom notifyVincent Breitmoser2014-10-041-5/+22
| |/ |/|
* | redesign certify action to work with parcel input and resultVincent Breitmoser2014-10-041-1/+19
|/
* Make app_name translatableDominik Schürmann2014-10-031-0/+2
|
* get rid of two consolidate number preferencesVincent Breitmoser2014-10-031-4/+1
|