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

Merge remote-tracking branch 'refs/remotes/commons-app/master' into check-gps-2

Browse source
This commit is contained in:
Josephine Lim 2017-05-15 10:50:05 +02:00
commit b1847c604e
10 changed files with 47 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/res/values/arrays.xml
View file

@ -8,10 +8,10 @@
<item>@string/license_name_cc_by_sa_four</item>
</array>
<array name="pref_defaultLicense_values">
<item>@string/license_name_cc0</item>
<item>@string/license_name_cc_by_3_0</item>
<item>@string/license_name_cc_by_4_0</item>
<item>@string/license_name_cc_by_sa_3_0</item>
<item>@string/license_name_cc_by_sa_4_0</item>
<item>@string/license_pref_cc0</item>
<item>@string/license_pref_cc_by_3_0</item>
<item>@string/license_pref_cc_by_4_0</item>
<item>@string/license_pref_cc_by_sa_3_0</item>
<item>@string/license_pref_cc_by_sa_4_0</item>
</array>
</resources>

8
app/src/main/res/values/keys.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="license_pref_cc0" translatable="false">CC0</string>
<string name="license_pref_cc_by_3_0" translatable="false">CC BY 3.0</string>
<string name="license_pref_cc_by_sa_3_0" translatable="false">CC BY-SA 3.0</string>
<string name="license_pref_cc_by_4_0" translatable="false">CC BY 4.0</string>
<string name="license_pref_cc_by_sa_4_0" translatable="false">CC BY-SA 4.0</string>
</resources>

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

@ -177,7 +177,7 @@ Tap this message (or hit back) to skip this step.</string>
<string name="mapbox_commons_app_token">pk.eyJ1IjoibWFza2FyYXZpdmVrIiwiYSI6ImNqMmxvdzFjMTAwMHYzM283ZWM3eW5tcDAifQ.ib5SZ9EVjwJe6GSKve0bcg</string>
<string name="number_of_uploads">My Recent Upload Limit</string>
<string name="maximum_limit">Maximum Limit</string>
<string name="maximum_limit_alert">Maximum limit should be 500</string>
<string name="maximum_limit_alert">Unable to display more than 500</string>
<string name="set_limit">Set Recent Upload Limit</string>
</resources>

2
app/src/main/res/xml/preferences.xml
View file

@ -8,7 +8,7 @@
android:title="@string/preference_license"
android:entries="@array/pref_defaultLicense_entries"
android:entryValues="@array/pref_defaultLicense_values"
android:defaultValue="@string/license_name_cc_by_sa_4_0"
android:defaultValue="@string/license_pref_cc_by_sa_4_0"
/>
<CheckBoxPreference