From 815255db1a028ea23c6be4186f11488d59a747a4 Mon Sep 17 00:00:00 2001
From: mebr1416 <bruke.mekuria@outlook.com>
Date: Sat, 22 Jul 2017 16:22:02 +0300
Subject: [PATCH 1/2] Issue 721

---
 app/src/main/res/layout/fragment_single_upload.xml | 10 ++++++++++
 app/src/main/res/values/strings.xml                |  1 +
 2 files changed, 11 insertions(+)

diff --git a/app/src/main/res/layout/fragment_single_upload.xml b/app/src/main/res/layout/fragment_single_upload.xml
index c2e7acc4f..911943116 100644
--- a/app/src/main/res/layout/fragment_single_upload.xml
+++ b/app/src/main/res/layout/fragment_single_upload.xml
@@ -56,4 +56,14 @@
         android:gravity="center"
         android:layout_marginTop="16dp"
         />
+
+    <fr.free.nrw.commons.ui.widget.HtmlTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/media_upload_policy"
+        android:text="@string/media_upload_policy"
+        android:gravity="start"
+        android:layout_marginTop="16dp"
+        />
+
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f981902b3..38cb3d5de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -93,6 +93,7 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="menu_retry_upload">Retry</string>
   <string name="menu_cancel_upload">Cancel</string>
   <string name="share_license_summary">This image will be licensed under %1$s</string>
+  <string name="media_upload_policy">By submitting this picture, I declare that this is my own work, that it does not contain copyright material or selfies, and otherwise adheres to &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons policies&lt;/a&gt;.</string>
   <string name="menu_download">Download</string>
   <string name="preference_license">License</string>
   <string name="use_previous">Use previous title/description</string>

From 244af93f1971c12987643b87b1adcc7cafb9708c Mon Sep 17 00:00:00 2001
From: mebr1416 <bruke.mekuria@outlook.com>
Date: Mon, 24 Jul 2017 10:26:48 +0300
Subject: [PATCH 2/2] "Copyrighted material"

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 38cb3d5de..1979c60b0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -93,7 +93,7 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="menu_retry_upload">Retry</string>
   <string name="menu_cancel_upload">Cancel</string>
   <string name="share_license_summary">This image will be licensed under %1$s</string>
-  <string name="media_upload_policy">By submitting this picture, I declare that this is my own work, that it does not contain copyright material or selfies, and otherwise adheres to &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons policies&lt;/a&gt;.</string>
+  <string name="media_upload_policy">By submitting this picture, I declare that this is my own work, that it does not contain copyrighted material or selfies, and otherwise adheres to &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons policies&lt;/a&gt;.</string>
   <string name="menu_download">Download</string>
   <string name="preference_license">License</string>
   <string name="use_previous">Use previous title/description</string>