Vincent Breitmoser 5f20b8de1a Merge branch 'new-edit' ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml		2014-06-18 21:09:04 +02:00
..
drawable	ui: purplize searchtext in keylist	2014-05-07 03:07:24 +02:00
drawable-hdpi	Redesign Import, still some todos and regression bugs	2014-06-18 00:03:06 +02:00
drawable-ldpi	use project icons for certification status	2014-04-17 14:42:24 +02:00
drawable-mdpi	Redesign Import, still some todos and regression bugs	2014-06-18 00:03:06 +02:00
drawable-xhdpi	Redesign Import, still some todos and regression bugs	2014-06-18 00:03:06 +02:00
drawable-xxhdpi	Redesign Import, still some todos and regression bugs	2014-06-18 00:03:06 +02:00
drawable-xxxhdpi	Rename folder structure from OpenPGP Keychain to OpenKeychain	2014-04-06 12:57:42 +02:00
layout	Redesign Import, still some todos and regression bugs	2014-06-18 00:03:06 +02:00
layout-large	Workaround for nullpointer bug in support lib, close #591	2014-04-22 08:15:55 +02:00
menu	Hide subkeys, certs tabs in key view, checkable menu item to show/hide them	2014-06-06 22:46:39 +02:00
raw	Clarify help start	2014-05-14 18:01:40 +02:00
raw-ar	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-cs	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-de	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-el	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-es	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-et	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-fr	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-it	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-ja	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-ko	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-nl	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-pl	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-ru	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-sl	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-tr	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-uk	Pull from transifex	2014-05-31 20:49:56 +02:00
raw-zh	Pull from transifex	2014-05-31 20:49:56 +02:00
values	Merge branch 'new-edit'	2014-06-18 21:09:04 +02:00
values-ar	Pull from transifex	2014-05-31 20:49:56 +02:00
values-cs	Pull from transifex	2014-05-31 20:49:56 +02:00
values-de	Redesign Import, still some todos and regression bugs	2014-06-18 00:03:06 +02:00
values-el	Pull translations from transifex	2014-05-07 09:13:32 +02:00
values-es	import-log: switch to flags instead of statuses for result int	2014-06-10 16:24:04 +02:00
values-et	Pull translations from transifex	2014-05-07 09:13:32 +02:00
values-fr	import-log: switch to flags instead of statuses for result int	2014-06-10 16:24:04 +02:00
values-it	import-log: switch to flags instead of statuses for result int	2014-06-10 16:24:04 +02:00
values-ja	import-log: switch to flags instead of statuses for result int	2014-06-10 16:24:04 +02:00
values-ko	Pull translations from transifex	2014-05-07 09:13:32 +02:00
values-large	Rename folder structure from OpenPGP Keychain to OpenKeychain	2014-04-06 12:57:42 +02:00
values-nl	import-log: switch to flags instead of statuses for result int	2014-06-10 16:24:04 +02:00
values-pl	import-log: switch to flags instead of statuses for result int	2014-06-10 16:24:04 +02:00
values-ru	import-log: switch to flags instead of statuses for result int	2014-06-10 16:24:04 +02:00
values-sl	import-log: switch to flags instead of statuses for result int	2014-06-10 16:24:04 +02:00
values-tr	Pull translations from transifex	2014-05-07 09:13:32 +02:00
values-uk	import-log: switch to flags instead of statuses for result int	2014-06-10 16:24:04 +02:00
values-v11	ui: apply theme to tab buttons	2014-05-07 03:55:06 +02:00
values-zh	Pull translations from transifex	2014-05-07 09:13:32 +02:00
xml	Show keys with android contacts	2014-06-05 23:22:21 +02:00