aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Expand)AuthorAgeFilesLines
* More string fixes from transifexDominik Schürmann2016-05-201-1/+1
* Improve section_decryptDominik Schürmann2016-05-201-1/+1
* Improve label_keyserversDominik Schürmann2016-05-201-1/+1
* shorten pin preference stringVincent Breitmoser2016-05-171-1/+1
* update progress handling in PgpDecryptVerifyOperationVincent Breitmoser2016-05-111-1/+2
* Revert "Added warning dialog for importing keys"Dominik Schürmann2016-05-051-2/+0
* Slight amendments for clarityAlex Fong2016-05-051-1/+1
* Added warning dialog for importing keysAlex Fong2016-05-051-0/+2
* Removed unrequired code, standardized terms used.Alex Fong2016-05-051-1/+1
* (WIP) Change password when key is stripped #1692Alex Fong2016-05-041-0/+2
* Fix error codes for ykneo-openpgp 1.0.11Dominik Schürmann2016-04-301-3/+3
* Improve security_token_error_iso_dep_not_supportedDominik Schürmann2016-04-301-1/+1
* Merge pull request #1819 from 007durgesh219/Issue#1817Dominik Schürmann2016-04-291-0/+1
|\
| * Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-141-0/+1
* | Use proper ImportKeysProxyActivity to scan QR CodesDominik Schürmann2016-04-291-2/+2
* | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into Lub...Dominik Schürmann2016-04-291-0/+5
|\ \
| * | Unnecesary code removed and string repairedLubo Viluda2016-04-122-4/+3
| * | upgrade of Redirect import activityLubo Viluda2016-03-242-4/+5
| * | #1661 - Don't expose CertifyActivityLubo Viluda2016-03-202-0/+5
* | | Re-enable move-to-card option, improve stringsDominik Schürmann2016-04-291-7/+7
* | | Merge pull request #1831 from fiaxh/key_creation_flexibleDominik Schürmann2016-04-291-1/+2
|\ \ \
| * | | Handle user input on key creation more generouslyfiaxh2016-04-151-1/+2
* | | | Fix stringsDominik Schürmann2016-04-181-2/+2
* | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-04-181-0/+1
|\ \ \ \
| * \ \ \ 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 delete_failDominik Schürmann2016-04-181-1/+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 #1804 from vhazali/tint-linked-contact-picture-in-toolbarVincent2016-04-061-0/+1
|\ \ \
| * | | Used a constant instead of magic number for colourVictor Hazali2016-04-041-0/+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
|/ / /
* | / Make it a style to reduce code duplicationDominik Schürmann2016-03-081-1/+6
| |/ |/|
* | Add missing 2 EUR selection for donationDominik Schürmann2016-03-031-0/+1
|/
* Merge pull request #1727 from open-keychain/mime-fallbackVincent2016-02-231-1/+5
|\
| * 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
* | Remove AspectRatioImageViewunyoungwax2016-02-231-9/+0
|/
* Fix EUR symbolDominik Schürmann2016-02-101-8/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 12:34:53 +0000