From c959321ab08a8fdff6994d198053090a62b255b6 Mon Sep 17 00:00:00 2001
From: Josephine Lim <josephinelim86@gmail.com>
Date: Wed, 2 May 2018 20:17:32 +1000
Subject: [PATCH 01/11] Update issue_template.md

It feels like the template for reporting bugs is a bit redundant - we have summary, steps to reproduce, observed behaviour AND expected behaviour, which all are very similar. I think that by paring it down to the essentials, people will be less likely to skip steps.
---
 ISSUE_TEMPLATE.md | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 691562b04..ce33f1a18 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,9 +1,9 @@
-_Before creating an issue, please search the existing issues to see if a similar one has already been created. You can search issues by specific labels (e.g. `label:nearby `) or just by typing keywords into the search filter._
-
 **Summary:** 
 
 Summarize your issue in one sentence (what goes wrong, what did you expect to happen)
 
+_Before creating an issue, please search the existing issues to see if a similar one has already been created. You can search issues by specific labels (e.g. `label:nearby `) or just by typing keywords into the search filter._
+
 **Steps to reproduce:** 
 
 How can we reproduce the issue?
@@ -12,14 +12,6 @@ How can we reproduce the issue?
 
 Add logcat files here (if possible).
 
-**Expected behavior:** 
-
-What did you expect the App to do?
-
-**Observed behavior:** 
-
-What did you see instead?  Describe your issue in detail here.
-
 **Device and Android version:** 
 
 What make and model device (e.g., Samsung J7) did you encounter this on?  What Android
@@ -28,7 +20,7 @@ version (e.g., Android 4.0 Ice Cream Sandwich or Android 6.0 Marshmallow) are yo
  
  **Commons app version:** 
 
-You can find this information by going to the navigation drawer in the app and tapping 'About'
+You can find this information by going to the navigation drawer in the app and tapping 'About'. If you are building from our codebase instead of downloading the app, please also mention the branch and build variant (e.g. master and prodDebug).
 
 **Screen-shots:** 
 

