Merge pull request #805 from mebr1416/master

Issue 721
This commit is contained in:
Josephine Lim 2017-07-25 16:53:24 +10:00 committed by GitHub
commit 35d4a71673
2 changed files with 11 additions and 0 deletions

View file

@ -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>

View file

@ -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 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>