aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-301-6/+8
|\
| * earlier error on empty clipboardVincent Breitmoser2015-06-301-0/+1
| |
| * Create key wizard for blank YubiKeyDominik Schürmann2015-06-291-3/+4
| |
| * cleanup share fragment, fix sharing of fingerprintVincent Breitmoser2015-06-291-1/+1
| |
| * Fix strings for transifexDominik Schürmann2015-06-291-2/+2
| |
* | migrated Keybase verificationAdithya Abraham Philip2015-06-271-0/+9
|/
* Language: Remember instead of cachingDominik Schürmann2015-06-261-8/+8
|
* Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-261-3/+6
|\
| * Notification: follow design guidelines, fix #1313Dominik Schürmann2015-06-241-3/+6
| |
* | fix original file deletion (and instrumentation)Vincent Breitmoser2015-06-231-1/+1
| |
* | implement deletion of filesVincent Breitmoser2015-06-231-5/+9
| |
* | implement saving of filesVincent Breitmoser2015-06-231-0/+2
| |
* | instrument: adapt to new decrypt file dialog, and some minor fixesVincent Breitmoser2015-06-231-1/+1
| |
* | move select file logic into EncryptDecryptOverviewFragmentVincent Breitmoser2015-06-221-4/+3
| |
* | don't expose dataset for FileAdapter in encrypt view, small improvements to ↵Vincent Breitmoser2015-06-221-1/+2
| | | | | | | | error handling
* | multi-decrypt: use indeterminate progress onlyVincent Breitmoser2015-06-221-0/+1
| |
* | drop clipboard backwards compatibility for api level < 11Vincent Breitmoser2015-06-201-1/+3
| |
* | more work on decrypt fragment uxVincent Breitmoser2015-06-201-0/+4
| |
* | handle empty filename in decrypt listVincent Breitmoser2015-06-191-0/+1
| |
* | handle EXTRA_TEXT in decrypt activityVincent Breitmoser2015-06-191-2/+3
| |
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-181-0/+1
|\|
| * more stable nullable behavior in OperationLogVincent Breitmoser2015-06-181-0/+1
| |
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-171-0/+1
|\|
| * fix rest of resource leaks (#1351)Vincent Breitmoser2015-06-171-0/+1
| |
* | Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-171-0/+11
|\| | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| * Merge pull request #1338 from josecastillo/developmentVincent2015-06-121-0/+11
| |\ | | | | | | Improved smart card error handling
| | * Replace AssertionErrors with snackbar notifications, fix style issues.Joey Castillo2015-06-111-8/+11
| | |
| | * Improved smart card error handlingJoey Castillo2015-06-101-0/+8
| | |
* | | WIP! Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-071-0/+1
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
| * | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-061-0/+1
| |/
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-061-0/+10
|\| | | | | | | | | | | | | | | | | this also fixes weird-bug Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java OpenKeychain/src/main/res/values/strings.xml
| * Merge branch 'v/sticky-prefs'Vincent Breitmoser2015-06-031-0/+8
| |\
| | * implement sticky preferencesVincent Breitmoser2015-05-311-0/+8
| | |
| * | prevent keybase key replacing keyserver keyAdithya Abraham Philip2015-05-311-0/+1
| |/
* / multi-decrypt: working context menuVincent Breitmoser2015-06-031-0/+1
|/
* prevent NaN dialog on import with no selected keysAdithya Abraham Philip2015-05-311-0/+1
|
* better error handling for bad encrypted data checksumVincent Breitmoser2015-05-301-0/+1
|
* warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-281-0/+1
|
* don't show allowed key list if no key exists, and some minor ↵Vincent Breitmoser2015-05-281-1/+1
| | | | PgpDecryptVerify changes
* Fix language based on feedback from transifexDominik Schürmann2015-05-211-1/+1
|
* Improve stringsDominik Schürmann2015-05-191-24/+24
|
* check fingerprint length after scanning qr codeVincent Breitmoser2015-05-171-1/+2
| | | | Fixes #1281
* apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-171-0/+3
|
* Moving blank smart card messages to strings.xmlJoey Castillo2015-05-131-0/+2
|
* Add check for exporting two keys to same smart card slot.Joey Castillo2015-05-131-0/+2
|
* Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-131-0/+3
|
* Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-121-0/+4
|
* Fix Bluetooth share without breaking othersWilliam Faulk2015-05-041-0/+1
|
* Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵Dominik Schürmann2015-05-041-0/+1
|\ | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Daniel Ramos2015-04-261-7/+8
| |\ | | | | | | | | | into development
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-21 23:30:42 +0000