Merge branch 'main' into fix-warning-folder-and-image

app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.kt

@@ -64,6 +64,9 @@ class ExploreFragment : CommonsDaggerSupportFragment() {
             override fun onPageScrollStateChanged(state: Int) = Unit
             override fun onPageSelected(position: Int) {
                 binding!!.viewPager.canScroll = position != 2
+                if (position == 2) {
+                    mapRootFragment?.requestLocationIfNeeded()
+                }
             }
         })
         setTabs()
@@ -171,14 +174,12 @@ class ExploreFragment : CommonsDaggerSupportFragment() {
             // if on Map tab, show all menu options, else only show search
             binding!!.viewPager.addOnPageChangeListener(object : OnPageChangeListener {
                 override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) = Unit
-
+                override fun onPageScrollStateChanged(state: Int) = Unit
                 override fun onPageSelected(position: Int) {
-                    others.setVisible((position == 2))
+                    binding!!.viewPager.canScroll = position != 2
-                }
+                    others.setVisible(position == 2)
-
+                    if (position == 2) {
-                override fun onPageScrollStateChanged(state: Int) {
+                        mapRootFragment?.requestLocationIfNeeded()
-                    if (state == ViewPager.SCROLL_STATE_IDLE && binding!!.viewPager.currentItem == 2) {
-                        onPageSelected(2)
                     }
                 }
             })
@@ -194,7 +195,6 @@ class ExploreFragment : CommonsDaggerSupportFragment() {
      */
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         // Handle item selection
-
         when (item.itemId) {
             R.id.action_search -> {
                 startActivityWithFlags(requireActivity(), SearchActivity::class.java)
@@ -224,6 +224,4 @@ class ExploreFragment : CommonsDaggerSupportFragment() {
             retainInstance = true
         }
     }
-}
+}
-
-

app/src/main/java/fr/free/nrw/commons/explore/ExploreMapRootFragment.kt

@@ -193,9 +193,20 @@ class ExploreMapRootFragment : CommonsDaggerSupportFragment, MediaDetailProvider
         binding = null
     }
 
+    fun requestLocationIfNeeded() {
+        mapFragment?.requestLocationIfNeeded()
+    }
+
+    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
+        super.setUserVisibleHint(isVisibleToUser)
+        if (isVisibleToUser) {
+            requestLocationIfNeeded()
+        }
+    }
+
     companion object {
         fun newInstance(): ExploreMapRootFragment = ExploreMapRootFragment().apply {
             retainInstance = true
         }
     }
-}
+}

app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.kt

@@ -269,23 +269,18 @@ class ExploreMapFragment : CommonsDaggerSupportFragment(), ExploreMapContract.Vi
 
             override fun onZoom(event: ZoomEvent?): Boolean = false
         })
