cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc
open-keychain/OpenKeychain/src/main/res
History
Vincent Breitmoser 1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml
2015-04-26 01:02:22 +02:00
..
anim
some linked id ui fine tuning
2015-03-26 13:53:43 +01:00
drawable
some linked id ui fine tuning
2015-03-26 13:53:43 +01:00
drawable-hdpi
Merge remote-tracking branch 'origin/development' into linked-identities
2015-04-26 01:02:22 +02:00
drawable-mdpi
Merge remote-tracking branch 'origin/development' into linked-identities
2015-04-26 01:02:22 +02:00
drawable-xhdpi
Merge remote-tracking branch 'origin/development' into linked-identities
2015-04-26 01:02:22 +02:00
drawable-xxhdpi
Merge remote-tracking branch 'origin/development' into linked-identities
2015-04-26 01:02:22 +02:00
drawable-xxxhdpi
Merge remote-tracking branch 'origin/development' into linked-identities
2015-04-26 01:02:22 +02:00
layout
Merge remote-tracking branch 'origin/development' into linked-identities
2015-04-26 01:02:22 +02:00
layout-land
Better qr code resizing
2015-02-27 22:26:11 +01:00
menu
Merge remote-tracking branch 'origin/development' into linked-identities
2015-04-26 01:02:22 +02:00
raw
Update in-app contributor list
2015-04-25 15:10:15 +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
transition
do a TON of UI work
2015-03-05 01:58:36 +01:00
values
Merge remote-tracking branch 'origin/development' into linked-identities
2015-04-26 01:02:22 +02: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