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

Merge remote-tracking branch 'refs/remotes/commons-app/master' into display_toast

Browse source 
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
This commit is contained in:
Josephine Lim 2017-05-15 11:23:10 +02:00
commit 485a0a1bc3
5 changed files with 62 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,8 @@
<string name="categories_search_text_hint">Search categories</string>
<string name="menu_save_categories">Save</string>
<string name="refresh_button">Refresh</string>
<string name="gps_disabled">GPS is disabled in your device. Would you like to enable it?</string>
<string name="enable_gps">Enable GPS</string>
<string name="contributions_subtitle_zero">No uploads yet</string>
<plurals name="contributions_subtitle">
<!--zero is not used in english. Category mentioned here for easy reference in future-->