aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | 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
| | |_|_|_|/ | |/| | | |
* | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-0/+1
* | | | | | add linked it to view key context menuVincent Breitmoser2015-03-021-1/+2
* | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-2/+1
|\| | | | |
| * | | | | Search string simplifiedDominik Schürmann2015-03-021-2/+1
| | |_|_|/ | |/| | |
* | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-40/+144
|\| | | |
| * | | | 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 grace...Tim Bray2014-11-191-0/+1
| | * | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ...Tim Bray2014-11-181-0/+1
| | * | | All keybase proofs now in placeTim Bray2014-11-111-0/+7
| | * | | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-0/+48
| * | | | Fingerprint verification, design fixes for qr code cardDominik Schürmann2015-02-261-0/+5
| * | | | Dont show verification icons in my key view, hide edit button for non-secret ...Dominik Schürmann2015-02-251-1/+3
| * | | | CardView and more header designDominik Schürmann2015-02-251-0/+1
| * | | | First work on new key view toolbarDominik Schürmann2015-02-251-2/+5
| * | | | Refactor AppsListFragmentDominik Schürmann2015-02-231-1/+0
| * | | | move a string in the safe slinger activity to resourcesŁukasz Stelmach2015-02-211-0/+1
| * | | | determine correct filesize during decryption from LiteralData packetVincent Breitmoser2015-02-171-0/+1
| | |_|/ | |/| |
| * | | Move encrypt decrypt operations in own starter activityDominik Schürmann2015-02-031-4/+6
| * | | Toolbar fixes, Toolbar under status bar on LollipopDominik Schürmann2015-02-031-1/+2
| * | | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-23/+37
| * | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-311-0/+1
| |\ \ \
| | * | | Saving of allowed keysDominik Schürmann2015-01-291-0/+1
| * | | | prevent recursive consolidateVincent Breitmoser2015-01-311-0/+1
| |/ / /
| * | | Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-291-1/+1
| |\ \ \
| | * | | use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-191-1/+1
| * | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-271-0/+2
| |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 19:20:01 +0000