Merge remote-tracking branch 'upstream/master'

Author: albendz

ISSUE_TEMPLATE.md

@@ -1,25 +1,18 @@
-_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?
+How can we reproduce the issue? 
+What did you expect the app to do, and what did you see instead?
 
 **Add System logs:**
 
 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 +21,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:** 
 

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'

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java

@@ -276,17 +276,25 @@ private void setUploadCount() {
                 .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);
     }
 
 

app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java

@@ -74,13 +74,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
             //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()

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>

app/src/main/res/values-bn/error.xml

@@ -3,6 +3,7 @@
 * Aftabuzzaman
 * Bellayet
 * Sankarshan
+* আফতাবুজ্জামান
 -->
 <resources>
   <string name="crash_dialog_title">কমন্স ক্র্যাশ করেছে</string>

app/src/main/res/values-bn/strings.xml

@@ -9,6 +9,7 @@
 * Rasal Lia
 * Sankarshan
 * Tauhid16
+* আফতাবুজ্জামান
 -->
 <resources>
   <string name="preference_category_appearance">অবয়ব</string>
@@ -256,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>

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>

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>

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>