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

Merge branch 'master' into tidySettings

Browse source
This commit is contained in:
Yusuke Matsubara 2017-05-14 20:57:01 +09:00 • committed by GitHub
commit 08e6743869
74 changed files with 1552 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/values/dimens.xml
View file

@ -2,4 +2,5 @@
<dimen name="icon_size">120dp</dimen>
<dimen name="tiny_margin">4dp</dimen>
<dimen name="small_margin">8dp</dimen>
<dimen name="bottom_peak_height">240dp</dimen>
</resources>

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

@ -21,10 +21,10 @@
<string name="upload_failed_notification_title">Uploading %1$s failed</string>
<string name="upload_failed_notification_subtitle">Tap to view</string>
<plurals name="uploads_pending_notification_indicator">
<item quantity="one">1 file uploading</item>
<item quantity="one">%d file uploading</item>
<item quantity="other">%d files uploading</item>
</plurals>
<string name="title_activity_contributions">My uploads</string>
<string name="title_activity_contributions">My Recent Uploads</string>
<string name="contribution_state_queued">Queued</string>
<string name="contribution_state_failed">Failed</string>
<string name="contribution_state_in_progress">%1$d%% complete</string>
@ -42,6 +42,7 @@
<string name="login_failed_password">Unable to login - please check your password</string>
<string name="login_failed_throttled">Too many unsuccessful attempts. Please try again in a few minutes.</string>
<string name="login_failed_blocked">Sorry, this user has been blocked on Commons</string>
<string name="login_failed_2fa_not_supported">The app doesn\'t currently support 2 Factor Authentication.</string>
<string name="login_failed_generic">Login failed</string>
<string name="share_upload_button">Upload</string>
<string name="multiple_share_base_title">Name this set</string>
@ -50,17 +51,19 @@
<string name="categories_search_text_hint">Search categories</string>
<string name="menu_save_categories">Save</string>
<string name="refresh_button">Refresh</string>
<string name="contributions_subtitle_zero">No uploads yet</string>
<plurals name="contributions_subtitle">
<item quantity="zero">No uploads yet</item>
<item quantity="one">1 upload</item>
<!--zero is not used in english. Category mentioned here for easy reference in future-->
<item quantity="zero">@string/contributions_subtitle_zero</item>
<item quantity="one">%d upload</item>
<item quantity="other">%d uploads</item>
</plurals>
<plurals name="starting_multiple_uploads">
<item quantity="one">Starting 1 upload</item>
<item quantity="one">Starting %d upload</item>
<item quantity="other">Starting %d uploads</item>
</plurals>
<plurals name="multiple_uploads_title">
<item quantity="one">1 upload</item>
<item quantity="one">%d upload</item>
<item quantity="other">%d uploads</item>
</plurals>
<string name="categories_not_found">No categories matching %1$s found</string>
@ -172,4 +175,12 @@ Tap this message (or hit back) to skip this step.</string>
<string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
<string name="use_wikidata">Use Wikidata</string>
<string name="use_wikidata_summary">(Warning: disabling this may cause large mobile data consumption)</string>
<string name="map_theme_light">mapbox://styles/mapbox/traffic-day-v2</string>
<string name="map_theme_dark">mapbox://styles/mapbox/traffic-night-v2</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="set_limit">Set Recent Upload Limit</string>
</resources>

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

@ -45,4 +45,10 @@
<style name="ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
<style name="borderless_dialog">
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:background">@android:color/transparent</item>
</style>
</resources>