From da28d4f945f0d5dca2f1e68b454f5414804aaee0 Mon Sep 17 00:00:00 2001
From: Josephine Lim <josephinelim86@gmail.com>
Date: Mon, 11 Jun 2018 17:29:29 +1000
Subject: [PATCH 02/11] Versioning and changelog for v2.7.2 (#1610)

* Versioning for v2.7.2

* Update changelog.md
---
 CHANGELOG.md     | 3 +++
 app/build.gradle | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c77174cf..1688b3b02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Wikimedia Commons for Android
 
+## v2.7.2
+- Modified subtext for "automatically get current location" setting to emphasize that it will reveal user's location
+
 ## v2.7.1
 - Fixed UI and permission issues with Nearby
 - Fixed issue with My Recent Uploads being empty
diff --git a/app/build.gradle b/app/build.gradle
index 9300cd9aa..dc8c3b845 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -92,8 +92,8 @@ android {
 
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
-        versionCode 84
-        versionName '2.7.1'
+        versionCode 85
+        versionName '2.7.2'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion project.minSdkVersion

From 2e9af3c33ad9c6a721df9d6b0f6872479ce73c1e Mon Sep 17 00:00:00 2001
From: nemobis <federicoleva@tiscali.it>
Date: Tue, 12 Jun 2018 22:05:25 +0300
Subject: [PATCH 03/11] Correct name is "Wikidata", not "wiki data"

Reported at https://phabricator.wikimedia.org/T196439
---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c0e6fb719..d2acdb245 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -284,7 +284,7 @@
   <string name="error_fetching_nearby_places">Error fetching nearby places.</string>
 
   <string name="successful_wikidata_edit">Image successfully added to %1$s on Wikidata!</string>
-  <string name="wikidata_edit_failure">Failed to update corresponding wiki data entity!</string>
+  <string name="wikidata_edit_failure">Failed to update corresponding Wikidata entity!</string>
   <string name="menu_set_wallpaper">Set wallpaper</string>
   <string name="wallpaper_set_successfully">Wallpaper set successfully!</string>
 </resources>

From 1dc0a7c257d9f93162dd90fb4bfe95a09c4e75bb Mon Sep 17 00:00:00 2001
From: Vivek Maskara <maskaravivek@hotmail.com>
Date: Thu, 14 Jun 2018 14:42:46 +0530
Subject: [PATCH 04/11] Fix resource not found exception with null checks
 (#1628)

---
 .../contributions/ContributionsActivity.java  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
index 312839a24..c39fbb06e 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
@@ -275,17 +275,25 @@ public  class       ContributionsActivity
                 .getUploadCount(sessionManager.getCurrentAccount().name)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                        uploadCount -> getSupportActionBar().setSubtitle(getResources()
-                                .getQuantityString(R.plurals.contributions_subtitle,
-                                        uploadCount, uploadCount)),
+                .subscribe(this::displayUploadCount,
                         t -> Timber.e(t, "Fetching upload count failed")
                 ));
     }
 
-    public void betaSetUploadCount(int betaUploadCount){
+    private void displayUploadCount(Integer uploadCount) {
+        if (isFinishing()
+                || getSupportActionBar() == null
+                || getResources() == null) {
+            return;
+        }
+        
         getSupportActionBar().setSubtitle(getResources()
-                .getQuantityString(R.plurals.contributions_subtitle, betaUploadCount, betaUploadCount));
+                .getQuantityString(R.plurals.contributions_subtitle,
+                        uploadCount, uploadCount));
+    }
+
+    public void betaSetUploadCount(int betaUploadCount) {
+        displayUploadCount(betaUploadCount);
     }
 
 

From 18b0517fc7390e4ac27a492bdf6ec15ceeebd2c8 Mon Sep 17 00:00:00 2001
From: Vivek Maskara <maskaravivek@hotmail.com>
Date: Tue, 19 Jun 2018 13:23:26 +0530
Subject: [PATCH 05/11] Fix crash while uploading image with whitespace title
 (#1636)

---
 .../fr/free/nrw/commons/upload/SingleUploadFragment.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
index a32fb7b42..a993d59da 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
@@ -74,13 +74,13 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment {
             //What happens when the 'submit' icon is tapped
             case R.id.menu_upload_single:
 
-                if (titleEdit.getText().toString().isEmpty()) {
+                if (titleEdit.getText().toString().trim().isEmpty()) {
                     Toast.makeText(getContext(), R.string.add_title_toast, Toast.LENGTH_LONG).show();
                     return false;
                 }
 
-                String title = titleEdit.getText().toString();
-                String desc = descEdit.getText().toString();
+                String title = titleEdit.getText().toString().trim();
+                String desc = descEdit.getText().toString().trim();
 
                 //Save the title/desc in short-lived cache so next time this fragment is loaded, we can access these
                 prefs.edit()

From e05993f450fb2ee535ebf0da9917e3b1aef0ee1b Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Mon, 25 Jun 2018 08:10:39 +0200
Subject: [PATCH 06/11] Localisation updates from https://translatewiki.net.

---
 app/src/main/res/values-cy/strings.xml | 59 +++++++++++++++++++++++---
 app/src/main/res/values-ja/strings.xml | 10 +++--
 app/src/main/res/values-ru/strings.xml |  6 +--
 app/src/main/res/values-tr/strings.xml |  8 ++--
 app/src/main/res/values-zh/strings.xml |  3 +-
 5 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 68ffef8a0..134c2f116 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -5,18 +5,25 @@
 * Robin Owain
 -->
 <resources>
+  <string name="preference_category_appearance">Ymddangosiad</string>
+  <string name="preference_category_general">Cyffredinol</string>
+  <string name="preference_category_feedback">Adborth</string>
+  <string name="preference_category_location">Lleoliad</string>
   <string name="app_name">Comin Wicimedia</string>
+  <string name="bullet">•</string>
   <string name="menu_settings">Gosodiadau</string>
   <string name="username">Enw defnyddiwr</string>
   <string name="password">Cyfrinair</string>
+  <string name="login_credential">Mewngofnodwch i\'ch cyfri Comin Beta</string>
   <string name="login">Mewngofnodi</string>
+  <string name="forgot_password">Anghofiwyd y Cyfrinair?</string>
   <string name="signup">Cofrestru</string>
   <string name="logging_in_title">Wrthi\'n mewngofnodi</string>
   <string name="logging_in_message">Disgwyliwch…</string>
   <string name="login_success">Llwyddodd y mewngofnodi!</string>
   <string name="login_failed">Methodd y mewngofnodi!</string>
   <string name="upload_failed">Ni chafwyd hyd i\'r ffeil. Ceisiwch un arall.</string>
-  <string name="authentication_failed" fuzzy="true">Methodd y dilysu!</string>
+  <string name="authentication_failed">Methodd y dilysu! Mewngofnodwch eto.</string>
   <string name="uploading_started">Dechreuodd yr uwchlwytho!</string>
   <string name="upload_completed_notification_title">Uwchlwythwyd %1$s!</string>
   <string name="upload_completed_notification_text">Tapiwch i weld eich uwchlwythiad</string>
@@ -41,8 +48,10 @@
   <string name="menu_share">Rhannu</string>
   <string name="menu_open_in_browser">Agor yn y Porwr</string>
   <string name="share_title_hint">Teitl</string>
+  <string name="add_title_toast">Rhowch deitl i\'r ffeil</string>
   <string name="share_description_hint">Disgrifiad</string>
   <string name="login_failed_network">Yn methu mewngofnodi - methodd y rhwydwaith</string>
+  <string name="login_failed_wrong_credentials">Methwyd mewngofnodi - gwirwch eich enw defnyddiwr a\'ch cyfrinair</string>
   <string name="login_failed_throttled">Cafwyd gormod o ymgeision aflwyddiannus. Oedwch ennyd cyn ceisio eto.</string>
   <string name="login_failed_blocked">Ymddiheurwn. Mae\'r defnyddiwr hwn wedi ei flocio ar Gomin Wikimedia</string>
   <string name="login_failed_2fa_needed">Mae\'n rhaid i chi roi eich cod adnabod 2 ffactor.</string>
@@ -54,6 +63,7 @@
   <string name="categories_search_text_hint">Archwilio\'r categorïau</string>
   <string name="menu_save_categories">Cadw</string>
   <string name="refresh_button">Ailgyrchu</string>
+  <string name="display_list_button">Rhestr</string>
   <string name="gps_disabled">Ataliwyd GPS ar eich dyfais. Ydych chi am ei droi\'n weithredol?</string>
   <string name="enable_gps">Gweithredu\'r GPS</string>
   <string name="contributions_subtitle_zero">Heb uwchlwytho eto</string>
@@ -75,11 +85,12 @@
   <string name="categories_activity_title">Categorïau</string>
   <string name="title_activity_settings">Gosodiadau</string>
   <string name="title_activity_signup">Cofrestru</string>
+  <string name="title_activity_featured_images">Delweddau nodwedd</string>
   <string name="menu_about">Amdanom</string>
   <string name="about_license">Ap Cynnwys Agored a grewyd ac a gefnogir gan wirfoddolwyr cymuned Wicimedia yw ap Comin Wicimedia. Does a wnelo Sefydliad Wicimedia ddim byd ag e (ei greu, ei gynnal na\'i ddatblygu).</string>
   <string name="about_improve">\n\nCrewch &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;ymholiad GitHub&lt;/a&gt; os oes gennych fyg, broblem neu awgrym.</string>
-  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Polisi Preifatrwydd&lt;/a&gt;</string>
-  <string name="about_credits" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Clod&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;u&gt;Polisi preifatrwydd&lt;/u&gt;</string>
+  <string name="about_credits">Clod a bri</string>
   <string name="title_activity_about">Amdanom</string>
   <string name="menu_feedback">Danfonwch Adborth (drwy Ebost)</string>
   <string name="no_email_client">Dim ebost client wedi\'i ganfod</string>
@@ -91,10 +102,10 @@
   <string name="share_license_summary">Caiff y ddelwedd hon ei thrwyddedu yn ôl termau\'r drwydded %1$s.</string>
   <string name="media_upload_policy">Wrth gynnig y llun yma, rwy\'n datgan mai fy ngwaith i ydyw ac nad yw\'n cynnwys unrhyw beth dan hawlfrain, na hunlun, a\'i fod yn cadw at &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Bolisiau Comin Wicimedia&lt;/a&gt;.</string>
   <string name="menu_download">Lawrlwytho</string>
-  <string name="preference_license" fuzzy="true">Trwydded</string>
+  <string name="preference_license">Trwydded Ddiofyn (\'default\')</string>
   <string name="use_previous">Defnydiwch y teitl/disgrifiad blaenorol</string>
   <string name="allow_gps">Defnyddiwch y lleoliad cyfredol</string>
-  <string name="allow_gps_summary" fuzzy="true">Canfyddwch eich lleoliad, er mwyn i ni gynnig categori (os nad ydych wedi nodi\'r cyfesurynnau).</string>
+  <string name="allow_gps_summary">Adfer eich lleoliad presennol os nad yw\'r ddelwedd yn cynnwys cyfesurynnau. Bydd hyn yn datgelu eich lleoliad chi!</string>
   <string name="preference_theme">Modd fin nos</string>
   <string name="preference_theme_summary">Defnyddiwch thema tywyll</string>
   <string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string>
@@ -120,9 +131,19 @@
   <string name="tutorial_1_text">Cyhelir llawer o luniau ar Gomin Wicimedia sy\'n cael eu defnyddio ar Wicipedia.</string>
   <string name="tutorial_1_subtext">Mae eich lluniau\'n gymorth i addysgu pobl drwy\'r byd mawr crwn!</string>
   <string name="tutorial_2_text">Uwchlwythwch lluniau a dynnoch eich hun:</string>
-  <string name="tutorial_2_subtext" fuzzy="true">- Natur (blodau, anifeiliaid, mynyddoedd)\n- Pethau defnyddiol (beic, tren, gorsaf drenau)\n- Enwogion (beirdd, athletwyr, blogwyr)</string>
+  <string name="tutorial_2_subtext">Gwrthrychau byd natur (blodau, anifeiliaid, mynyddoedd)\n- Gwrthrychau defnyddiol (beics, trenau, gorsafoedd trenau)\n- Enwogion (beirdd, athletwyr, blogwyr)</string>
+  <string name="tutorial_2_subtext_1">Gwrthrychau byd natur (blodau, anifeiliaid, mynyddoedd)</string>
+  <string name="tutorial_2_subtext_2">Gwrthrychau defnyddiol (beics, trenau, gorsafoedd trenau)</string>
+  <string name="tutorial_2_subtext_3">Enwogion (beirdd, athletwyr, blogwyr)</string>
   <string name="tutorial_3_text">Peidiwch ag uwchlwytho:</string>
   <string name="tutorial_3_subtext">- hunanluniau ohonoch chi na\'ch ffrindiau\n- lluniau a gawsoch o\'r we\n- sgrinluniau o apiau masnachol</string>
+  <string name="tutorial_3_subtext_1">Hunanluniau neu luniau o\'ch ffrindiau</string>
+  <string name="tutorial_3_subtext_2">Lluniau a lawrlwythwyd o\'r we gennych</string>
+  <string name="tutorial_3_subtext_3">Sgrinluniau o aps</string>
+  <string name="tutorial_4_text">Enghraifft o uwchlwythiad:</string>
+  <string name="tutorial_4_subtext_1">Teitl:Tŷ Opera Sydney</string>
+  <string name="tutorial_4_subtext_2">Disgrifiad: Golygfa o Dŷ Opera Sydney o ochr arall y bae</string>
+  <string name="tutorial_4_subtext_3">Categoriau: Tŷ Opera Sydney o\'r gorllewin</string>
   <string name="welcome_wikipedia_text">Cyfranwch luniau. Cynorthwywch Wicipedia i roi bywyd yn yr erthyglau!</string>
   <string name="welcome_wikipedia_subtext">Mae\'r delweddau ar Wicipedia\'n dod o\nGomin Wikimedia.</string>
   <string name="welcome_copyright_text">Mae eich delweddau\'n cynorthwyo i addysgu pobl ledled y byd.</string>
@@ -135,6 +156,32 @@
   <string name="detail_description_empty">Dim disgrifiad</string>
   <string name="detail_license_empty">Trwydded anhysbys</string>
   <string name="menu_refresh">Adnewyddu</string>
+  <string name="ok">Iawn</string>
+  <string name="title_activity_nearby">Lleoedd Cyfagos</string>
+  <string name="no_nearby">Ni chafwyd hyd i leoedd cyfagos</string>
+  <string name="warning">Rhybudd</string>
+  <string name="yes">Ydw</string>
+  <string name="no">Nac ydw</string>
   <string name="media_detail_title">Teitl</string>
+  <string name="media_detail_media_title">teitl y cyfrwng</string>
   <string name="media_detail_description">Disgrifiad</string>
+  <string name="media_detail_author">Awdur</string>
+  <string name="media_detail_uploaded_date">Dyddiad yr uwchlwythiad</string>
+  <string name="media_detail_license">Trwydded</string>
+  <string name="media_detail_coordinates">Cyfesurynnau</string>
+  <string name="media_detail_coordinates_empty">Dim</string>
+  <string name="nearby_info_menu_wikidata_article">Eitem Wicidata</string>
+  <string name="nearby_info_menu_wikipedia_article">Erthygl Wicipedia</string>
+  <string name="login_to_your_account">Mewngofnodwch i\'ch cyfri</string>
+  <string name="send_log_file">Danfonwch y ffeil log</string>
+  <string name="view_browser">Gweld yn y porwr</string>
+  <string name="nearby_location_has_not_changed">Nid yw\'r lleoliad wedi newid.</string>
+  <string name="nearby_location_not_available">Nid yw\'r lleoliad ar gael.</string>
+  <string name="about_translate_proceed">Parhau</string>
+  <string name="about_translate_cancel">Canslo</string>
+  <string name="retry">Ailgeisio</string>
+  <string name="showcase_view_got_it_button">Gwnaed!</string>
+  <string name="appwidget_img">Llun y Dydd</string>
+  <string name="app_widget_heading">Llun y Dydd</string>
+  <string name="successful_wikidata_edit">Mae %1$s o luniau wedi\'u hychwanegu ar Wicidata!</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c2e243770..c3badb9fb 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -30,7 +30,7 @@
   <string name="login_success">ログインしました!</string>
   <string name="login_failed">ログインに失敗しました!</string>
   <string name="upload_failed">ファイルが見つかりません。別のファイルでお試しください。</string>
-  <string name="authentication_failed" fuzzy="true">認証に失敗しました!</string>
+  <string name="authentication_failed">認証に失敗しました!　もう一度ログインしてください</string>
   <string name="uploading_started">アップロードを開始しました!</string>
   <string name="upload_completed_notification_title">%1$s をアップロードしました!</string>
   <string name="upload_completed_notification_text">アップロードしたものを表示するにはタップしてください</string>
@@ -61,7 +61,7 @@
   <string name="login_failed_wrong_credentials">ログインできません - 利用者名とパスワードを確認してください</string>
   <string name="login_failed_throttled">失敗した回数が多すぎます。数分待ってからもう一度お試しください。</string>
   <string name="login_failed_blocked">申し訳ありませんが、この利用者はコモンズでブロックされています。</string>
-  <string name="login_failed_2fa_needed">2要素認証コードを提供する必要があります。</string>
+  <string name="login_failed_2fa_needed">2段階認証コードを入力する必要があります。</string>
   <string name="login_failed_generic">ログイン失敗</string>
   <string name="share_upload_button">アップロード</string>
   <string name="multiple_share_base_title">このセットに名前をつけてください</string>
@@ -185,7 +185,7 @@
   <string name="media_detail_coordinates_empty">情報なし</string>
   <string name="become_a_tester_title">ベータ版を使ってみましょう！</string>
   <string name="become_a_tester_description">Google Playのベータ版チャンネルにオプトインして、新機能やバグ修正プログラムに早期にアクセス</string>
-  <string name="_2fa_code">2FA コード</string>
+  <string name="_2fa_code">2段階認証コード</string>
   <string name="number_of_uploads">最近のアップロードファイルに表示する最大件数</string>
   <string name="maximum_limit">最大限</string>
   <string name="maximum_limit_alert">表示できるのは500件以下です</string>
@@ -280,8 +280,10 @@
   <string name="share_app_title">アプリをシェアする</string>
   <string name="share_coordinates_not_present">画像の選択中に位置情報を特定できませんでした</string>
   <string name="error_fetching_nearby_places">付近の場所を取得しようとしてエラーが発生しました。</string>
+  <string name="appwidget_img">今日の一枚</string>
+  <string name="app_widget_heading">今日の一枚</string>
   <string name="successful_wikidata_edit">ウィキデータの%1$sに画像を追加しました !</string>
-  <string name="wikidata_edit_failure" fuzzy="true">対応するウィキデータの引数の更新に失敗しました。</string>
+  <string name="wikidata_edit_failure">対応するウィキデータの更新に失敗しました！</string>
   <string name="menu_set_wallpaper">壁紙の設定</string>
   <string name="wallpaper_set_successfully">壁紙の設定ができました!</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ed28ccb20..0b499b414 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -31,7 +31,7 @@
   <string name="login_credential">Войдите в свою учётную запись Commons Beta</string>
   <string name="login">Войти</string>
   <string name="forgot_password">Забыли пароль?</string>
-  <string name="signup">Зарегистрироваться</string>
+  <string name="signup">Регистрация</string>
   <string name="logging_in_title">Вход в систему</string>
   <string name="logging_in_message">Пожалуйста, подождите…</string>
   <string name="login_success">Вход выполнен успешно!</string>
@@ -98,7 +98,7 @@
   <string name="categories_skip_explanation">Добавьте категории, чтобы ваши изображения можно было легко найти на Викискладе.\nНачните вводить название для добавления категорий.</string>
   <string name="categories_activity_title">Категории</string>
   <string name="title_activity_settings">Настройки</string>
-  <string name="title_activity_signup">Зарегистрироваться</string>
+  <string name="title_activity_signup">Регистрация</string>
   <string name="title_activity_featured_images">Избранные изображения</string>
   <string name="menu_about">О приложении</string>
   <string name="about_license">Приложение «Викисклад» - это программа с открытым кодом, которую создали волонтёры и участники грантов Викимедиа. Фонд Викимедиа не участвует в создании, разработке или обслуживании этого приложения.</string>
@@ -277,7 +277,7 @@
   <string name="about_translate">&lt;u&gt;Перевести&lt;/u&gt;</string>
   <string name="about_translate_title">Языки</string>
   <string name="about_translate_message">Выберите язык локализации, на который сможете перевести элементы интерфейса приложения</string>
-  <string name="about_translate_proceed">Выполняется</string>
+  <string name="about_translate_proceed">Перейти к переводу</string>
   <string name="about_translate_cancel">Отмена</string>
   <string name="retry">Повторить</string>
   <string name="showcase_view_got_it_button">Понятно!</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 96e7cd96d..d04974f5a 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -30,7 +30,7 @@
   <string name="login_success">Oturum açma başarılı!</string>
   <string name="login_failed">Oturum açma başarısız oldu!</string>
   <string name="upload_failed">Dosya bulunamadı. Lütfen başka bir dosya deneyin.</string>
-  <string name="authentication_failed" fuzzy="true">Kimlik doğrulama başarısız oldu!</string>
+  <string name="authentication_failed">Kimlik doğrulama başarısız oldu, lütfen tekrar giriş yapın</string>
   <string name="uploading_started">Yükleme başladı!</string>
   <string name="upload_completed_notification_title">%1$s yüklendi!</string>
   <string name="upload_completed_notification_text">Yüklemelerinizi görüntülemek için dokunun</string>
@@ -112,7 +112,7 @@
   <string name="preference_license">Varsayılan lisans</string>
   <string name="use_previous">Önceki başlığı/açıklamayı kullan</string>
   <string name="allow_gps">Otomatik olarak mevcut konumu al</string>
-  <string name="allow_gps_summary" fuzzy="true">Resim koordinat olarak etiketlendirilmemişse kategori önerileri için mevcut konum bulun</string>
+  <string name="allow_gps_summary">Resim coğrafi etiketli değilse ve coğrafi etiketler resimle görüntüleniyorsa geçerli konumu alır. Uyarı: Mevcut konumunuzu gösterir.</string>
   <string name="preference_theme">Gece modu</string>
   <string name="preference_theme_summary">Koyu temayı kullanın</string>
   <string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string>
@@ -282,8 +282,10 @@
   <string name="share_app_title">Uygulamayı Paylaş</string>
   <string name="share_coordinates_not_present">Koordinatlar görüntü seçimi sırasında belirlenmedi</string>
   <string name="error_fetching_nearby_places">Yakındaki yerler alınırken hata oluştu.</string>
+  <string name="appwidget_img">Günün Resmi</string>
+  <string name="app_widget_heading">Günün Resmi</string>
   <string name="successful_wikidata_edit">Resim, Vikiveri\'de %1$s içine başarıyla eklendi.</string>
-  <string name="wikidata_edit_failure" fuzzy="true">Karşılık gelen viki veri varlığı güncellenemedi!</string>
+  <string name="wikidata_edit_failure">Karşılık gelen Vikiveri varlığı güncellenemedi!</string>
   <string name="menu_set_wallpaper">Duvar kağıdı ayarla</string>
   <string name="wallpaper_set_successfully">Duvar kağıdı başarıyla ayarlandı!</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 5bcf095db..090ddd1dd 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
 * Aefgh39622
+* Deathkon
 * Hydra
 * Kuailong
 * Liuxinyu970226
@@ -10,7 +11,7 @@
 -->
 <resources>
   <string name="preference_category_appearance">外观</string>
-  <string name="preference_category_general">一般</string>
+  <string name="preference_category_general">常规</string>
   <string name="preference_category_feedback">反馈</string>
   <string name="preference_category_location">位置</string>
   <string name="app_name">共享资源</string>

From c1c178c576475a5008df7e8cafeb6cde6186a3ac Mon Sep 17 00:00:00 2001
From: Nicolas Raoul <nicolas.raoul@gmail.com>
Date: Thu, 28 Jun 2018 01:18:16 +0900
Subject: [PATCH 07/11] Fix nearby crash by updating to Mapbox version that
 includes telem 2.2.10 (#1666)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 68a31f984..bb0220b30 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     implementation 'info.debatty:java-string-similarity:0.24'
     implementation 'com.borjabravo:readmoretextview:2.1.0'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation('com.mapbox.mapboxsdk:mapbox-android-sdk:5.4.1@aar') {
+    implementation('com.mapbox.mapboxsdk:mapbox-android-sdk:5.5.0@aar') {
         transitive = true
     }
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'

From 00924513571a53a5822562a14d6e93c017303b69 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Thu, 28 Jun 2018 07:19:17 +0200
Subject: [PATCH 08/11] Localisation updates from https://translatewiki.net.

---
 app/src/main/res/values-bn/error.xml   | 1 +
 app/src/main/res/values-bn/strings.xml | 1 +
 app/src/main/res/values-fr/strings.xml | 2 +-
 app/src/main/res/values-nl/strings.xml | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-bn/error.xml b/app/src/main/res/values-bn/error.xml
index 2c929f8b5..66984d45f 100644
--- a/app/src/main/res/values-bn/error.xml
+++ b/app/src/main/res/values-bn/error.xml
@@ -3,6 +3,7 @@
 * Aftabuzzaman
 * Bellayet
 * Sankarshan
+* আফতাবুজ্জামান
 -->
 <resources>
   <string name="crash_dialog_title">কমন্স ক্র্যাশ করেছে</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index d9aa9e657..c412c11c2 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -9,6 +9,7 @@
 * Rasal Lia
 * Sankarshan
 * Tauhid16
+* আফতাবুজ্জামান
 -->
 <resources>
   <string name="preference_category_appearance">অবয়ব</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 63eb7eefb..9308e44fb 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -120,7 +120,7 @@
   <string name="preference_license">Licence par défaut</string>
   <string name="use_previous">Utiliser le titre ou la description précédent</string>
   <string name="allow_gps">Obtenir automatiquement l’emplacement actuel</string>
-  <string name="allow_gps_summary">Récupère l’emplacement actuel si l’image n’est pas marquée géographiquement, et marque géographiquement l’image avec. Avertissement : Cela dévoilera votre emplacement actuel.</string>
+  <string name="allow_gps_summary">Récupère l’emplacement actuel si l’image n’est pas marquée géographiquement, et marque géographiquement l’image avec. Avertissement : ceci dévoilera votre emplacement actuel.</string>
   <string name="preference_theme">Mode de nuit</string>
   <string name="preference_theme_summary">Utiliser un thème sombre</string>
   <string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 8a47cc3cd..2e84ab342 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
 * Festina90
+* KlaasZ4usV
 * Mainframe98
 * Mar(c)
 * Patio

From 779704812c14713a455fa6ed5f88b81d4a9ff05d Mon Sep 17 00:00:00 2001
From: Josephine Lim <josephinelim86@gmail.com>
Date: Fri, 29 Jun 2018 03:11:35 +1000
Subject: [PATCH 09/11] Add description to "steps to reproduce"

---
 ISSUE_TEMPLATE.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index ce33f1a18..8feca4268 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -6,7 +6,8 @@ _Before creating an issue, please search the existing issues to see if a similar
 
 **Steps to reproduce:** 
 
-How can we reproduce the issue?
+How can we reproduce the issue? 
+What did you expect the app to do, and what did you see instead?
 
 **Add System logs:**
 

From 88d2038bc1573f7c0f6cae90b305f437c976cb6e Mon Sep 17 00:00:00 2001
From: Kaartic Sivaraam <sivaraam@users.noreply.github.com>
Date: Sat, 30 Jun 2018 20:17:09 +0530
Subject: [PATCH 10/11] Fix tamil translation of app name (#1679)

The app name has been 'Commons' (and not 'Wikimedia Commons') for a
very long time. For completely unknown reasons, the Tamil (ta)
translation of the app name stuck with the translation for 'Wikimedia
Commons' regardless of the fact that the translation had been
corrected at translatewiki.net in the year 2016. The correction
somehow didn't reflect here during the localisation updates from
tranlsatewiki.net.

Ignoring the weirdness, correct the translation of the app name
to reflect it's current name.
---
 app/src/main/res/values-ta/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 1b611137d..c3dd661c7 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">விக்கிமீடியா காமன்சு</string>
+  <string name="app_name">காமன்சு</string>
   <string name="menu_settings">அமைப்புகள்</string>
   <string name="username">பயனர் பெயர்</string>
   <string name="password">கடவுச்சொல்</string>

From d3f8ffa3080fc65db08d566f6514b6c7b047e432 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Mon, 2 Jul 2018 07:54:40 +0200
Subject: [PATCH 11/11] Localisation updates from https://translatewiki.net.

---
 app/src/main/res/values-ar/strings.xml  |  2 ++
 app/src/main/res/values-bn/strings.xml  |  2 ++
 app/src/main/res/values-pl/strings.xml  | 10 ++++++++++
 app/src/main/res/values-skr/strings.xml |  2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index fb18f34f2..237f1e3b8 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -144,4 +144,6 @@
   <string name="notifications_talk_page_message">%1$s رسالة على صفحة الحديث</string>
   <string name="notifications_mention">%1$s ذكر لك على %2$s.</string>
   <string name="share_app_title">شارك التطبيق</string>
+  <string name="appwidget_img">صورة اليوم</string>
+  <string name="app_widget_heading">صورة اليوم</string>
 </resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index c412c11c2..1284867be 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -257,6 +257,8 @@
   <string name="no_internet">ইন্টারনেট অনুপলব্ধ</string>
   <string name="internet_established">ইন্টারনেট উপলব্ধ</string>
   <string name="no_notifications">কোন বিজ্ঞপ্তি পাওয়া যায়নি</string>
+  <string name="about_translate_title">ভাষাসমূহ</string>
+  <string name="about_translate_cancel">বাতিল</string>
   <string name="retry">পুনঃচেষ্টা করুন</string>
   <string name="showcase_view_got_it_button">বুঝেছি!</string>
   <string name="no_images_found">কোন চিত্র পাওয়া যায়নি!</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 975cf23b0..8edd29ac6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -94,6 +94,7 @@
   <string name="categories_activity_title">Kategorie</string>
   <string name="title_activity_settings">Ustawienia</string>
   <string name="title_activity_signup">Zarejestruj się</string>
+  <string name="title_activity_featured_images">Wyróżniony obrazek</string>
   <string name="menu_about">O aplikacji</string>
   <string name="about_license">Aplikacja Wikimedia Commons jest oprogramowaniem typu open-source tworzonym i rozwijanym przez stypendystów i wolontariuszy ze społeczności Wikimedii. Fundacja Wikimedia nie bierze udziału w tworzeniu, rozwijaniu ani utrzymywaniu aplikacji.</string>
   <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Kod źródłowy&lt;/a&gt; oraz &lt;a href=\"https://commons-app.github.io/\"&gt;strona internetowa&lt;/a&gt; na GitHub. Aby zgłosić błąd lub sugestię, utwórz nowe &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;zgłoszenie na GitHub&lt;/a&gt;.</string>
@@ -159,6 +160,7 @@
   <string name="detail_license_empty">Nieznana licencja</string>
   <string name="menu_refresh">Odśwież</string>
   <string name="read_storage_permission_rationale" fuzzy="true">Wymagane uprawnienia: odczyt z dysku zewnętrznego. Aplikacja nie będzie w stanie funkcjonować bez tego.</string>
+  <string name="write_storage_permission_rationale">Wymagane uprawnienia: odczyt z dysku zewnętrznego. Aplikacja nie będzie w stanie funkcjonować bez tego.</string>
   <string name="location_permission_rationale">Opcjonalne zezwolenie: uzyskiwanie bieżącej lokalizacji dla wygenerowania propozycji kategorii</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Pobliskie miejsca</string>
@@ -175,6 +177,7 @@
   <string name="media_detail_uploaded_date">Data przesłania</string>
   <string name="media_detail_license">Licencja</string>
   <string name="media_detail_coordinates">Współrzędne</string>
+  <string name="media_detail_coordinates_empty">Nie dostarczone</string>
   <string name="become_a_tester_title">Zostań beta-testerem</string>
   <string name="become_a_tester_description">Dołącz do kanału bety w Google Play i dostań wczesny dostęp do nowych funkcji i łatek</string>
   <string name="_2fa_code">Kod 2FA</string>
@@ -205,12 +208,15 @@
   <string name="navigation_item_logout">Wyloguj</string>
   <string name="navigation_item_info">Samouczek</string>
   <string name="navigation_item_notification">Powiadomienia</string>
+  <string name="navigation_item_featured_images">Wyróżnione</string>
   <string name="no_description_found">nie znaleziono opisu</string>
   <string name="nearby_info_menu_wikidata_article">Element Wikidanych</string>
   <string name="nearby_info_menu_wikipedia_article">Artykuł na Wikipedii</string>
   <string name="title_info">Podaj krótką, opisową i unikalną nazwę, która będzie służyła jako nazwa pliku. Możesz używać prostego języka i spacji. Nie dodawaj rozszerzenia pliku.</string>
+  <string name="give_permission">Uzyskaj uprawnienie</string>
   <string name="login_to_your_account">Zaloguj się na swoje konto</string>
   <string name="null_url">Błąd! Nie znaleziono adresu URL</string>
+  <string name="nominate_deletion">Zgłoszone do usunięcia</string>
   <string name="nominated_for_deletion">Ta grafika została zgłoszona do usunięcia.</string>
   <string name="view_browser">Otwórz w przeglądarce</string>
   <string name="notifications_welcome">Witamy w Wikimedia Commons, %1$s! Cieszymy się, że tu jesteś.</string>
@@ -225,9 +231,13 @@
   <string name="welcome_skip_button">Pomiń samouczek</string>
   <string name="no_notifications">Nie znaleziono powiadomień</string>
   <string name="about_translate_title">Języki</string>
+  <string name="about_translate_proceed">Dalej</string>
   <string name="about_translate_cancel">Anuluj</string>
+  <string name="retry">Ponów próbę</string>
+  <string name="showcase_view_got_it_button">Wszystko jasne!</string>
   <string name="no_images_found">Nie znaleziono grafik!</string>
   <string name="error_loading_images">Wystąpił błąd podczas ładowania grafik.</string>
+  <string name="image_uploaded_by">Przesłano przez $1</string>
   <string name="menu_set_wallpaper">Ustaw tapetę</string>
   <string name="wallpaper_set_successfully">Tapeta ustawiona pomyślnie!</string>
 </resources>
diff --git a/app/src/main/res/values-skr/strings.xml b/app/src/main/res/values-skr/strings.xml
index 7a4dffb41..ddb88636a 100644
--- a/app/src/main/res/values-skr/strings.xml
+++ b/app/src/main/res/values-skr/strings.xml
@@ -20,7 +20,7 @@
   <string name="login_success">لاگ ان کامیاب!</string>
   <string name="login_failed">لاگ ان ناکام!</string>
   <string name="upload_failed">فائل کائنی لبھی،ٻئی فائل کیتے کوشش کرو۔</string>
-  <string name="authentication_failed" fuzzy="true">تصدیق ناکام!</string>
+  <string name="authentication_failed">تصدیق ناکام، ولدا لاڳ ان تھیوو</string>
   <string name="uploading_started">اپ لوڈ شروع!</string>
   <string name="upload_completed_notification_title">%1$s اپ لوڈ تھی ڳیا!</string>
   <string name="upload_completed_notification_text">آپݨی اپلوڈ ݙیکھݨ کیتے ٹیپ کرو</string>