Merged, Resolve merge conflicts

This commit is contained in:
nextLane 2017-03-13 23:06:42 +05:30
commit c6352a3792
49 changed files with 284 additions and 75 deletions

View file

@ -155,4 +155,11 @@ Tap this message (or hit back) to skip this step.</string>
<string name="file_exists">This file already exists on Commons. Are you sure you want to proceed?</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="media_detail_title">Title</string>
<string name="media_detail_media_title">Title of the media</string>
<string name="media_detail_description">Description</string>
<string name="media_detail_description_explanation">Description of the media goes here. This can potentially be fairly long, and will need to wrap across multiple lines. We hope it looks nice though.</string>
<string name="become_a_tester_title">Become a Beta Tester</string>
<string name="become_a_tester_description">Opt-in to our beta channel on Google Play and get early access to new features and bug fixes</string>
<string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
</resources>