-        if (!locationPermissionsHelper!!.checkLocationPermission(requireActivity())) {
+        // removed tha permission check here to prevent it from running on fragment creation
-            askForLocationPermission()
-        }
     }
 
     override fun onResume() {
         super.onResume()
         binding!!.mapView.onResume()
         presenter!!.attachView(this)
-        registerNetworkReceiver()
+        locationManager.addLocationListener(this)
-        if (isResumed) {
+        if (broadcastReceiver != null) {
-            if (locationPermissionsHelper!!.checkLocationPermission(requireActivity())) {
+            requireActivity().registerReceiver(broadcastReceiver, intentFilter)
-                performMapReadyActions()
-            } else {
-                startMapWithoutPermission()
-            }
         }
+        setSearchThisAreaButtonVisibility(false)
     }
 
     override fun onPause() {
@@ -294,6 +289,38 @@ class ExploreMapFragment : CommonsDaggerSupportFragment(), ExploreMapContract.Vi
         unregisterNetworkReceiver()
     }
 
+    fun requestLocationIfNeeded() {
+        if (!isVisible) return  //  skips if not visible to user
+        if (locationPermissionsHelper!!.checkLocationPermission(requireActivity())) {
+            if (locationPermissionsHelper!!.isLocationAccessToAppsTurnedOn()) {
+                locationManager.registerLocationManager()
+                drawMyLocationMarker()
+            } else {
+                locationPermissionsHelper!!.showLocationOffDialog(requireActivity(), R.string.location_off_dialog_text)
+            }
+        } else {
+            locationPermissionsHelper!!.requestForLocationAccess(
+                R.string.location_permission_title,
+                R.string.location_permission_rationale
+            )
+        }
+    }
+
+    private fun drawMyLocationMarker() {
+        val location = locationManager.getLastLocation()
+        if (location != null) {
+            val geoPoint = GeoPoint(location.latitude, location.longitude)
+            val startMarker = Marker(binding!!.mapView).apply {
+                setPosition(geoPoint)
+                setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
+                icon = ContextCompat.getDrawable(requireContext(), R.drawable.current_location_marker)
+                title = "Your Location"
+                textLabelFontSize = 24
+            }
+            binding!!.mapView.overlays.add(startMarker)
+            binding!!.mapView.invalidate()
+        }
+    }
 
     /**
      * Unregisters the networkReceiver
@@ -1079,7 +1106,24 @@ class ExploreMapFragment : CommonsDaggerSupportFragment(), ExploreMapContract.Vi
 
     override fun onLocationPermissionDenied(toastMessage: String) = Unit
 
-    override fun onLocationPermissionGranted() = Unit
+    override fun onLocationPermissionGranted() {
+        if (locationPermissionsHelper!!.isLocationAccessToAppsTurnedOn()) {
+            locationManager.registerLocationManager()
+            drawMyLocationMarker()
+        } else {
+            locationPermissionsHelper!!.showLocationOffDialog(requireActivity(), R.string.location_off_dialog_text)
+        }
+        onLocationChanged(LocationChangeType.PERMISSION_JUST_GRANTED, null)
+    }
+
+    fun onLocationChanged(locationChangeType: LocationChangeType, location: Location?) {
+        if (locationChangeType == LocationChangeType.PERMISSION_JUST_GRANTED) {
+            val curLatLng = locationManager.getLastLocation() ?: getMapCenter()
+            populatePlaces(curLatLng)
+        } else {
+            presenter!!.updateMap(locationChangeType)
+        }
+    }
 
     companion object {
         fun newInstance(): ExploreMapFragment {

app/src/main/res/layout/dialog_select_language.xml

@@ -12,7 +12,7 @@
     android:layout_marginStart="8dp"
     android:layout_marginTop="8dp"
     android:layout_marginEnd="8dp"
-    android:hint="Type Language Name"
+    android:hint="@string/language_search_type_language_name"
     android:padding="12dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
@@ -22,7 +22,7 @@
     android:id="@+id/recent_searches"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
-    android:text="Recent Searches"
+    android:text="@string/language_search_recent_searches"
     app:layout_constraintTop_toBottomOf="@id/search_language"
     app:layout_constraintEnd_toEndOf="@+id/language_history_list"
     android:layout_marginEnd="8dp"
@@ -55,7 +55,7 @@
     android:id="@+id/all_languages"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
-    android:text="All Languages"
+    android:text="@string/language_search_all_languages"
     app:layout_constraintTop_toBottomOf="@id/separator"
     app:layout_constraintEnd_toEndOf="@+id/language_history_list"
     android:layout_margin="8dp"

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

@@ -369,5 +369,6 @@
   <string name="check_category_success_message">Versoek kategorie-toets vir %1$s</string>
   <string name="upload_nearby_place_found_title">Nabygeleë plek gevind</string>
   <string name="upload_nearby_place_found_description_singular" fuzzy="true">Is dit \'n foto van Plek %1$s?</string>
+  <string name="location_permission_rationale">Opsionele toestemming: kry die huidige ligging vir kategorievoorstelle</string>
   <string name="full_screen_mode_zoom_info">Brug to fingre for at zoome ind og ud.</string>
 </resources>

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

@@ -767,6 +767,7 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments هي مسابقة صور دولية للآثار تنظمها ويكيميديا</string>
   <string name="need_permission">تحتاج إذن</string>
   <string name="read_phone_state_permission_message">تحتاج الخرائط المجاورة لقراءة PHONE STATE لتعمل بشكل صحيح</string>
+  <string name="location_permission_rationale">صلاحية اختيارية: احصل على الموقع الحالي لاقتراحات التصنيفات</string>
   <string name="contributions_of_user">مساهمات المستخدم: %s</string>
   <string name="achievements_of_user">إنجازات المستخدم: %s</string>
   <string name="menu_view_user_page">اعرض صفحة المستخدم</string>

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

@@ -442,8 +442,8 @@
   <string name="review_category">¿Ta correchamente categorizáu?</string>
   <string name="review_spam">¿Axústase a la tema?</string>
   <string name="review_thanks">¿Quies dar les gracies al collaborador?</string>
-  <string name="review_spam_explanation">Pulsia NON para nomar esta imaxe pa desaniciar si nun ye pa nada útil.</string>
+  <string name="review_spam_explanation">Calca NON para nomar esta imaxe pa desaniciar si nun ye pa nada útil.</string>
-  <string name="review_copyright_explanation">Los logotipos, les imáxenes de pantalla y los cartelos de películes son davezu infracciones a los derechos d\'autor.\nPulsia NON para nomar esta imaxe pa desaniciar</string>
+  <string name="review_copyright_explanation">Los logotipos, les imáxenes de pantalla y los cartelos de películes son davezu infracciones a los derechos d\'autor.\nCalca NON para nomar esta imaxe pa desaniciar</string>
   <string name="review_thanks_explanation">El to agradecimientu animara a %1$s</string>
   <string name="review_no_category">¡Ai, esto nun ta siquier categorizao!</string>
   <string name="review_category_explanation">Esta imaxe ta baxo %1$s categoríes.</string>
@@ -537,4 +537,5 @@
   <string name="nearby_no_results">Nun s\'alcontraron llugares, tenta cambiar los criterios de gueta.</string>
   <string name="confirm">Confirmar</string>
   <string name="instructions_title">Instrucciones</string>
+  <string name="location_permission_rationale">Permisu opcional: llograr l\'allugamientu actual pa suxerir categoríes</string>
 </resources>

app/src/main/res/values-b+sr+Latn/strings.xml

@@ -647,6 +647,7 @@
   <string name="wlm_campaign_title">Viki voli spomenike</string>
   <string name="wlm_campaign_description">Viki voli spomenike je međunarodno takmičenje fotografija spomenika, koje organizuje Vikimedija</string>
   <string name="need_permission">Potrebna je dozvola</string>
+  <string name="location_permission_rationale">Neobavezna dozvola: preuzmi trenutnu lokaciju za predloge kategorija</string>
   <string name="contributions_of_user">Doprinosi korisnika/ce: %s</string>
   <string name="achievements_of_user">Dostignuća korisnika/ce: %s</string>
   <string name="menu_view_user_page" fuzzy="true">Prikaži korisničku stranicu</string>

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

@@ -257,4 +257,5 @@
   <string name="about_translate_title">Телдәр</string>
   <string name="about_translate_cancel">Кире алырға</string>
   <string name="retry">Ҡабатларға</string>
+  <string name="location_permission_rationale">Мотлаҡ булмаған рөхсәт: категория тәҡдиме өсөн ошо урынды алыу</string>
 </resources>

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

@@ -534,6 +534,7 @@
   <string name="learn_more">আরও জানুন</string>
   <string name="wlm_campaign_title">উইকি লাভস মনুমেন্টস</string>
   <string name="need_permission">অনুমতি দরকার</string>
+  <string name="location_permission_rationale">ঐচ্ছিক অনুমতি: বিষয়শ্রেণী পরামর্শের জন্য বর্তমান অবস্থান নেয়</string>
   <string name="contributions_of_user">ব্যবহারকারীর অবদান: %s</string>
   <string name="achievements_of_user">ব্যবহারকারীর অর্জন: %s</string>
   <string name="menu_view_user_page" fuzzy="true">ব্যবহারকারীর পাতা দেখুন</string>

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

@@ -435,6 +435,7 @@
   <string name="back">Distreiñ</string>
   <string name="welcome_custom_selector_ok">Fiskal</string>
   <string name="learn_more">GOUZOUT HIROC\'H</string>
+  <string name="location_permission_rationale">Aotre diret : kaout al lec\'hiadur red evit kinnig rummadoù</string>
   <string name="contributions_of_user">Degasadennoù an implijer: %s</string>
   <string name="achievements_of_user">Taolioù-kaer an implijer: %s</string>
   <string name="menu_view_user_page">Gwelet profil an implijer</string>

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

@@ -184,4 +184,5 @@
   <string name="about_faq">ČPP</string>
   <string name="about_translate">Prevedi</string>
   <string name="about_translate_title">Jezici</string>
+  <string name="location_permission_rationale">Neobavezna dozvola: Dobavljanje trenutne lokacije za predlaganje kategorija</string>
 </resources>

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

@@ -447,4 +447,5 @@
   <string name="back">Enrere</string>
   <string name="welcome_custom_selector_ok">Fantàstic</string>
   <string name="display_monuments">Mostra els monuments</string>
+  <string name="location_permission_rationale">Permís opcional: obtén la ubicació actual per al suggeriment de categories</string>
 </resources>

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

@@ -739,6 +739,7 @@
   <string name="wlm_campaign_description">Wiki miluje památky je mezinárodní soutěž týkající se památek, organizovaná Wikimedií</string>
   <string name="need_permission">Je vyžadováno oprávnění</string>
   <string name="read_phone_state_permission_message">Mapy v okolí potřebují ke správné funkčnosti číst STAV TELEFONU</string>
+  <string name="location_permission_rationale">Volitelně: Umožněte aplikaci, aby získávala aktuální polohu a nabízela na jejím základě kategorie</string>
   <string name="contributions_of_user">Příspěvky uživatele: %s</string>
   <string name="achievements_of_user">Úspěchy uživatele: %s</string>
   <string name="menu_view_user_page">Zobrazit profil uživatele</string>

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

@@ -301,6 +301,7 @@
   <string name="description">Disgrifiad</string>
   <string name="title_page_bookmarks_items">Eitemau</string>
   <string name="learn_more">DYSGU MWY</string>
+  <string name="location_permission_rationale">Caniatad opsiynol: Ceisio\'r lleoliad cyfoes ar gyfer categoriau</string>
   <string name="reset">Ailosod</string>
   <string name="explore_map_details">Manylion</string>
   <string name="api_level">Lefel API</string>

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

@@ -705,6 +705,7 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments er en international fotokonkurrence for monumenter arrangeret af Wikimedia</string>
   <string name="need_permission">Har brug for tilladelse</string>
   <string name="read_phone_state_permission_message">\"I nærheden\"-kort har brug for at aflæse TELEFON TILSTAND for at fungere ordentlig</string>
+  <string name="location_permission_rationale">Valgfri tilladelse: Hent nuværende position for kategoriforslag</string>
   <string name="contributions_of_user">Bidrag fra bruger: %s</string>
   <string name="achievements_of_user">Præstationer af bruger: %s</string>
   <string name="menu_view_user_page">Vis brugerprofil</string>

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

@@ -736,6 +736,7 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments ist ein internationaler Fotowettbewerb für Denkmäler, der von Wikimedia organisiert wird.</string>
   <string name="need_permission">Erlaubnis erforderlich</string>
   <string name="read_phone_state_permission_message">Karten in der Nähe müssen den Telefonstatus lesen können, um richtig zu funktionieren</string>
+  <string name="location_permission_rationale">Optionale Berechtigung: Ruft den aktuellen Standort für Kategorievorschläge ab</string>
   <string name="contributions_of_user">Beiträge von Benutzer: %s</string>
   <string name="achievements_of_user">Erfolge des Benutzers: %s</string>
   <string name="menu_view_user_page">Benutzerseite ansehen</string>

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

@@ -717,6 +717,7 @@
   <string name="wlm_campaign_description">Το Wiki Loves Monuments είναι ένας διεθνής διαγωνισμός φωτογραφίας για μνημεία που διοργανώνεται από το Wikimedia</string>
   <string name="need_permission">Χρειάζεται άδεια</string>
   <string name="read_phone_state_permission_message">Οι κοντινοί χάρτες πρέπει να διαβάζουν PHONE STATE για να λειτουργούν σωστά</string>
+  <string name="location_permission_rationale">Προαιρετική άδεια: Ανάκτηση τρέχουσας θέσης σας για προτάσεις κατηγοριών</string>
   <string name="contributions_of_user">Συνεισφορές χρήστη: %s</string>
   <string name="achievements_of_user">Επιτεύγματα χρήστη: %s</string>
   <string name="menu_view_user_page">Προβολή σελίδας χρήστη</string>

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

@@ -687,6 +687,7 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments estas internacia fotokonkurso por monumentoj, organizita de Vikimedio</string>
   <string name="need_permission">Bezonas Permeson</string>
   <string name="read_phone_state_permission_message">Mapoj de Apude bezonas legi TELEFONAN STATON por funkcii bone</string>
+  <string name="location_permission_rationale">Laŭvola permeso: Akiri aktualan lokon por sugestoj pri kategorio</string>
   <string name="contributions_of_user">Kontribuoj de Uzanto: %s</string>
   <string name="achievements_of_user">Atingoj de Uzanto: %s</string>
   <string name="menu_view_user_page" fuzzy="true">Vidi la uzantopaĝon</string>

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

@@ -750,6 +750,7 @@
   <string name="wlm_campaign_description">Wiki loves monuments es un consurso internacional de fotografías de monumentos organizado por Wikimedia</string>
   <string name="need_permission">Necesita Permiso</string>
   <string name="read_phone_state_permission_message">Los mapas cercanos necesitan leer ESTADO DEL TELÉFONO para funcionar correctamente</string>
+  <string name="location_permission_rationale">Permiso opcional: obtener la ubicación actual para sugerir categorías</string>
   <string name="contributions_of_user">Contribuciones del usuario: %s</string>
   <string name="achievements_of_user">Logros del usuario: %s</string>
   <string name="menu_view_user_page">Ver perfil de usuario</string>

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

@@ -375,5 +375,6 @@
   <string name="leaderboard_column_count">Zenbaketa</string>
   <string name="leaderboard_upload">Igo</string>
   <string name="leaderboard_nearby">Hurbilekoak</string>
+  <string name="location_permission_rationale">Aukerako baimena: momentuko kokapena zehaztu kategoriak iradokitzeko</string>
   <string name="contributions_of_user">Erabiltzailearen ekarpenak: %s</string>
 </resources>

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

@@ -494,6 +494,7 @@
   <string name="display_monuments">نمایش یادمان‌ها</string>
   <string name="wlm_month_message">این ماه، ماه «ویکی دوست‌دار یادمان‌ها» است!</string>
   <string name="learn_more">بیشتر بدانید</string>
+  <string name="location_permission_rationale">اجازه‌های اختیاری: دریافت موقعیت برای پیشنهاد رده</string>
   <string name="menu_view_user_page" fuzzy="true">نمایش صفحهٔ کاربر</string>
   <string name="advanced_options">گزینه‌های پیشرفته</string>
   <string name="apply">اعمال</string>

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

@@ -656,6 +656,7 @@
   <string name="custom_selector_already_uploaded_image_text">Tämä kuva on jo ladattu Commonsiin.</string>
   <string name="learn_more">LUE LISÄÄ</string>
   <string name="need_permission">Tarvitaan käyttöoikeus</string>
+  <string name="location_permission_rationale">Valinnainen lupa: Saada tämänhetkinen sijainti loukkasuosituksia varten.</string>
   <string name="contributions_of_user">Käyttäjän muokkaukset: %s</string>
   <string name="achievements_of_user">Käyttäjän saavutukset: %s</string>
   <string name="menu_view_user_page">Näytä käyttäjäprofiili</string>

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

@@ -747,6 +747,7 @@
   <string name="wlm_campaign_description">« Wiki aime les monuments » est un concours international de photographie des monuments, organisé par Wikimédia.</string>
   <string name="need_permission">Nécessite une permission</string>
   <string name="read_phone_state_permission_message">Les cartes de proximité doivent pouvoir lire l’ÉTAT DU TÉLÉPHONE pour fonctionner correctement</string>
+  <string name="location_permission_rationale">Autorisation facultative : obtenir l’emplacement actuel pour des suggestions de catégorie</string>
   <string name="contributions_of_user">Contributions de l’utilisateur : %s</string>
   <string name="achievements_of_user">Réussites de l’utilisateur : %s</string>
   <string name="menu_view_user_page">Afficher le profil de l\'utilisateur</string>

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

@@ -139,4 +139,5 @@
   <string name="navigation_item_logout">Ufmelde</string>
   <string name="nearby_info_menu_commons_article" fuzzy="true">Commons-artiikel</string>
   <string name="nearby_info_menu_wikidata_article" fuzzy="true">WikiData-artiikel</string>
+  <string name="location_permission_rationale">Mögelk rocht: Rept di aktuel plak för kategoriiföörslacher ap.</string>
 </resources>

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

@@ -531,4 +531,5 @@
   <string name="leaderboard_upload">Enviar</string>
   <string name="leaderboard_my_rank_button_text">A miña clasificación</string>
   <string name="limited_connection_enabled">Activouse o modo de conexión limitadoǃ</string>
+  <string name="location_permission_rationale">Permiso opcionalː obter a localización actual para suxerir categorías</string>
 </resources>

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

@@ -374,6 +374,7 @@
   <string name="category_edit_helper_show_edit_title_success">सफल</string>
   <string name="leaderboard_column_count">गणना</string>
   <string name="custom_selector_dismiss_limit_warning_button_text">रद्द करें</string>
+  <string name="location_permission_rationale">वैकल्पिक अनुमति: श्रेणी सुझाव हेतु वर्तमान स्थान ज्ञात करें</string>
   <string name="talk">वार्ता</string>
   <string name="are_you_sure_that_you_want_cancel_all_the_uploads">क्या आप वाकई सभी अपलोड रद्द करना चाहते हैं?</string>
   <string name="cancelling_all_the_uploads">सभी अपलोड रद्द किये जा रहे हैं...</string>

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

@@ -305,4 +305,5 @@
   <string name="leaderboard_column_rank">Mjesto</string>
   <string name="leaderboard_column_user">Suradnica/suradnik</string>
   <string name="avatar_set_unsuccessfully">Pogrješka pri postavljanju novoga avatara, molimo Vas, pokušajte ponovno.</string>
+  <string name="location_permission_rationale">Potrebno dopuštenje za određivanje trenutačne lokacije za prijedloge kategorija (nije obvezno)</string>
 </resources>

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

@@ -482,6 +482,7 @@
   <string name="limited_connection_disabled">Korlátozott kapcsolat-mód kikapcsolva. Függőben lévő feltöltések folytatása.</string>
   <string name="limited_connection_mode">Korlátozott kapcsolat mód</string>
   <string name="custom_selector_info_text1">Itt ellenőrizheted a már Commonsba feltöltött képeket.</string>
+  <string name="location_permission_rationale">Lehetséges engedély: Jelenlegi hely megszerzése, a kategóriajavaslatok lehetőségéért.</string>
   <string name="marking_as_not_for_upload">Megjelölés, mint nem feltöltendő</string>
   <string name="unmarking_as_not_for_upload">Nem feltöltendő megjelölés visszavonása</string>
   <string name="menu_view_report">Jelentés</string>

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

@@ -682,6 +682,7 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments adalah lomba foto internasional untuk monumen yang diselenggarakan oleh Wikimedia</string>
   <string name="need_permission">Membutuhkan Izin</string>
   <string name="read_phone_state_permission_message">Peta Sekitar harus membaca STATUS TELEPON untuk berfungsi dengan benar</string>
+  <string name="location_permission_rationale">Pilihan Izin: Lokasi saat ini untuk saran kategori</string>
   <string name="contributions_of_user">Kontribusi Pengguna: %s</string>
   <string name="achievements_of_user">Pencapaian Pengguna: %s</string>
   <string name="menu_view_user_page">Lihat profil pengguna</string>

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

@@ -656,6 +656,7 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments er alþjóðleg ljósmyndasamkeppni um myndir af minnismerkjum sem skipulögð er af Wikimedia</string>
   <string name="need_permission">Þarfnast heimildar</string>
   <string name="read_phone_state_permission_message">Kort í nágrenninu þurfa að geta lesið STÖÐU SÍMANS til að virka almennilega</string>
+  <string name="location_permission_rationale">Nauðsynlegar heimildir: Lesa núverandi staðsetningu til að geta stungið upp á flokkum</string>
   <string name="contributions_of_user">Framlög notanda: %s</string>
   <string name="achievements_of_user">Frammistaða notanda: %s</string>
   <string name="menu_view_user_page" fuzzy="true">Skoða notandasíðu</string>

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

@@ -724,6 +724,7 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments è un concorso internazionale di fotografia di monumenti organizzato da Wikimedia</string>
   <string name="need_permission">Autorizzazione/i richiesta/e</string>
   <string name="read_phone_state_permission_message">Le mappe vicine hanno bisogno di leggere lo STATO DEL TELEFONO per funzionare correttamente</string>
+  <string name="location_permission_rationale">Autorizzazione facoltativa: ottieni la posizione corrente per i suggerimenti di categoria</string>
   <string name="contributions_of_user">Contributi dell\'utente: %s</string>
   <string name="achievements_of_user">Traguardi dell\'utente: %s</string>
   <string name="menu_view_user_page">Vedi il profilo utente</string>

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

@@ -736,6 +736,7 @@
   <string name="wlm_campaign_description">ויקי אוהבת אתרי מורשת היא תחרות בין־לאומית לצילום אתרי מורשת שמאורגנת על־ידי ויקימדיה</string>
   <string name="need_permission">נדרשת הרשאה</string>
   <string name="read_phone_state_permission_message">מפות בסביבה זקוקות להרשאה מצב הטלפון כדי לפעול כראוי</string>
+  <string name="location_permission_rationale">הרשאה לא מחייבת: קבלת מיקום נוכחי בשביל הצעות קטגוריות</string>
   <string name="contributions_of_user">תרומות של המשתמש: %s</string>
   <string name="achievements_of_user">הישגי המשתמש: %s</string>
   <string name="menu_view_user_page">הצגת פרופיל המשתמש</string>

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

@@ -408,7 +408,7 @@
   <string name="deletion_reason_bad_for_my_privacy">自分のプライバシーを傷つけると気がつきました</string>
   <string name="deletion_reason_no_longer_want_public">以前とは考えが変わりました。今後は公衆の場で自分の画像を公開したくありません</string>
   <string name="deletion_reason_not_interesting">残念ですがこの画像は百科事典の目的に合いません</string>
-  <string name="uploaded_by_myself" fuzzy="true">私本人が%1$sにアップロードし、%2$d件の記事で使用されました。</string>
+  <string name="uploaded_by_myself">私本人が%1$sにアップロードし、少なくとも%2$d件の記事で使用されました。</string>
   <string name="no_uploads">コモンズへようこそ！\n\n追加ボタンを押して、ぜひご自分のメディアの初投稿をしましょう。</string>
   <string name="no_categories_selected">カテゴリが選択されていません</string>
   <string name="no_categories_selected_warning_desc">カテゴリを指定しない画像は使用されることがほとんどありません。ほんとうにカテゴリを選択しないまま作業を続けますか？</string>
@@ -425,7 +425,7 @@
   <string name="never_ask_again">以後、表示しない</string>
   <string name="display_location_permission_title">位置情報許可を請求</string>
   <string name="display_location_permission_explanation">通知カードで近くの場所を表示するたび、位置情報の使用を許可するかどうか尋ねる</string>
-  <string name="achievements_fetch_failed" fuzzy="true">何か問題が発生し、あなたの貢献を表示できませんでした</string>
+  <string name="achievements_fetch_failed">何か問題が発生し、貢献を表示できませんでした</string>
   <string name="achievements_fetch_failed_ultimate_achievement">たくさんの貢献をしていただいたのですが、件数が多すぎるため貢献度算出システムが処理できません。まさに究極の貢献をされました。</string>
   <string name="ends_on">終了日：</string>
   <string name="display_campaigns">キャンペーンを表示</string>
@@ -649,6 +649,7 @@
   <string name="done">完了</string>
   <string name="back">戻る</string>
   <string name="need_permission">権限が必要です</string>
+  <string name="location_permission_rationale">オプションの権限：カテゴリ候補のため現在の位置を取得する</string>
   <string name="menu_view_user_page">利用者プロフィールを表示</string>
   <string name="edit_depictions">題材を編集する</string>
   <string name="edit_categories">カテゴリを編集</string>

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

@@ -185,4 +185,5 @@
   <string name="search_recent_header">Golèkan mentas waé:</string>
   <string name="question">Pitakon</string>
   <string name="continue_message">Banjuraké</string>
+  <string name="location_permission_rationale">Palilah manasuka: Njupuk pernah saiki kanggo saran ing kategori</string>
 </resources>

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

@@ -495,6 +495,7 @@
   <string name="welcome_custom_selector_ok">შესანიშნავია</string>
   <string name="custom_selector_dismiss_limit_warning_button_text">უარყოფა</string>
   <string name="learn_more">მეტის გაგება</string>
+  <string name="location_permission_rationale">დამატებითი ნებართვა: მიმდინარე ადგილმდებარეობის განსაზღვრა კატეგორიის შემოთავაზებისთვის</string>
   <string name="explore_map_details">დეტალები</string>
   <string name="api_level">API დონე</string>
   <string name="android_version">Android-ის ვერსია</string>

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

@@ -201,4 +201,5 @@
   <string name="menu_search_button">Nadi</string>
   <string name="title_activity_search">Nadi</string>
   <string name="search_tab_title_categories">Taggayin</string>
+  <string name="location_permission_rationale">Tasiregt tafrayant: Awi adig amiran i yisumar n taggayt</string>
 </resources>

app/src/main/res/values-ko-rKP/strings.xml

@@ -290,4 +290,5 @@
   <string name="search_this_area">여기를 검색</string>
   <string name="nearby_card_permission_title">권한 요청</string>
   <string name="never_ask_again">다시는 묻지 않음</string>
+  <string name="location_permission_rationale">선택적 허가: 분류 추천을 위해 현재 위치를 가져옵니다.</string>
 </resources>

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

@@ -630,6 +630,7 @@
   <string name="custom_selector_limit_error_desc">오류: 업로드 제한에 도달했습니다</string>
   <string name="learn_more">더 알아보기</string>
   <string name="need_permission">권한 필요</string>
+  <string name="location_permission_rationale">선택적 권한: 분류 추천을 위해 현재 위치 정보를 가져옵니다.</string>
   <string name="contributions_of_user">사용자의 기여: %s</string>
   <string name="achievements_of_user">사용자 달성도: %s</string>
   <string name="menu_view_user_page">사용자 프로필 보기</string>

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

@@ -492,6 +492,7 @@
   <string name="wlm_campaign_title">Wiki Loves Monuments</string>
   <string name="wlm_campaign_description">Wiki Loves Monuments ass een internationale Fotosconcours fir Monumenter, dee vu Wikimedia organiséiert gëtt</string>
   <string name="need_permission">Autorisatioun gëtt gebraucht</string>
+  <string name="location_permission_rationale">Fakultativ Autorisatioun: Déi aktuell Plaz kréie fir Propose fir Kategorien</string>
   <string name="contributions_of_user">Kontributioune vum Benotzer: %s</string>
   <string name="achievements_of_user">Leeschtunge vum Benotzer: %s</string>
   <string name="menu_view_user_page">Benotzerprofil weisen</string>

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

@@ -667,6 +667,7 @@
   <string name="wlm_campaign_description">Viki myli paminklus yra tarptautinis nuotraukų konkursas, skirtas paminklams, kurį organizuoja Vikiteka</string>
   <string name="need_permission">Reikia leidimo</string>
   <string name="read_phone_state_permission_message">Netoliese žemėlapiai turi perskaityti TELENFONO BŪSENĄ, kad tinkamai funkcionuotų</string>
+  <string name="location_permission_rationale">Neprivaloma teisė: Gauti dabartinę vietovę, kad būtų pasiūlomos kategorijos</string>
   <string name="contributions_of_user">Naudotojo indėlis: %s</string>
   <string name="achievements_of_user">Naudotojo pasiekimai: %s</string>
   <string name="menu_view_user_page">Žiūrėti naudotojo puslapį</string>

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

@@ -701,6 +701,8 @@
   <string name="wlm_campaign_description">„Вики ги сака спомениците“ е меѓународен фотографски натпревар за споменици приреден од Викимедија</string>
   <string name="need_permission">Се бара дозвола</string>
   <string name="read_phone_state_permission_message">Картите со блиски места треба можат да ја прочитаат СОСТОЈБАТА НА ТЕЛЕФОНОТ за да работат правилно</string>
+  <string name="location_off_dialog_text">Вклучете ја вашата местоположба за да ги гледате околните места.</string>
+  <string name="location_permission_rationale">Дозвола по желба: Утврдување на тековната местоположба за предлагање категории</string>
   <string name="contributions_of_user">Придонеси на корисникот: %s</string>
   <string name="achievements_of_user">Достигнувања на корисникот: %s</string>
   <string name="menu_view_user_page">Погл. кориснички профил</string>

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

@@ -275,4 +275,5 @@
   <string name="done">တုဲဒှ်</string>
   <string name="back">ကလေင်</string>
   <string name="welcome_custom_selector_ok">သေသာတ်</string>
+  <string name="location_permission_rationale">အခေါင်မပိုင်ပြဳ: ကေတ် ဒတန်ဒၞာဲ မနွံဒၟံင်လၟုဟ် သွက်ဂွံစုတ် ပ္ဍဲကဏ္ဍ</string>
 </resources>

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

@@ -190,4 +190,5 @@
   <string name="about_rate_us" fuzzy="true"/>
   <string name="about_faq" fuzzy="true">सतत विचारले जाणारे प्रश्न</string>
   <string name="welcome_skip_button">ट्यूटोरियल वगळा</string>
+  <string name="location_permission_rationale">ऐच्छिक परवानगी:वर्ग सुचवण्यांसाठी सध्याचे स्थान मिळवा</string>
 </resources>

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

@@ -618,6 +618,7 @@
   <string name="wlm_month_message">Det er Wiki Loves Monuments-måneden!</string>
   <string name="learn_more">LÆR MER</string>
   <string name="need_permission">Trenger tillatelse</string>
+  <string name="location_permission_rationale">Valgfri tillatelse: Hent nåværende posisjon for kategoriforslag</string>
   <string name="contributions_of_user">Bidrag til bruker: %s</string>
   <string name="achievements_of_user">Prestasjoner til bruker: %s</string>
   <string name="menu_view_user_page" fuzzy="true">Vis brukerside</string>

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

@@ -324,6 +324,7 @@
   <string name="learn_more">थप जान्नुहोस्</string>
   <string name="wlm_campaign_title">विकी लभ्स मोनुमेन्टस्</string>
   <string name="need_permission">अनुमति आवश्यक</string>
+  <string name="location_permission_rationale">वैकल्पिक अनुमति: श्रेणी सुझावहरूको लागि हालको स्थान प्राप्त गर्नुहोस्</string>
   <string name="menu_view_user_page">प्रयोगकर्ता पृष्ठ हेर्नुहोस्</string>
   <string name="edit_categories">सम्पादन श्रेणीहरू</string>
   <string name="advanced_options">उन्नत विकल्प</string>

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

@@ -723,6 +723,8 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments is een internationale fotowedstrijd voor monumenten georganiseerd door Wikimedia</string>
   <string name="need_permission">Toestemming Nodig</string>
   <string name="read_phone_state_permission_message">Kaarten in de buurt moeten TELEFOONSTATUS lezen om goed te kunnen werken</string>
+  <string name="location_off_dialog_text">Schakel locatievoorzieningen in om plaatsen in de buurt te bekijken.</string>
+  <string name="location_permission_rationale">Optionele toestemming: Huidige locatie ophalen voor categoriesuggesties</string>
   <string name="contributions_of_user">Bijdragen door Gebruiker: %s</string>
   <string name="achievements_of_user">Prestaties van Gebruiker: %s</string>
   <string name="menu_view_user_page">Gebruikersprofiel bekijken</string>

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

@@ -578,6 +578,7 @@
   <string name="wlm_campaign_description">ߥߞߌ ߝߙߎߕߎ ߞߊ߬ߣߌ߲߬ߓߊ߮ ߟߎ߬ ߦߋ߫ ߡߊ߲߬ߕߏ߲߬ߕߍ߬ߦߊ ߖߌ߬ߦߊ߬ߓߍ ߛߊ߲ߞߊߢߐ߲߯ߦߊ ߟߋ߬ ߘߌ߫ ߡߍ߲ ߛߌ߲߬ߝߏ߲߬ߧߊ߬ߣߍ߲߫ ߦߋ߫ ߥߞߌߡߋߘߌߦߊ ߓߟߏ߫</string>
   <string name="need_permission">ߡߊ߬ߞߏ ߦߋ߫ ߟߊ߬ߘߌ߬ߢߍ߬ߟߌ ߟߊ߫</string>
   <string name="read_phone_state_permission_message">ߞߙߍ߬ߝߍ߬ ߔߊߔߘߊ (ߡߊߔߛ) ߡߊ߬ߞߏ ߦߋ߫ ߜߋߟߋ߲ߜߋߟߋ߲ ߞߊ߬ߝߏ ߘߐߞߊ߬ߙߊ߲ ߠߊ߫ ߞߊ߬ ߛߋ߫ ߓߊ߯ߙߊ߫ ߟߴߊ߬ ߢߊߓߘߍ ߡߊ߬</string>
+  <string name="location_permission_rationale">ߢߣߊߕߊߟߌ ߟߊ߬ߘߌ߬ߢߍ߬ߟߌ: ߕߋ߲߭ߕߋ߲߭ ߦߌߟߡߊ߫ ߦߌ߬ߘߊ߬ߣߍ߲ ߠߎ߬ ߘߌ߲߬ߞߌߙߊ ߟߊߛߐ߬ߘߐ߲߬.</string>
   <string name="contributions_of_user">ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %s: ߟߊ߫ ߓߟߏߡߊߜߍ߲</string>
   <string name="achievements_of_user">ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %s: ߟߊ߫ ߞߎ߲߬ߝߊ߰ߟߌ ߟߎ߬</string>
   <string name="menu_view_user_page" fuzzy="true">ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߫ ߞߐߜߍ ߦߋ߫</string>

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

@@ -739,6 +739,7 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments (Wiki Kocha Zabytki) to międzynarodowy konkurs fotograficzny skoncentrowany na zabytkach, organizowany przez Wikimedia</string>
   <string name="need_permission">Wymagane uprawnienie</string>
   <string name="read_phone_state_permission_message">Mapy znajdujące się w pobliżu muszą odczytywać STAN TELEFONU, aby działały poprawnie</string>
+  <string name="location_permission_rationale">Opcjonalne zezwolenie: uzyskiwanie bieżącej lokalizacji dla wygenerowania propozycji kategorii</string>
   <string name="contributions_of_user">Wkład użytkownika: %s</string>
   <string name="achievements_of_user">Osiągnięcia użytkownika: %s</string>
   <string name="menu_view_user_page">Wyświetl profil użytkownika</string>

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

@@ -697,6 +697,7 @@
   <string name="wlm_campaign_description">Wiki a-j veul bin ai monument a l\'é un concors antërnassional ëd fotografìa ëd monument organisà da Wikimedia</string>
   <string name="need_permission">A-i é damanca dël përmess</string>
   <string name="read_phone_state_permission_message">Le carte dj\'anviron a l\'han damanca ëd lese lë STAT DËL TELÉFON për marcé për da bin</string>
+  <string name="location_permission_rationale">Autorisassion facoltativa: Oten-e la posission atual për dij sugeriment ëd categorìa</string>
   <string name="contributions_of_user">Contribussion ëd l\'utent: %s</string>
   <string name="achievements_of_user">Arzultà ëd l\'utent: %s</string>
   <string name="menu_view_user_page">Vëdde ël profil ëd l\'utent</string>

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

@@ -211,6 +211,11 @@
   <string name="media_detail_coordinates">کورډيناټونه</string>
   <string name="media_detail_coordinates_empty">هېڅ نه دي چمتو شوي</string>
   <string name="become_a_tester_title">ازمېښتي ازمايښتگر شئ</string>
+  <string name="email_auth_code">برېښليک تاييد کوډ</string>
+  <string name="logout_verification">ايا تاسو په رښتيا له غونډاله وتل غواړئ؟</string>
+  <string name="mediaimage_failed">رسنۍ انځور نابرياله شو</string>
+  <string name="no_subcategory_found">هېڅ څېرمه‌وېشنيزې ونه موندل شوې</string>
+  <string name="no_parentcategory_found">هېڅ بنسټيزې وېشنيزې ونه موندل شوې</string>
   <string name="welcome_image_welcome_wikipedia">ويکيپېډيا ته ښه راغلئ</string>
   <string name="welcome_image_welcome_copyright">لمېسل‌رښتې هرکلی</string>
   <string name="cancel">ناگارل</string>
@@ -233,9 +238,23 @@
   <string name="nearby_info_menu_wikipedia_article">ويکيپېډيا ليکنه</string>
   <string name="upload_problem_image_dark">انځور ډېر تياره دی.</string>
   <string name="upload_problem_image_blurry">انځور ډېر جړ دی.</string>
+  <string name="upload_connection_error_alert_title">نښلېدا تېروتنه</string>
+  <string name="upload_problem_image">په انځور کې موندل شوې ستونزې</string>
+  <string name="send_log_file">يادښت دوتنه لېږل</string>
+  <string name="null_url">تېروتنه! وېبتړ ونه موندل شو</string>
+  <string name="nominate_deletion">ړنگېدو ته نوماند</string>
+  <string name="nominated_for_deletion">دا انځور ړنگېدو ته نوماند شوی دی.</string>
+  <string name="nominated_see_more">سپيناوي لپاره وېبپاڼه وگورئ</string>
   <string name="skip_login">تېرېدل</string>
   <string name="navigation_item_login">ننوتل</string>
   <string name="skip_login_title">آیا تاسو رښتیا غواړئ چې ننوتل پرېږدئ؟</string>
+  <string name="skip_login_message">په راتلونکي کې تاسو بايد د انځورونو راپورته کولو لپاره غونډال ته ننوځئ.</string>
+  <string name="login_alert_message">د دې ځانگړنې کارولو لپاره مهرباني وکړئ، غونډال ته ننوځئ</string>
+  <string name="copy_wikicode">ويکي‌ليک ټينگدړې ت ولمېسئ</string>
+  <string name="wikicode_copied">ويکي‌ليک ټينگدړې ته ولمېسل شو</string>
+  <string name="nearby_location_not_available">څېرمه ځايونه شايد په سمه توگه کار ونکړي، ځکه ځای د لاسرسي وړ نه دي.</string>
+  <string name="nearby_showing_pins_offline">اينټرنېټ د لاسرسي وړ نه دي. يوازې زېرمه شوي ځايونه ښيي.</string>
+  <string name="upload_location_access_denied">ځای لاسرسی ناگاره شو. مهرباني وکړئ د دې ځانگړنې کارولو لپاره خپل ځای په لاسي ډول واوڼئ.</string>
   <string name="nearby_directions">تگلوري</string>
   <string name="nearby_wikidata">ويکي‌اومتوک</string>
   <string name="nearby_wikipedia">ويکيپېډيا</string>
@@ -325,6 +344,10 @@
   <string name="deletion_reason_no_longer_want_public">زما اند توپير وکړ، زه نه غواړم چې دا نور په ټوليزه توگه ښکاره شي</string>
   <string name="deletion_reason_not_interesting">په بښنې سره دا انځور د يو پوهنغونډ لپاره خواپورې نه دی</string>
   <string name="no_categories_selected">هېڅ وېشنيزې نه دې ټاکل شوې</string>
+  <string name="search_this_area">دا سيمه وپلټئ</string>
+  <string name="nearby_card_permission_title">اجازې غوښتنه</string>
+  <string name="never_ask_again">دا بيا هېڅکله مه پوښته</string>
+  <string name="display_location_permission_title">د ځای غوښتنې پوښتل</string>
   <string name="ends_on">پای ته رسېږي په:</string>
   <string name="display_campaigns">ټاکنيزې‌سيالۍ ښکاره‌کول</string>
   <string name="display_campaigns_explanation">روانې ټاکنيزې‌سيالۍ وگورئ</string>
@@ -354,6 +377,18 @@
   <string name="review_spam_explanation">که دا انځور ټولگټی نه وي؛ نو ړنگېدو ته د نوماندولو لپاره يې په نه کليک وکړئ.</string>
   <string name="review_thanks_yes_button_text">بل انځور</string>
   <string name="review_thanks_no_button_text">هو، ولې نه</string>
+  <string name="no_image">هېڅ انځورونه کارېدلې نه دي</string>
+  <string name="no_image_reverted">هېڅ انځورونه په څټ‌گرځول‌شوي نه دي</string>
+  <string name="no_image_uploaded">هېڅ انځورونه راپورته‌شوې نه دي</string>
+  <string name="no_notification">تاسو هېڅ نالوستې خبرتياوې نه لرئ</string>
+  <string name="no_read_notification">تاسو هېڅ لوستې خبرتياوې نه لرئ</string>
+  <string name="share_logs_using">يادښتونه شريکول د لارې</string>
+  <string name="check_your_email_inbox">خپل پيغام بکس وگورئ</string>
+  <string name="menu_option_read">لوستي کتل</string>
+  <string name="menu_option_unread">نالوستي کتل</string>
+  <string name="error_occurred_in_picking_images">د انځورونو راخيستلو پرمهال تېروتنه پېښه شوه</string>
+  <string name="please_wait">مهرباني وکړئ په تمه شئ...</string>
+  <string name="copied_successfully">لمېسل‌شوی</string>
   <string name="exif_tag_name_author">ليکوال</string>
   <string name="exif_tag_name_copyright">لمېسل‌رېښتې</string>
   <string name="exif_tag_name_location">ځای</string>
@@ -434,9 +469,30 @@
   <string name="no_location_found_title">هېڅ ځای ونه موندل شو</string>
   <string name="add_location">ځای ورگډول</string>
   <string name="explore_map_details">سپيناوی</string>
+  <string name="api_level">ای‌پي‌آی کچه</string>
   <string name="android_version">اندرويد بلبڼه</string>
+  <string name="device_manufacturer">سولگر جوړوونکی</string>
+  <string name="device_model">سولگر نمونه</string>
   <string name="device_name">وسيلې نوم</string>
+  <string name="network_type">شبکې ډول</string>
   <string name="thanks_feedback">له غبرگون ورکولو مو مننه</string>
+  <string name="error_feedback">د غبرگون لېږلو پرمهال تېروتنه</string>
+  <string name="enter_description">ستاسو غبرگون څه دی؟</string>
+  <string name="your_feedback">ستاسو غبرگون</string>
+  <string name="mark_as_not_for_upload">د راپورته‌کولو لپاره نه دی، په توگه نښه کول</string>
+  <string name="unmark_as_not_for_upload">د راپورته‌کولو لپاره نه دی، په توگه نه نښه کول</string>
+  <string name="marking_as_not_for_upload">د راپورته‌کولو لپاره نه دی، په توگه نښه کول</string>
+  <string name="unmarking_as_not_for_upload">د راپورته‌کولو لپاره نه دی، په توگه نه نښه کول</string>
+  <string name="image_selected">ټاکل‌شوی انځور</string>
+  <string name="menu_view_report">راپور</string>
+  <string name="menu_view_set_white_background">سپين شاليد اوڼل</string>
+  <string name="menu_view_set_black_background">تور شاليد اوڼل</string>
+  <string name="report_violation">سرغړونې راپور</string>
+  <string name="report_user">د دې کارن راپور ورکول</string>
+  <string name="report_content">دا گڼون راپور کول</string>
+  <string name="request_user_block">د دې کارن د بنديز غوښتنه</string>
+  <string name="welcome_to_full_screen_mode_text">د ټول سکرين ټاکنې دريځ ته ښه راغلاست</string>
+  <string name="full_screen_mode_zoom_info">د نژدې‌کولو او لرې‌کولو لپاره دوه گوتې وکاروئ.</string>
   <string name="edit_image">انځور سمول</string>
   <string name="edit_location">ځای سمول</string>
   <string name="location_updated">ځای هم‌مهاله‌شو</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -706,6 +706,7 @@
   <string name="wlm_campaign_description">O Wiki Loves Monuments é um concurso internacional organizado pela Wikimedia sobre fotografias de monumentos</string>
   <string name="need_permission">Precisa de permissão</string>
   <string name="read_phone_state_permission_message">Os mapas próximos precisam ler ESTADO DO TELEFONE para funcionar corretamente</string>
+  <string name="location_permission_rationale">Permissão opcional: Obter a localização atual de sugestões de categoria</string>
   <string name="contributions_of_user">Contribuições do usuário: %s</string>
   <string name="achievements_of_user">Conquistas do usuário: %s</string>
   <string name="menu_view_user_page" fuzzy="true">Ver página de usuário</string>

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

@@ -715,6 +715,7 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments é um concurso internacional de fotografias de monumentos, organizado pela Wikimedia</string>
   <string name="need_permission">Necessitar de Permissão</string>
   <string name="read_phone_state_permission_message">Os mapas de locais próximos precisam de ler ESTADO DO TELEFONE para funcionar devidamente</string>
+  <string name="location_permission_rationale">Permissão opcional: obter a localização atual para sugestões de categoria</string>
   <string name="contributions_of_user">Contribuições do utilizador: %s</string>
   <string name="achievements_of_user">Realizações do utilizador: %s</string>
   <string name="menu_view_user_page">Ver perfil de utilizador</string>

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

@@ -97,6 +97,9 @@
   <string name="no_uploads_yet">Message shown on contribution list during non-first sync if no uploads present.</string>
   <string name="menu_retry_upload">Menu item text prompting user to retry a failed upload.\n{{Identical|Retry}}</string>
   <string name="menu_cancel_upload">Menu item text prompting user to cancel and delete a failed upload.\n{{Identical|Cancel}}</string>
+  <string name="language_search_type_language_name">Placeholder text in the top search box in the language search dialog.</string>
+  <string name="language_search_recent_searches">A title in the language search dialog.</string>
+  <string name="language_search_all_languages">A title in the language search dialog.</string>
   <string name="menu_download">Menu item text prompting user to download a selected photo or media file locally.\n{{Identical|Download}}</string>
   <string name="preference_license">{{Identical|License}}</string>
   <string name="use_previous">This is a button text. Concise wording is preferred (e.g. \"&amp;\" instead of \"and\"), where possible. It should ideally be rendered in one line, even on small devices.</string>
@@ -151,6 +154,7 @@
   <string name="navigation_item_notification">{{Identical|Notification}}</string>
   <string name="navigation_item_review">{{Identical|Review}}</string>
   <string name="upload_connection_error_alert_title">{{Identical/Connection Error}}</string>
+  <string name="preferences_uploads">A section title in preferences.</string>
   <string name="nominated_see_more">&lt;u&gt;See webpage for details&lt;/u&gt;</string>
   <string name="skip_login">{{Identical|Skip}}</string>
   <string name="navigation_item_login">{{Identical|Log in}}</string>

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

@@ -586,4 +586,5 @@
   <string name="leaderboard_my_rank_button_text">Rank-ul meu</string>
   <string name="read_help_link">Citiți mai multe</string>
   <string name="modify_location">Modifică locația</string>
+  <string name="location_permission_rationale">Permisiune opțională: Obțineți locația curentă pentru sugestiile de categorii</string>
 </resources>

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

@@ -763,6 +763,7 @@
   <string name="wlm_campaign_description">«Вики любит памятники» — международный фотоконкурс памятников, организованный Викимедиа</string>
   <string name="need_permission">Нужно разрешение</string>
   <string name="read_phone_state_permission_message">Для правильной работы картам поблизости необходимо иметь доступ к СОСТОЯНИЮ ТЕЛЕФОНА.</string>
+  <string name="location_permission_rationale">Необязательное разрешение: получение текущего местоположения для предложения категорий</string>
   <string name="contributions_of_user">Вклад участника: %s</string>
   <string name="achievements_of_user">Достижения участника: %s</string>
   <string name="menu_view_user_page">Посмотреть профиль участника</string>

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

@@ -340,4 +340,5 @@
   <string name="media_detail_in_all_languages">سڀ ٻوليون</string>
   <string name="label">ليبل</string>
   <string name="description">تشريح</string>
+  <string name="location_permission_rationale">چونڊ اجازت: زمرن جي تجويزن لاءِ ھاڻوڪي مڪانيت وٺو</string>
 </resources>

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

@@ -254,6 +254,7 @@
   <string name="share_app_title">Dijeli privitak</string>
   <string name="delete_helper_show_deletion_title_failed">Nije uspelo</string>
   <string name="delete_helper_ask_reason_copyright_logo">Logo</string>
+  <string name="location_permission_rationale">Dozvola po potrebi: Utvrđavanje trenutne lokacije za predlaganje kategorija</string>
   <string name="contributions_of_user">Doprinosi korisnika: %s</string>
   <string name="menu_view_user_page" fuzzy="true">Pregled korisničke stranice</string>
   <string name="edit_categories">Uredi kategorije</string>

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

@@ -702,6 +702,7 @@
   <string name="wlm_campaign_description">Wkki miluje monumenty je medzinárodná súťaž fotografií monumentov organizovaná Wikemédiou</string>
   <string name="need_permission">Potrebné povolenie</string>
   <string name="read_phone_state_permission_message">Blízke mapy potrebujú mať prístup k polohe telefónu, aby správne fungovali</string>
+  <string name="location_permission_rationale">Voliteľné oprávnenie: Umožniť aplikácii, aby získavala aktuálnu polohu a ponúkala na jej základe navrhované kategórie</string>
   <string name="contributions_of_user">Príspevky používateľa:  %s</string>
   <string name="achievements_of_user">Úspechy používateľa: %s</string>
   <string name="menu_view_user_page">Zobraziť profil používateľa</string>

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

@@ -718,6 +718,7 @@
   <string name="wlm_campaign_description">Viki obožuje spomenike je mednarodni fotografski natečaj za spomenike, ki ga organizira Fundacija Wikimedia.</string>
   <string name="need_permission">Potrebno je dovoljenje</string>
   <string name="read_phone_state_permission_message">Bližnji zemljevidi morajo za pravilno delovanje prebrati STANJE TELEFONA</string>
+  <string name="location_permission_rationale">Neobvezno dovoljenje: pridobitev trenutne lokacije za predlaganje kategorij</string>
   <string name="contributions_of_user">Prispevki uporabnika: %s</string>
   <string name="achievements_of_user">Dosežki uporabnika: %s</string>
   <string name="menu_view_user_page">Ogled uporabniškega profila</string>

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

@@ -664,6 +664,7 @@
   <string name="wlm_campaign_title">Вики воли споменике</string>
   <string name="wlm_campaign_description">Вики воли споменике је међународно такмичење фотографија споменика, које организује Викимедија</string>
   <string name="need_permission">Потребна је дозвола</string>
+  <string name="location_permission_rationale">Необавезна дозвола: преузми тренутну локацију за предлоге категорија</string>
   <string name="contributions_of_user">Доприноси корисника/це: %s</string>
   <string name="achievements_of_user">Достигнућа корисника/це: %s</string>
   <string name="menu_view_user_page">Прикажи корисничку страницу</string>

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

@@ -416,4 +416,5 @@
   <string name="dialog_box_text_nomination">Naha %1$s bet kudu dihapus?</string>
   <string name="review_is_uploaded_by">%1$s dimuat ku: %2$s</string>
   <string name="default_description_language">Basa dadaran baku</string>
+  <string name="location_permission_rationale">Idin pilihan: Paké lokasi kiwari pikeun usulan kategori</string>
 </resources>

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

@@ -706,6 +706,7 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments är en internationell fototävling för monument som organiseras av Wikimedia</string>
   <string name="need_permission">Behöver behörighet</string>
   <string name="read_phone_state_permission_message">Kartor i närheten behöver läsa TELEFONENS TILLSTÅND för att fungera ordentligt</string>
+  <string name="location_permission_rationale">Valfri behörighet: Hämta aktuell plats för kategoriförslag</string>
   <string name="contributions_of_user">Bidrag av användare: %s</string>
   <string name="achievements_of_user">Prestationer av användare: %s</string>
   <string name="menu_view_user_page">Visa användarprofil</string>

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

@@ -345,4 +345,5 @@
   <string name="read_help_link">ನನಾತ್ ಓದುಲೇ</string>
   <string name="media_detail_in_all_languages">ಮಾಂತಾ ಬಾಸೆಲೆಡ್</string>
   <string name="done">ಆಂಡ್</string>
+  <string name="location_permission_rationale">ಐಚ್ಛಿಕ ಅನುಮತಿ: ವರ್ಗೊ ಸಲಹೆಗ್ ಇತ್ತೆತ ಸ್ಥಳೊನ್ ಪಡೆಲೆ.</string>
 </resources>

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

@@ -609,6 +609,7 @@
   <string name="custom_selector_already_uploaded_image_text">ఈ బొమ్మను ఈసరికే కామన్స్ లోకి ఎక్కించారు.</string>
   <string name="learn_more">మరింత తెలుసుకోండి</string>
   <string name="need_permission">అనుమతి కావాలి</string>
+  <string name="location_permission_rationale">ఐచ్ఛిక అనుమతి: వర్గాల సూచనల కోసం ప్రస్తుత స్థలాన్ని తెచ్చుకో</string>
   <string name="contributions_of_user">వాడుకరి తోడ్పాట్లు: %s</string>
   <string name="achievements_of_user">వాడుకరి సాధించినవి: %s</string>
   <string name="menu_view_user_page" fuzzy="true">వాడుకరి పేజీ చూడండి</string>

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

@@ -428,6 +428,7 @@
   <string name="leaderboard_nearby">สถานที่ใกล้เคียง</string>
   <string name="cancelling_upload">กำลังยกเลิกอับโหลด…</string>
   <string name="cancel_upload">ยกเลิกอับโหลด</string>
+  <string name="location_permission_rationale">สิทธิทางเลือก: รับข้อมูลตำแหน่งที่ตั้งปัจจุบันสำหรับข้อเสนอแนะหมวดหมู่</string>
   <string name="api_level">API level</string>
   <string name="android_version">แอนดรอยด์เวอร์ชัน</string>
   <string name="device_model">รุ่นอุปกรณ์</string>

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

@@ -728,6 +728,7 @@
   <string name="wlm_campaign_description">Viki, Anıtları Seviyor; Wikimedia tarafından düzenlenen anıtlar için uluslararası bir fotoğraf yarışmasıdır.</string>
   <string name="need_permission">İzin Gerekiyor</string>
   <string name="read_phone_state_permission_message">Yakındaki haritalar düzgün çalışmak için TELEFON DURUMUNU okumaya ihtiyaç duyuyor</string>
+  <string name="location_permission_rationale">İsteğe bağlı izin: Kategori önerileri için geçerli konumu al</string>
   <string name="contributions_of_user">Kullanıcının katkıları: %s</string>
   <string name="achievements_of_user">Kullanıcının başarıları: %s</string>
   <string name="menu_view_user_page">Kullanıcı profilini görüntüle</string>

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

@@ -736,6 +736,7 @@
   <string name="wlm_campaign_description">Wiki Loves Monuments — це міжнародний фотоконкурс пам’яток, організований Вікімедією</string>
   <string name="need_permission">Потрібен дозвіл</string>
   <string name="read_phone_state_permission_message">Для належної роботи мапи поблизу мають відображати стан PHONE STATE</string>
+  <string name="location_permission_rationale">Додатковий дозвіл: отримувати поточне розташування для підказок категорій</string>
   <string name="contributions_of_user">Внесок користувача: %s</string>
   <string name="achievements_of_user">Досягнення користувача: %s</string>
   <string name="menu_view_user_page">Переглянути профіль користувача</string>

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

@@ -472,4 +472,5 @@
   <string name="use_location_from_similar_image">Ste do foto łe gheto fate in tel steso posto? Vuto doparar ła stesa latitudine/lonxitudine de l\'imajine a drita?</string>
   <string name="load_more">Carga \'ncora</string>
   <string name="nearby_no_results">No go catà nisun posto, pròa a canbiar la to riserca.</string>
+  <string name="location_permission_rationale">Autorixasion opsionałe: Dopara ła poxision corente par i sujerimenti de categoria</string>
 </resources>

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

@@ -470,6 +470,7 @@
   <string name="back">Trở lại</string>
   <string name="custom_selector_dismiss_limit_warning_button_text">Bỏ qua</string>
   <string name="custom_selector_button_limit_text">Tối đa: %1$d</string>
+  <string name="location_permission_rationale">Tùy chọn cấp phép: Định vị hiện tại để nhận gợi ý thể loại</string>
   <string name="apply">Áp dụng</string>
   <string name="reset">Mặc định lại</string>
   <string name="android_version">Phiên bản Android</string>

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

@@ -443,4 +443,5 @@
   <string name="theme_dark_name">რუმე</string>
   <string name="theme_light_name">თე</string>
   <string name="learn_more">უმოსიშ გაგება</string>
+  <string name="location_permission_rationale">გეძინელი ოჸია: მიმალი ორენიშ გოთანჯუა კატეგორიაშ მიორზიებელო</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -725,6 +725,8 @@
   <string name="wlm_campaign_description">維基愛古蹟是由維基媒體舉行的國際古蹟攝影比賽</string>
   <string name="need_permission">需要權限</string>
   <string name="read_phone_state_permission_message">附近地圖需要讀取手機狀態來正常運作</string>
+  <string name="location_off_dialog_text">請開啟定位服務，以查看附近的地點。</string>
+  <string name="location_permission_rationale">可有可無的權限：獲取目前的地理位置，以用於分類建議</string>
   <string name="contributions_of_user">使用者貢獻：%s</string>
   <string name="achievements_of_user">使用者成果：%s</string>
   <string name="menu_view_user_page">檢視使用者個人檔案</string>

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

@@ -758,6 +758,7 @@
   <string name="wlm_campaign_description">维基爱古迹是由维基媒体举行的国际古迹摄影比赛</string>
   <string name="need_permission">需要权限</string>
   <string name="read_phone_state_permission_message">附近地图需要读取手机状态权限以正常运行</string>
+  <string name="location_permission_rationale">可选权限：获取当前位置以提供分类建议</string>
   <string name="contributions_of_user">用户贡献：%s</string>
   <string name="achievements_of_user">用户成就：%s</string>
   <string name="menu_view_user_page">查看用户个人资料</string>

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

@@ -150,6 +150,9 @@
   <string name="no_uploads_yet">You have not yet uploaded any photos.</string>
   <string name="menu_retry_upload">Retry</string>
   <string name="menu_cancel_upload">Cancel</string>
+  <string name="language_search_type_language_name">Type Language Name</string>
+  <string name="language_search_recent_searches">Recent Searches</string>
+  <string name="language_search_all_languages">All Languages</string>
   <string name="media_upload_policy">By submitting this picture, I declare that this is my own work, that it does not contain copyrighted material or selfies, and otherwise adheres to &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons policies&lt;/a&gt;.</string>
   <string name="menu_download">Download</string>
   <string name="preference_license">Default License</string>
@@ -266,6 +269,7 @@
 
   <string name="upload_problem_image">Problems found in image</string>
   <string name="internet_downloaded">Please only upload pictures that you have taken by yourself. Don\'t upload pictures that you have downloaded from the Internet.</string>
+  <string name="preferences_uploads">Uploads</string>
   <string name="use_external_storage">Save In-app shots</string>
   <string name="use_external_storage_summary">Save pictures taken with the in-app camera to your device storage</string>
   <string name="login_to_your_account">Log in to your account</string>
@@ -461,6 +465,8 @@ Upload your first media by tapping on the add button.</string>
   <string name="ends_on">Ends on:</string>
   <string name="display_campaigns">Display campaigns</string>
   <string name="display_campaigns_explanation">See the ongoing campaigns</string>
+  <string name="show_deletion_button">Show deletion button</string>
+  <string name="show_deletion_button_explanation">Enable the \"Delete Folder\" button in the custom picker</string>
   <string name="in_app_camera_location_access_explanation">Allow the app to fetch location in case the camera does not record it. Some device cameras do not record location. In such cases, letting the app fetch and attach location to it makes your contribution more useful. You may change this any time from the Settings</string>
   <string name="option_allow">Allow</string>
   <string name="option_dismiss">Dismiss</string>
@@ -748,6 +754,8 @@ Upload your first media by tapping on the add button.</string>
   <string name="wlm_campaign_description">Wiki Loves Monuments is an international photo contest for monuments organised by Wikimedia</string>
   <string name="need_permission">Need Permission</string>
   <string name="read_phone_state_permission_message">Nearby maps need to read PHONE STATE to function properly</string>
+  <string name="location_off_dialog_text">Please turn on location services to view nearby places.</string>
+  <string name="location_permission_rationale">Location access is needed to show nearby places on the map.</string>
 
   <string name="contributions_of_user">Contributions of User: %s</string>
   <string name="achievements_of_user">Achievements of User: %s</string>

app/src/main/res/xml/preferences.xml

@@ -55,13 +55,13 @@
           android:defaultValue="false"
           android:key="displayDeletionButton"
           app:singleLineTitle="false"
-          android:summary="Enable the "Delete folder" button in the custom picker"
+          android:summary="@string/show_deletion_button_explanation"
-          android:title="Show Deletion Button" />
+          android:title="@string/show_deletion_button" />
 
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="Uploads">
+        android:title="@string/preferences_uploads">
 
         <SwitchPreference