aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
* support github resource (pa)Vincent Breitmoser2015-03-241-0/+3
|
* work on certification uiVincent Breitmoser2015-03-151-6/+10
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-5/+8
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * Improve file deletion stringsDominik Schürmann2015-03-121-3/+4
| |
| * Updated fix for Issue #1116Manoj Khanna2015-03-111-3/+4
| |
| * Pull from transifexDominik Schürmann2015-03-101-1/+1
| |
| * API 7Dominik Schürmann2015-03-101-1/+2
| |
* | work on second step of identity creationVincent Breitmoser2015-03-131-14/+15
| |
* | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-131-20/+18
| |
* | remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+0
| |
* | change finish button label to "link identity"Vincent Breitmoser2015-03-131-0/+1
| |
* | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-101-1/+7
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * Merge branch 'contact-card' of ↵Dominik Schürmann2015-03-101-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card Conflicts: Graphics/get-material-icons.sh OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java OpenKeychain/src/main/res/layout/create_key_email_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| | * Show passphrase checkbox in create keyDominik Schürmann2015-03-101-0/+1
| | |
| | * Make create key wizard step-by-stepDominik Schürmann2015-03-101-2/+4
| | |
| | * added contact linkingAdithya Abraham Philip2015-03-101-0/+2
| | |
| | * added cardAdithya Abraham Philip2015-03-101-0/+1
| | |
| * | Add additional email addresses in create keyDominik Schürmann2015-03-101-1/+4
| | |
* | | add expand item to linked id listVincent Breitmoser2015-03-101-0/+4
| | |
* | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-101-12/+17
|\| |
| * | Show passphrase checkbox in create keyDominik Schürmann2015-03-091-0/+1
| | |
| * | Make create key wizard step-by-stepDominik Schürmann2015-03-091-2/+4
| |/
| * Some fixes for delete after encryptionDominik Schürmann2015-03-091-2/+2
| |
| * Improve iconsDominik Schürmann2015-03-091-7/+7
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-091-2/+5
| |\ | | | | | | | | | development
| * | Tryout design for encrypt, decryptDominik Schürmann2015-03-061-2/+4
| | |
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-081-3/+9
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | 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 ↵Dominik Schürmann2015-03-051-0/+1
| | | | | | | | activites, select hash and encryption algo based on hardcoded preferred lists
| * Design fixes for decryption screenDominik Schürmann2015-03-051-1/+1
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-30/+32
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * 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
| |\ | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| | * Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-03-021-2/+1
| | |\ | | | | | | | | | | | | into development
| | * | 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
| | |\ \ | | | | | | | | | | | | | | | into development
| | * \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-281-0/+58
| | |\ \ \ | | | | | | | | | | | | | | | | | | into development
| | * \ \ \ 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| * | | | | Search string simplifiedDominik Schürmann2015-03-021-2/+1
| | |_|_|/ | |/| | |
* | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-40/+144
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 19:31:22 +0000