mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix merge conflicts

Browse source
This commit is contained in:
Dinu Kumarasiri 2017-05-20 11:58:26 +02:00
commit 43a707dad5
4 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/values/strings.xml
View file

@ -183,7 +183,10 @@ Tap this message (or hit back) to skip this step.</string>
<string name="maximum_limit_alert">Unable to display more than 500</string>
<string name="set_limit">Set Recent Upload Limit</string>
<string name="login_failed_2fa_not_supported">Two factor authentication is currently not supported.</string>
<<<<<<< HEAD
<string name="logout_verification">Do you really want to logout?</string>
=======
>>>>>>> origin/fix_lint_issues
<string name="commons_logo">Commons Logo</string>
<string name="background_image">Background Image</string>
<string name="mediaimage_failed">Media Image Failed</string>
@ -198,7 +201,10 @@ Tap this message (or hit back) to skip this step.</string>
<string name="welcome_image_welcome_wikipedia">Welcome Wikipedia</string>
<string name="welcome_image_welcome_copyright">Welcome Copyright</string>
<string name="welcome_image_sydney_opera_house">Sydney Opera House</string>
<<<<<<< HEAD
>>>>>>> [Lint] Add content description to image views
=======
>>>>>>> origin/fix_lint_issues
<string name="cancel">Cancel</string>
<string name="navigation_drawer_open">Open</string>