Merge branch 'gradle' into development

Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib

27 files changed, 68 insertions, 6 deletions

diff --git a/libs/openpgp-api-lib b/libs/openpgp-api-lib
deleted file mode 160000
-Subproject 0be263d5d3effd2df5f976fa4a127017268749c
diff --git a/libs/openpgp-api-lib/res/drawable-hdpi/ic_action_cancel_launchersize.png b/libs/openpgp-api-lib/res/drawable-hdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 00000000..71b9118d
--- /dev/null
+++ b/libs/openpgp-api-lib/res/drawable-hdpi/ic_action_cancel_launchersize.png
diff --git a/libs/openpgp-api-lib/res/drawable-hdpi/ic_action_cancel_launchersize_light.png b/libs/openpgp-api-lib/res/drawable-hdpi/ic_action_cancel_launchersize_light.png
new file mode 100644
index 00000000..73b1d08f
--- /dev/null
+++ b/libs/openpgp-api-lib/res/drawable-hdpi/ic_action_cancel_launchersize_light.png
diff --git a/libs/openpgp-api-lib/res/drawable-mdpi/ic_action_cancel_launchersize.png b/libs/openpgp-api-lib/res/drawable-mdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 00000000..270abf45
--- /dev/null
+++ b/libs/openpgp-api-lib/res/drawable-mdpi/ic_action_cancel_launchersize.png
diff --git a/libs/openpgp-api-lib/res/drawable-mdpi/ic_action_cancel_launchersize_light.png b/libs/openpgp-api-lib/res/drawable-mdpi/ic_action_cancel_launchersize_light.png
new file mode 100644
index 00000000..d841821c
--- /dev/null
+++ b/libs/openpgp-api-lib/res/drawable-mdpi/ic_action_cancel_launchersize_light.png
diff --git a/libs/openpgp-api-lib/res/drawable-xhdpi/ic_action_cancel_launchersize.png b/libs/openpgp-api-lib/res/drawable-xhdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 00000000..1e3571fa
--- /dev/null
+++ b/libs/openpgp-api-lib/res/drawable-xhdpi/ic_action_cancel_launchersize.png
diff --git a/libs/openpgp-api-lib/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png b/libs/openpgp-api-lib/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png
new file mode 100644
index 00000000..d505046b
--- /dev/null
+++ b/libs/openpgp-api-lib/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png
diff --git a/libs/openpgp-api-lib/res/drawable-xxhdpi/ic_action_cancel_launchersize.png b/libs/openpgp-api-lib/res/drawable-xxhdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 00000000..52044601
--- /dev/null
+++ b/libs/openpgp-api-lib/res/drawable-xxhdpi/ic_action_cancel_launchersize.png
diff --git a/libs/openpgp-api-lib/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png b/libs/openpgp-api-lib/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png
new file mode 100644
index 00000000..d6fb86bd
--- /dev/null
+++ b/libs/openpgp-api-lib/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png
diff --git a/libs/openpgp-api-lib/res/values-cs/strings.xml b/libs/openpgp-api-lib/res/values-cs/strings.xml
new file mode 100644
index 00000000..c9fe1fab
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-cs/strings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="openpgp_list_preference_none">Žádný</string>
+  <string name="openpgp_install_openkeychain_via">Instalovat OpenKeychain pomocí %s</string>
+</resources>
diff --git a/libs/openpgp-api-lib/res/values-de/strings.xml b/libs/openpgp-api-lib/res/values-de/strings.xml
new file mode 100644
index 00000000..91e800ad
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-de/strings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="openpgp_list_preference_none">Keine Auswahl</string>
+  <string name="openpgp_install_openkeychain_via">Installiere OpenKeychain mit %s</string>
+</resources>
diff --git a/libs/openpgp-api-lib/res/values-es/strings.xml b/libs/openpgp-api-lib/res/values-es/strings.xml
new file mode 100644
index 00000000..da8979b4
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-es/strings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="openpgp_list_preference_none">Ninguno</string>
+  <string name="openpgp_install_openkeychain_via">Instalar OpenKeychain mediante %s</string>
+</resources>
diff --git a/libs/openpgp-api-lib/res/values-et/strings.xml b/libs/openpgp-api-lib/res/values-et/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-et/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/libs/openpgp-api-lib/res/values-fi/strings.xml b/libs/openpgp-api-lib/res/values-fi/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-fi/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/libs/openpgp-api-lib/res/values-fr/strings.xml b/libs/openpgp-api-lib/res/values-fr/strings.xml
new file mode 100644
index 00000000..9b36df2d
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-fr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="openpgp_list_preference_none">Aucun</string>
+  <string name="openpgp_install_openkeychain_via">Installer OpenKeychain par %s</string>
+</resources>
diff --git a/libs/openpgp-api-lib/res/values-is/strings.xml b/libs/openpgp-api-lib/res/values-is/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-is/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/libs/openpgp-api-lib/res/values-it/strings.xml b/libs/openpgp-api-lib/res/values-it/strings.xml
new file mode 100644
index 00000000..23e8e801
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-it/strings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="openpgp_list_preference_none">Nessuno</string>
+  <string name="openpgp_install_openkeychain_via">Installa OpenKeychain via %s</string>
+</resources>
diff --git a/libs/openpgp-api-lib/res/values-ja/strings.xml b/libs/openpgp-api-lib/res/values-ja/strings.xml
new file mode 100644
index 00000000..5e337f5a
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-ja/strings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="openpgp_list_preference_none">無し</string>
+  <string name="openpgp_install_openkeychain_via">%s 経由でOpenKeychainをインストール</string>
+</resources>
diff --git a/libs/openpgp-api-lib/res/values-nl/strings.xml b/libs/openpgp-api-lib/res/values-nl/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-nl/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/libs/openpgp-api-lib/res/values-pl/strings.xml b/libs/openpgp-api-lib/res/values-pl/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-pl/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/libs/openpgp-api-lib/res/values-pt/strings.xml b/libs/openpgp-api-lib/res/values-pt/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-pt/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/libs/openpgp-api-lib/res/values-ru/strings.xml b/libs/openpgp-api-lib/res/values-ru/strings.xml
new file mode 100644
index 00000000..e8fd1ddf
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-ru/strings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="openpgp_list_preference_none">Нет</string>
+  <string name="openpgp_install_openkeychain_via">Установить OpenKeychain через %s</string>
+</resources>
diff --git a/libs/openpgp-api-lib/res/values-sl/strings.xml b/libs/openpgp-api-lib/res/values-sl/strings.xml
new file mode 100644
index 00000000..20bf70b0
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-sl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="openpgp_list_preference_none">Brez</string>
+  <string name="openpgp_install_openkeychain_via">Namesti OpenKeychain prek %s</string>
+</resources>
diff --git a/libs/openpgp-api-lib/res/values-tr/strings.xml b/libs/openpgp-api-lib/res/values-tr/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-tr/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/libs/openpgp-api-lib/res/values-uk/strings.xml b/libs/openpgp-api-lib/res/values-uk/strings.xml
new file mode 100644
index 00000000..baf600a9
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-uk/strings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="openpgp_list_preference_none">Жоден</string>
+  <string name="openpgp_install_openkeychain_via">Встановити OpenKeychain через %s</string>
+</resources>
diff --git a/libs/openpgp-api-lib/res/values-zh/strings.xml b/libs/openpgp-api-lib/res/values-zh/strings.xml
new file mode 100644
index 00000000..c757504a
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values-zh/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/libs/openpgp-api-lib/res/values/strings.xml b/libs/openpgp-api-lib/res/values/strings.xml
new file mode 100644
index 00000000..0119831c
--- /dev/null
+++ b/libs/openpgp-api-lib/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="openpgp_list_preference_none">None</string>
+    <string name="openpgp_install_openkeychain_via">Install OpenKeychain via %s</string>
+
+</resources>
\ No newline at end of file