Commit Graph

63 Commits

Author SHA1 Message Date
Dominik Schürmann
bac5ce62fe Update from transifex 2018-04-18 15:37:14 +02:00
Dominik Schürmann
22e629f707 Pull from transifex 2017-11-28 19:39:51 +01:00
Dominik Schürmann
5c0baefd43 Pull from transifex 2017-07-26 12:22:18 +02:00
Dominik Schürmann
8c0b014f08 Pull from transifex 2017-04-25 23:55:50 +03:00
klemens
bae6391dc0 spelling fixes 2017-01-14 11:38:05 +01:00
Dominik Schürmann
4d551c5c1a Pull from transifex 2016-12-05 13:55:00 +01:00
Andrea Torlaschi
ebe7b6293d ImportKeys: Add creation date and more check on keys's data 2016-08-19 22:35:54 +02:00
Dominik Schürmann
af15e87477 New translations from transifex 2016-04-29 12:49:54 +02:00
Dominik Schürmann
7d3b903690 Transifex: pt_BR 2016-03-03 13:31:46 +01:00
Dominik Schürmann
5f0b07773e Pull from transifex 2016-01-11 08:40:01 +01:00
Dominik Schürmann
0fd5b45df9 Use more generic 'Security Token' where possible, add sutitle to create key what tokens are supported 2016-01-10 17:17:57 +01:00
Vincent Breitmoser
00e97586b0 inline subkey editing (wip commit) 2015-12-27 15:00:14 +01:00
Dominik Schürmann
298043f708 Pull from transifex 2015-11-23 23:54:04 +01:00
Dominik Schürmann
65c402fbe0 Pull from transifex 2015-10-26 19:09:30 +01:00
Dominik Schürmann
69376a489e Update from transifex 2015-10-21 22:49:49 +02:00
Dominik Schürmann
588e84d4b1 Pull from transifex 2015-08-25 19:14:13 +02:00
Dominik Schürmann
cc2e83c523 Pull from transifex 2015-08-17 13:14:28 +02:00
Vincent Breitmoser
20cebc2788 change wording of export dialog, remove "export secret" checkbox 2015-07-08 17:25:07 +02:00
Dominik Schürmann
e66794969e Package cert not sig 2015-07-07 22:15:15 +02:00
Dominik Schürmann
e172f132e4 Pull from transifex 2015-07-06 16:57:49 +02:00
Dominik Schürmann
a8efe3a12e Update from transifex 2015-06-30 13:35:22 +02:00
Vincent Breitmoser
f9dea31300 implement deletion of files 2015-06-23 17:07:59 +02:00
Vincent Breitmoser
5f91c57b4a don't expose dataset for FileAdapter in encrypt view, small improvements to error handling 2015-06-22 15:44:15 +02:00
Joey Castillo
76241e90ad Adding NFC Key to Card operation, accessible from Edit Key activity. 2015-05-12 14:44:26 -04:00
Dominik Schürmann
a545d50f4b Pull from transifex 2015-04-14 00:40:28 +02:00
Dominik Schürmann
e2f27d0f47 Pull from transifex 2015-03-23 15:54:48 +01:00
Dominik Schürmann
98817d13ee Manage my keys wizard 2015-03-19 17:16:23 +01:00
Manoj Khanna
bb018b8fc1 Updated fix for Issue #1116 2015-03-11 20:52:00 +05:30
Dominik Schürmann
58d066a54e Pull from transifex 2015-03-10 16:19:46 +01:00
Dominik Schürmann
453b67f7a8 Update from transifex 2015-02-28 00:38:53 +01:00
Dominik Schürmann
df7009669b Pull from transifex 2015-02-22 21:39:34 +01:00
Vincent Breitmoser
7223abcf0c extend canonicalize to strip local certificates on export 2015-01-02 00:07:05 +01:00
Vincent Breitmoser
9e663237b6 Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/res/values/strings.xml
2014-12-30 13:09:27 +01:00
Vincent Breitmoser
c7b0b650c1 introduce handling of notation direct key signatures, and experimental pin notation packet 2014-12-30 00:44:12 +01:00
Dominik Schürmann
610c4780f1 New work on PIN and lock pattern UI 2014-12-29 23:16:54 +01:00
Dominik Schürmann
f3da3b31e5 Pull from transifex 2014-11-02 17:54:10 +01:00
Dominik Schürmann
f4d0e5250b Pull from transifex 2014-10-30 12:52:33 +01:00
Dominik Schürmann
5f20abdb26 Pull from transifex 2014-10-26 23:23:30 +01:00
Dominik Schürmann
2eb776594f Handle revoked and expired keys in decrypt activity 2014-10-08 17:39:53 +02:00
Dominik Schürmann
b573afe235 New decryption screen UI with modernPGP icons 2014-10-08 17:32:32 +02:00
Vincent Breitmoser
d004bf236b improve CertifyResult, add custom notify 2014-10-04 16:01:24 +02:00
Dominik Schürmann
13cd1daaaa Pull from transifex 2014-10-03 18:37:56 +02:00
Dominik Schürmann
8b663add04 Pull from transifex 2014-09-24 15:41:00 +02:00
Vincent Breitmoser
e457d4c909 Merge remote-tracking branch 'origin/master'
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/res/values-de/strings.xml
2014-09-15 14:00:17 +02:00
Vincent Breitmoser
9a3a032d99 move LogLevel info into LogType enum 2014-09-15 13:59:21 +02:00
Dominik Schürmann
40751bceb5 Pull from transifex 2014-09-15 10:44:36 +02:00
Dominik Schürmann
980674b322 Pull from transifex 2014-09-08 14:26:10 +02:00
Dominik Schürmann
fe2c17cdeb Pull from transifex 2014-09-02 14:11:10 +02:00
Dominik Schürmann
70426041df Pull from transifex 2014-08-20 11:09:41 +02:00
Vincent Breitmoser
de0d95432e typed expected failures and a couple minor things 2014-08-16 06:53:50 +02:00