aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/values/strings.xml
Commit message (Expand)AuthorAgeFilesLines
* confirm that empty IDs are really wantedAshley Hughes2014-04-021-0/+1
* Menu cleanupDominik Schürmann2014-04-011-2/+4
* languageDominik Schürmann2014-04-011-2/+2
* Language clarificationsDominik Schürmann2014-04-011-7/+8
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-011-0/+1
|\
| * don't disable save button, show message if nothing needs to be doneAshley Hughes2014-04-011-0/+1
* | Experimental work on a fragment-based encrypt activityDominik Schürmann2014-04-011-2/+0
|/
* More experimental work on decrypt fragmentsDominik Schürmann2014-03-301-0/+1
* merge masterAshley Hughes2014-03-291-5/+54
|\
| * Text for creation of new api accountsDominik Schürmann2014-03-261-0/+1
| * Part 2 of basic user interface for api accountsDominik Schürmann2014-03-261-0/+2
| * More experimental work on api accountsDominik Schürmann2014-03-251-0/+4
| * Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-211-0/+2
| |\
| | * Fix for #410Nikhil Peter Raj2014-03-211-0/+2
| * | UI-Icon-Modifying #429 added hint to text edit, different icons for share and...Daniel Hammann2014-03-201-0/+3
| |/
| * Note about blocked possibility to generate weak (<1024) RSA key.gogowitczak2014-03-181-0/+1
| * Merge pull request #431 from honnel/ui-modificationDominik Schürmann2014-03-181-2/+3
| |\
| | * #429 4)Daniel Hammann2014-03-171-2/+3
| * | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-181-0/+2
| |\ \
| | * | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-171-0/+1
| | * | certify: revamp certifykeyactivityVincent Breitmoser2014-03-151-0/+1
| | |/
| * / Fix export for new unified key list #409uberspot2014-03-151-0/+1
| |/
| * Add FAQ tab to helpDominik Schürmann2014-03-131-0/+1
| * Readd create key menu itemsDominik Schürmann2014-03-131-0/+1
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-131-2/+2
| |\
| | * Removing tabBhargav Golla2014-03-101-1/+1
| | * Removing unused stringBhargav Golla2014-03-101-1/+1
| | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-101-0/+2
| | |\
| | * | Lint changes after testingBhargav Golla2014-03-101-3/+3
| * | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-0/+11
| |\ \ \ | | |_|/ | |/| |
| | * | add contact count to My Keys headerVincent Breitmoser2014-03-081-0/+5
| | * | add edit button and secret key info to public key viewVincent Breitmoser2014-03-081-0/+4
| | * | move some placeholders into resourcesVincent Breitmoser2014-03-081-0/+2
| * | | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-101-0/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Added string reference for Issue #207Sreeram Boyapati2014-03-101-0/+2
| * | | Revert "Lint changes"Dominik Schürmann2014-03-101-2/+2
| * | | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-101-2/+2
| |\ \ \
| | * | | Lint changesBhargav Golla2014-03-101-2/+2
| | |/ /
| * | | remove double definition of progress_generatingDominik Schürmann2014-03-101-1/+0
| * | | Merge pull request #368 from ajit766/masterDominik Schürmann2014-03-091-0/+5
| |\ \ \
| | * | | progress bar while key creation - added plurals based on no.of keys while key...grait2014-03-091-1/+6
| | * | | progress bar during key creation - minor text changegrait2014-03-091-1/+1
| * | | | Issue #178 - Hide advanced options in EncryptActivityrafaelav2014-03-091-0/+2
| |/ / /
| * | | Merge pull request #316 from danielhass/import-errorDominik Schürmann2014-03-081-0/+6
| |\ \ \ | | |/ / | |/| |
| | * | Added handling for other exceptions in the ImportListLoader.Daniel Haß2014-03-031-0/+5
| | * | Added FileHasNoContent stringDaniel Haß2014-03-031-0/+1
| * | | move hardcode strings to strings.xmluberspot2014-03-071-0/+3
| * | | Add option for sharing encrypted file.Miroojin Bakshi2014-03-071-0/+2
* | | | keep up with masterAshley Hughes2014-03-071-5/+11
|\| | |
| * | | Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-061-1/+1
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 04:45:29 +0000