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 |
|
Dominik Schürmann
|
05da0f4328
|
change keybase hint following pull request #755
|
2014-08-14 16:20:24 +02:00 |
|
Dominik Schürmann
|
d4105420f7
|
Pull from transifex
|
2014-08-07 10:01:57 +02:00 |
|
Dominik Schürmann
|
f5f6102458
|
Pull from transifex
|
2014-08-04 16:33:05 +02:00 |
|
Dominik Schürmann
|
80f9c769c0
|
Keyserver exception translateable
|
2014-07-31 19:05:09 +02:00 |
|
Dominik Schürmann
|
9e56e53cf1
|
Pull from transifex
|
2014-07-03 16:30:41 +02:00 |
|
Vincent Breitmoser
|
f38556cab1
|
import-log: switch to flags instead of statuses for result int
|
2014-06-10 16:24:04 +02:00 |
|
Dominik Schürmann
|
6d1369be56
|
Pull from transifex
|
2014-05-31 20:49:56 +02:00 |
|
Dominik Schürmann
|
5c747a747f
|
Update from transifex
|
2014-05-08 11:30:16 +02:00 |
|
Dominik Schürmann
|
2481b6e660
|
Pull translations from transifex
|
2014-05-07 09:31:01 +02:00 |
|
Dominik Schürmann
|
b405c1d664
|
Pull translations from transifex
|
2014-05-07 09:13:32 +02:00 |
|
Dominik Schürmann
|
e97cdbd9ad
|
Clarify language
|
2014-05-06 23:16:08 +02:00 |
|
Dominik Schürmann
|
acfe01e0e2
|
Update from transifex
|
2014-05-05 01:20:42 +02:00 |
|
Dominik Schürmann
|
4053e1ebd7
|
Update from transifex
|
2014-05-02 19:57:16 +02:00 |
|