Daniel Ramos 40122d61cc Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java

2015-04-24 03:44:57 +01:00

..

anim

show refresh key progress inline

2015-02-27 22:46:48 +01:00

drawable

Remove old Holo design resources

2015-02-26 17:37:28 +01:00

drawable-hdpi

split up wait/action yubikey fragments

2015-03-21 22:18:58 +01:00

drawable-mdpi

split up wait/action yubikey fragments

2015-03-21 22:18:58 +01:00

drawable-xhdpi

split up wait/action yubikey fragments

2015-03-21 22:18:58 +01:00

drawable-xxhdpi

split up wait/action yubikey fragments

2015-03-21 22:18:58 +01:00

drawable-xxxhdpi

split up wait/action yubikey fragments

2015-03-21 22:18:58 +01:00

layout

Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development

2015-04-24 03:44:57 +01:00

layout-land

Better qr code resizing

2015-02-27 22:26:11 +01:00

menu

Fixing crashes with new encrypt ui

2015-03-29 20:37:54 +02:00

raw

Update changelog

2015-04-22 19:00:18 +02:00

raw-bg

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-cs

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-de

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-es

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-et

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-eu

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-fi

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-fr

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-is

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-it

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-ja

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-nl

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-pl

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-pt

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-ro

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-ru

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-sl

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-sr

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-sv

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-tr

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-uk

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-zh

Pull from transifex

2015-04-14 00:40:28 +02:00

raw-zh-rTW

Pull from transifex

2015-04-14 00:40:28 +02:00

values

Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development

2015-04-24 03:44:57 +01:00

values-bg

Pull from transifex

2015-03-10 16:19:46 +01:00

values-cs

Pull from transifex

2015-04-14 00:40:28 +02:00

values-de

Pull from transifex

2015-04-14 00:40:28 +02:00

values-es

Pull from transifex

2015-04-14 00:40:28 +02:00

values-et

Pull from transifex

2015-04-14 00:40:28 +02:00

values-eu

Pull from transifex

2015-04-14 00:40:28 +02:00

values-fi

Pull from transifex

2015-04-14 00:40:28 +02:00

values-fr

Pull from transifex

2015-04-14 00:40:28 +02:00

values-is

Pull from transifex

2015-03-10 16:19:46 +01:00

values-it

Pull from transifex

2015-04-14 00:40:28 +02:00

values-ja

Pull from transifex

2015-04-14 00:40:28 +02:00

values-nl

Pull from transifex

2015-04-14 00:40:28 +02:00

values-pl

Pull from transifex

2015-04-14 00:40:28 +02:00

values-pt

Pull from transifex

2015-03-10 16:19:46 +01:00

values-ro

Pull from transifex

2015-03-10 16:19:46 +01:00

values-ru

Pull from transifex

2015-04-14 00:40:28 +02:00

values-sl

Pull from transifex

2015-04-14 00:40:28 +02:00

values-sr

Manage my keys wizard

2015-03-19 17:16:23 +01:00

values-sv

Pull from transifex

2015-04-14 00:40:28 +02:00

values-tr

Pull from transifex

2015-04-14 00:40:28 +02:00

values-uk

Pull from transifex

2015-04-14 00:40:28 +02:00

values-v21

Fix toolbar margins on Android lower 5

2015-03-03 20:15:09 +01:00

values-zh

Pull from transifex

2015-04-14 00:40:28 +02:00

values-zh-rTW

Pull from transifex

2015-04-14 00:40:28 +02:00

xml

Fix language problems reported by yahoe.001 on transifex

2015-03-23 22:18:29 +01:00