aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1835 from nmikhailov/check_security_tokenDominik Schürmann2016-04-161-0/+1
|\
| * Check if security token keys match required once before signing/decryptionNikita Mikhailov2016-04-161-0/+1
* | Fix stringDominik Schürmann2016-04-161-1/+1
|/
* Fix stringDominik Schürmann2016-04-131-1/+1
* Fix stringsDominik Schürmann2016-04-121-3/+3
* Merge pull request #1772 from runnerway/importkey-encryptedVincent2016-04-121-0/+1
|\
| * Handle encrypted files while importing keysAndrea Torlaschi2016-03-271-0/+1
* | Add missing keyholder string paramNikita Mikhailov2016-04-111-1/+1
* | Merge pull request #1808 from vhazali/warn-when-stripping-master-keyVincent2016-04-041-0/+3
|\ \
| * | Corrected warning messageVictor Hazali2016-04-011-1/+1
| * | Corrected capitalisation of subkeyVictor Hazali2016-03-301-2/+2
| * | Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripp...Victor Hazali2016-03-301-0/+3
| |\ \ | | |/ | |/|
| | * Alert for Stripping Subkeys.tdjogi010@gmail.com2016-03-021-0/+3
* | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptionsVincent2016-04-041-12/+17
|\ \ \ | |/ / |/| |
| * | Redesigned subkey creation dialog and changed default key type created to RSA...Alex Fong2016-04-011-12/+17
* | | Final commitAdvaita2016-03-231-0/+1
|/ /
* / Add missing 2 EUR selection for donationDominik Schürmann2016-03-031-0/+1
|/
* displaytext: add "View Log" option, move "Copy to clipboard" into overflow menuVincent Breitmoser2016-02-221-1/+1
* mime: try to decode with given charset or utf-8 while file is readVincent Breitmoser2016-02-221-0/+4
* Fix EUR symbolDominik Schürmann2016-02-101-8/+8
* Add donation fragmentDominik Schürmann2016-02-091-1/+10
* import: handle FileNotFoundException (fixes #1688)Vincent Breitmoser2016-02-011-10/+6
* Handle not installed PGP appletTheo Franzén2016-01-151-0/+9
* Lowercase ttl stringsDominik Schürmann2016-01-141-7/+7
* passphrasecache: update defaults, add "forever" settingVincent Breitmoser2016-01-111-1/+3
* Advanced screen, warning fragmentDominik Schürmann2016-01-111-7/+6
* Use more generic 'Security Token' where possible, add sutitle to create key w...Dominik Schürmann2016-01-101-54/+53
* inline-ttl: remove "default" settingVincent Breitmoser2016-01-061-2/+1
* inline-ttl: support "screen off" in preferenceVincent Breitmoser2016-01-061-5/+7
* inline-ttl: create ttl choice customization setting activityVincent Breitmoser2016-01-061-1/+11
* Filinked_empty stringDominik Schürmann2016-01-041-1/+1
* Add change password menu item to view keyDominik Schürmann2015-12-311-0/+1
* Improve linked identity handlingDominik Schürmann2015-12-311-1/+2
* Fix merge conflictsDominik Schürmann2015-12-271-2/+0
* inline-edit: move action mode menu handling int activityVincent Breitmoser2015-12-271-2/+1
* inline subkey editing (wip commit)Vincent Breitmoser2015-12-271-1/+4
* extend-uid: allow changes to user ids in edit modeVincent Breitmoser2015-12-271-0/+2
* extend-uid: add option icon for edit action modeVincent Breitmoser2015-12-271-0/+1
* Fix some strings thanks to Alain-OlivierDominik Schürmann2015-12-271-3/+3
* Improve how_to_importDominik Schürmann2015-12-221-1/+1
* Merge branch 'master' of https://github.com/TedaLIEz/open-keychain into TedaL...Dominik Schürmann2015-12-221-1/+1
|\
| * Issue #1595aLIEzTed2015-12-221-1/+1
* | Add hint to encrypt fieldDominik Schürmann2015-12-221-1/+1
* | added Facebook links support, reworked PreferencesAdithya Abraham Philip2015-12-061-0/+3
|/
* Fix strings, thanks to Alain-OlivierDominik Schürmann2015-11-231-26/+26
* Revert "Add first time wizard for sync settings"Dominik Schürmann2015-11-231-1/+1
* Add first time wizard for sync settingsDominik Schürmann2015-11-231-1/+1
* Show notification when READ_CONTACTS permission is denied in sync service, hi...Dominik Schürmann2015-11-231-0/+2
* Request contact permission in settings for contact linkingDominik Schürmann2015-11-231-4/+4
* Handle denied storage permission, use ContentResolver.SCHEME_FILE constantDominik Schürmann2015-11-191-0/+1