diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyListFragment.java
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index ac0a8840a1..d2baec606a 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -4,6 +4,7 @@
 * Fitoschido
 * Kippelboy
 * MarionaDSR
+* Mguix
 * Pintor Smeargle
 * Pitort
 * Toniher
@@ -14,8 +15,7 @@
     <item quantity="one">s\'està carregant %1$d fitxer</item>
     <item quantity="other">s\'estan carregant %1$d fitxers</item>
   </plurals>
-  <plurals name="contributions_subtitle" fuzzy="true">
-    <item quantity="zero">\@string/contributions_subtitle_zero</item>
+  <plurals name="contributions_subtitle">
     <item quantity="one">(%1$d)</item>
     <item quantity="other">(%1$d)</item>
   </plurals>
@@ -76,7 +76,7 @@
   <string name="provider_contributions">Les meves càrregues</string>
   <string name="menu_share">Comparteix</string>
   <string name="menu_open_in_browser">Mostra al navegador</string>
-  <string name="share_title_hint" fuzzy="true">Títol (obligatori)</string>
+  <string name="share_title_hint">Llegenda (obligatori)</string>
   <string name="share_description_hint">Descripció</string>
   <string name="login_failed_network">No s\'ha pogut iniciar la sessió – error de xarxa</string>
   <string name="login_failed_wrong_credentials">No es pot iniciar la sessió - comproveu el nom d\'usuari i la contrasenya</string>
@@ -108,7 +108,7 @@
   <string name="about_license">L’aplicació de codi obert Wikimedia Commons fou creada per, i rep manteniment de, cessionaris i voluntaris de la comunitat de Wikimedia. La Fundació Wikimedia no està involucrada en la creació, el desenvolupament ni el manteniment de l’aplicació.</string>
   <string name="about_improve">Crea una &lt;a href=\"%1$s\"&gt;incidència de GitHub&lt;/a&gt; nova per a informes d\'error i suggeriments.</string>
   <string name="about_privacy_policy">Política de privadesa</string>
-  <string name="about_credits" fuzzy="true">&lt;u&gt;Crèdits&lt;/u&gt;</string>
+  <string name="about_credits">Crèdits</string>
   <string name="title_activity_about">Quant a</string>
   <string name="menu_feedback">Envia comentaris (per correu)</string>
   <string name="no_email_client">No hi ha cap client de correu instal·lat</string>
@@ -120,7 +120,7 @@
   <string name="media_upload_policy">En trametre aquesta imatge declaro que és fruit del meu treball, que no conté material amb drets d\'autor o amb autofotos, i que s\'adhereix a les &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;polítiques de Wikimedia Commons&lt;/a&gt;.</string>
   <string name="menu_download">Baixa</string>
   <string name="preference_license">Llicència per defecte</string>
-  <string name="use_previous" fuzzy="true">Utilitza títol i descripció anteriors</string>
+  <string name="use_previous">Utilitzar títol i descripció anteriors</string>
   <string name="allow_gps">Obté la ubicació actual automàticament</string>
   <string name="allow_gps_summary">Recupera la ubicació actual si la imatge no està geoetiquetada, i n\'etiqueta la imatge geogràficament. Avís: això revelarà la vostra ubicació actual.</string>
   <string name="preference_theme">Tema</string>
@@ -163,7 +163,7 @@
   <string name="welcome_copyright_subtext">No utilitzis material amb copyright que puguis trobar a Internet, ni tampoc imatges de pòsters, portades de llibres, etc.</string>
   <string name="welcome_final_text">Creieu que ho heu entès?</string>
   <string name="welcome_final_button_text">Sí!</string>
-  <string name="welcome_help_button_text" fuzzy="true">&lt;u&gt;Més Informació&lt;/u&gt;</string>
+  <string name="welcome_help_button_text">Més informació</string>
   <string name="detail_panel_cats_label">Categories</string>
   <string name="detail_panel_cats_loading">Carregant…</string>
   <string name="detail_panel_cats_none">No se n\'ha seleccionat cap</string>
@@ -256,7 +256,7 @@
   <string name="null_url">Error! No s\'ha trobat l\'URL</string>
   <string name="nominate_deletion">Nomina per a supressió</string>
   <string name="nominated_for_deletion">S\'ha nominat la imatge per a supressió.</string>
-  <string name="nominated_see_more" fuzzy="true">&lt;u&gt;Vegeu la pàgina web per a més detalls&lt;/u&gt;</string>
+  <string name="nominated_see_more">Vegeu la pàgina web per a més detalls</string>
   <string name="nominating_file_for_deletion">S\'està nominant %1$s per a ser eliminada.</string>
   <string name="nominating_for_deletion_status">S\'està nominant per a ser eliminat el fitxer: %1$s</string>
   <string name="view_browser">Mostra en el navegador</string>
@@ -268,7 +268,7 @@
   <string name="copy_wikicode">Copia el wikitext al portaretalls</string>
   <string name="wikicode_copied">S\'ha copiat el wikitext al portaretalls</string>
   <string name="nearby_location_has_not_changed">La ubicació no ha canviat.</string>
-  <string name="nearby_location_not_available" fuzzy="true">La ubicació no és disponible.</string>
+  <string name="nearby_location_not_available">\"Pels voltants\" podria no funcionar correctament, la ubicació no està disponible.</string>
   <string name="location_permission_rationale_nearby">Permís necessari per a mostrar una llista de llocs propers</string>
   <string name="get_directions">Com anar-hi</string>
   <string name="read_article">Llegeix l’article</string>
@@ -281,14 +281,14 @@
   <string name="nearby_wikidata">Wikidata</string>
   <string name="nearby_wikipedia">Viquipèdia</string>
   <string name="nearby_commons">Commons</string>
-  <string name="about_rate_us" fuzzy="true">&lt;u&gt;Valoreu-nos&lt;/u&gt;</string>
+  <string name="about_rate_us">Valoreu-nos</string>
   <string name="about_faq">Preguntes freqüents</string>
   <string name="welcome_skip_button">Omet la guia</string>
   <string name="no_internet">Internet no disponible</string>
   <string name="internet_established">Internet disponible</string>
   <string name="error_notifications">S\'ha produït un error en recuperar notificacions</string>
   <string name="no_notifications">No s\'ha trobat cap notificació</string>
-  <string name="about_translate" fuzzy="true">&lt;u&gt;Tradueix&lt;/u&gt;</string>
+  <string name="about_translate">Traduir</string>
   <string name="about_translate_title">Llengües</string>
   <string name="about_translate_message">Seleccioneu la llengua en què voleu enviar traduccions</string>
   <string name="about_translate_proceed">Procedeix</string>
@@ -359,7 +359,7 @@
   <string name="contributions_fragment">Contribucions</string>
   <string name="nearby_fragment">A prop</string>
   <string name="notifications">Notificacions</string>
-  <string name="read_notifications" fuzzy="true">Notificacions (arxivades)</string>
+  <string name="read_notifications">Notificacions (llegides)</string>
   <string name="display_nearby_notification">Mostra notificacions properes</string>
   <string name="display_nearby_notification_summary">Feu un toc aquí per a veure el lloc més proper que necessiti fotos</string>
   <string name="no_close_nearby">No s\'han trobat llocs propers prop vostre</string>
@@ -394,7 +394,7 @@
   <string name="desc_language_Asia">Àsia</string>
   <string name="desc_language_Pacific">Pacífic</string>
   <string name="no_categories_selected">No s\'ha seleccionat cap categoria</string>
-  <string name="no_categories_selected_warning_desc" fuzzy="true">Les imatges sense categories rarament fan cap servei. Esteu segur que voleu procedir sense seleccionar cap categoria?</string>
+  <string name="no_categories_selected_warning_desc">Les imatges sense categories rarament fan cap servei. Esteu segur que voleu continuar sense seleccionar cap categoria?</string>
   <string name="upload_flow_all_images_in_set">(Per a totes les imatges en el conjunt)</string>
   <string name="search_this_area">Cerca en aquesta àrea</string>
   <string name="nearby_card_permission_title">Sol·licitud de permisos</string>
@@ -436,7 +436,7 @@
   <string name="no_notification">No teniu cap notificació sense llegir</string>
   <string name="no_read_notification">No teniu cap notificació llegida</string>
   <string name="share_logs_using">Comparteix els registres utilitzant</string>
-  <string name="menu_option_read" fuzzy="true">Mostra els arxivats</string>
+  <string name="menu_option_read">Mostra els llegits</string>
   <string name="menu_option_unread">Mostra aquelles per llegir</string>
   <string name="error_occurred_in_picking_images">S\'ha produït un error en escollir les imatges</string>
   <string name="image_chooser_title">Trieu les imatges per carregar</string>
@@ -488,7 +488,7 @@
   <string name="place_type">Tipus de lloc:</string>
   <string name="nearby_search_hint">Pont, museu, hotel, etc.</string>
   <string name="you_must_reset_your_passsword">Quelcom ha fallat amb la vostra sessió. Reinicieu la vostra contrasenya!!</string>
-  <string name="theme_default_name" fuzzy="true">Per defecte</string>
+  <string name="theme_default_name">Seguir el sistema</string>
   <string name="theme_dark_name">Fosc</string>
   <string name="theme_light_name">Clar</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 23843c0e98..83f86708ba 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -84,7 +84,7 @@
   <string name="provider_contributions">Omat tallennukset</string>
   <string name="menu_share">Jaa</string>
   <string name="menu_open_in_browser">Näytä selaimessa</string>
-  <string name="share_title_hint" fuzzy="true">Otsikko (Vaaditaan)</string>
+  <string name="share_title_hint">Kuvateksti (vaaditaan)</string>
   <string name="share_description_hint">Kuvaus</string>
   <string name="login_failed_network">Kirjautuminen epäonnistui - verkkovirhe</string>
   <string name="login_failed_wrong_credentials">Kirjautuminen epäonnistui - tarkista käyttäjänimesi ja salasanasi</string>
@@ -114,8 +114,8 @@
   <string name="menu_about">Tietoja</string>
   <string name="about_license">Wikimedia Commons -sovellus on vapaan lähdekoodin ohjelmisto, joka on luotu ja ylläpidetty Wikimedia-yhteisön apurahoilla ja vapaaehtoisilla. Wikimedia Foundation ei ole sitoutunut sovelluksen luomiseen, kehittämiseen tai ylläpitoon.</string>
   <string name="about_improve">Luo uusi &lt;a href=\"%1$s\"&gt;GitHub-issue&lt;/a&gt; bugiraporteille ja ehdotuksille.</string>
-  <string name="about_privacy_policy" fuzzy="true">&lt;u&gt;Yksityisyydensuoja&lt;/u&gt;</string>
-  <string name="about_credits" fuzzy="true">&lt;u&gt;Tekijät&lt;/u&gt;</string>
+  <string name="about_privacy_policy">Tietosuojakäytäntö</string>
+  <string name="about_credits">Tekijät</string>
   <string name="title_activity_about">Tietoja</string>
   <string name="menu_feedback">Lähetä palautetta (sähköpostitse)</string>
   <string name="no_email_client">Sähköpostiohjelmaa ei ole asennettu</string>
@@ -127,10 +127,10 @@
   <string name="media_upload_policy">Lisäämällä kuvan, ilmoitan tämän olevan oma työ ja että se ei sisällä tekijänoikeuden alaista materiaalia tai selfietä ja muuten noudattaa &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons policies&lt;/a&gt;.</string>
   <string name="menu_download">Lataa</string>
   <string name="preference_license">Oletuslisenssi</string>
-  <string name="use_previous" fuzzy="true">Käytä edellistä otsikkoa/kuvausta</string>
+  <string name="use_previous">Käytä edellistä otsikkoa ja kuvausta</string>
   <string name="allow_gps">Hae tämänhetkinen sijainti automaattisesti</string>
   <string name="allow_gps_summary">Noutaa nykyisen sijainnin jos kuva ei ole paikkamerkitty, ja paikkamerkitsee kuvan. Varoitus: tämä paljastaa nykyisen sijaintisi.</string>
-  <string name="preference_theme" fuzzy="true">Yötila</string>
+  <string name="preference_theme">Teema</string>
   <string name="license_name_cc_by_sa_four">Nimeä-JaaSamoin 4.0</string>
   <string name="license_name_cc_by_four">Nimeä 4.0</string>
   <string name="license_name_cc_by_sa">Nimeä-JaaSamoin 3.0</string>
@@ -171,7 +171,7 @@
   <string name="welcome_copyright_subtext">Vältä tekijänoikeuksien alaista materiaalia, kuten julisteita, kirjan kansia ja useimpia Internetistä löydettyjä kuvia.</string>
   <string name="welcome_final_text">Luuletko ymmärtäneesi tämän?</string>
   <string name="welcome_final_button_text">Kyllä!</string>
-  <string name="welcome_help_button_text" fuzzy="true">&lt;u&gt;Lisätietoa&lt;/u&gt;</string>
+  <string name="welcome_help_button_text">Lisätietoja</string>
   <string name="detail_panel_cats_label">Luokat</string>
   <string name="detail_panel_cats_loading">Ladataan…</string>
   <string name="detail_panel_cats_none">Ei yhtään valittu</string>
@@ -187,8 +187,10 @@
   <string name="no_nearby">Lähistöltä ei löytynyt paikkoja</string>
   <string name="warning">Varoitus</string>
   <string name="upload_image_duplicate">Tämä tiedosto on jo Commonsissa. Haluatko varmasti jatkaa?</string>
+  <string name="upload">Tallenna</string>
   <string name="yes">Kyllä</string>
   <string name="no">Ei</string>
+  <string name="media_detail_caption">Kuvateksti</string>
   <string name="media_detail_title">Otsikko</string>
   <string name="media_detail_description">Kuvaus</string>
   <string name="media_detail_discussion">Keskustelu</string>
@@ -370,7 +372,7 @@
   <string name="contributions_fragment">Muokkaukset</string>
   <string name="nearby_fragment">Lähistöllä</string>
   <string name="notifications">Ilmoitukset</string>
-  <string name="read_notifications" fuzzy="true">Ilmoitukset (arkistoidut)</string>
+  <string name="read_notifications">Ilmoitukset (luetut)</string>
   <string name="display_nearby_notification">Näytä lähistöllä-ilmoitus</string>
   <string name="list_sheet">Lista</string>
   <string name="step_count">Vaihe %1$d/%2$d</string>
@@ -419,7 +421,7 @@
   <string name="review_copyright_no_button_text">Näyttää hyvälle</string>
   <string name="review_thanks_yes_button_text">Kyllä, miksi ei</string>
   <string name="review_thanks_no_button_text">Seuraava kuva</string>
-  <string name="menu_option_read" fuzzy="true">Näytä arkistoidut</string>
+  <string name="menu_option_read">Näytä luetut</string>
   <string name="menu_option_unread">Näytä lukemattomat</string>
   <string name="image_chooser_title">Valitse tallennettavat tiedostot</string>
   <string name="please_wait">Odota…</string>
@@ -443,4 +445,11 @@
   <string name="delete_helper_ask_reason_copyright_logo">Logo</string>
   <string name="delete_helper_ask_reason_copyright_other">Muu</string>
   <string name="delete_helper_ask_alert_set_positive_button_reason">Koska se on</string>
+  <string name="theme_dark_name">Tumma</string>
+  <string name="theme_light_name">Vaalea</string>
+  <string name="load_more">Lataa lisää</string>
+  <string name="add_picture_to_wikipedia_article_title">Lisää kuva Wikipediaan</string>
+  <string name="wikipedia_instructions_step_7">7. Julkaise artikkeli</string>
+  <string name="copy_wikicode_to_clipboard">Kopioi wikikoodi leikepöydälle</string>
+  <string name="paused">Pysäytetty</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 175ac5a5eb..d02667fa29 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -95,7 +95,7 @@
   <string name="title_activity_contributions">Mes téléversements récents</string>
   <string name="contribution_state_queued">Mis en file d’attente</string>
   <string name="contribution_state_failed">Échec</string>
-  <string name="contribution_state_in_progress">%1$d %% effectué</string>
+  <string name="contribution_state_in_progress">%1$d %% effectué</string>
   <string name="contribution_state_starting">Téléversement en cours</string>
   <string name="menu_from_gallery">Depuis la galerie</string>
   <string name="menu_from_camera">Prendre une photo</string>
@@ -287,7 +287,7 @@
   <string name="error_while_cache">Erreur en mettant les images en cache</string>
   <string name="title_info">Un titre descriptif unique pour le fichier, qui servira de nom de fichier. Vous pouvez utiliser un langage simple avec des espaces. N’incluez pas l’extension du fichier</string>
   <string name="description_info">Veuillez décrire le média autant que possible : Où a-t-il été enregistré ? Que montre-t-il ? Quel est le contexte ? Veuillez décrire les objets ou les personnes. Révélez les informations qui ne peuvent pas être devinées facilement, par exemple l’heure de la journée si c’est un paysage. Si le média montre quelque chose d’inhabituel, veuillez expliquer ce qui le rend exceptionnel.</string>
-  <string name="caption_info" fuzzy="true">Veuillez rédiger une brève description de l’image (limitée à 255 caractères).</string>
+  <string name="caption_info">Veuillez rédiger une brève description de l’image. La première légende sera utilisée comme titre de l\'image.</string>
   <string name="upload_image_too_dark">Cette image est trop sombre, êtes-vous sûr de vouloir la téléverser ? Wikimedia Commons est réservé pour les images ayant une valeur encyclopédique.</string>
   <string name="upload_image_blurry">Cette image est floue, êtes-vous sûr de vouloir la téléverser ? Wikimedia Commons est réservé aux images ayant une valeur encyclopédique.</string>
   <string name="upload_problem_exist">Problèmes potentiels avec cette image :</string>
@@ -321,7 +321,7 @@
   <string name="copy_wikicode">Copier le texte wiki dans le presse-papiers</string>
   <string name="wikicode_copied">Texte wiki copié dans le presse-papiers</string>
   <string name="nearby_location_has_not_changed">L’emplacement n’a pas changé.</string>
-  <string name="nearby_location_not_available">« À proximité » pourrait ne pas fonctionner correctement, votre emplacement étant indisponible.</string>
+  <string name="nearby_location_not_available">« À proximité » pourrait ne pas fonctionner correctement, votre emplacement étant indisponible.</string>
   <string name="location_permission_rationale_nearby">Une permission est requise pour afficher une liste de lieux à proximité</string>
   <string name="get_directions">Obtenir les directions</string>
   <string name="read_article">Lire l’article</string>
@@ -631,7 +631,7 @@
   <string name="add_picture_to_wikipedia_instructions_desc">Faites attention de suivre les lignes directrices de modification !</string>
   <string name="confirm">Confirmer</string>
   <string name="instructions_title">Instructions</string>
-  <string name="wikipedia_instructions_step_1">1. Utiliser le wikicode suivant :</string>
+  <string name="wikipedia_instructions_step_1">1. Utiliser le wikicode suivant :</string>
   <string name="wikipedia_instructions_step_2">2. Cliquer sur Confirmer ouvrira l’article Wikipédia</string>
   <string name="wikipedia_instructions_step_3">3. Trouver une section appropriée pour votre image dans l’article</string>
   <string name="wikipedia_instructions_step_4">4. Cliquer sur l’icône d’édition (celle ressemblant à un crayon) pour cette section.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c605f81d0c..704b25dd0a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -116,6 +116,7 @@
   <string name="depictions_not_found">%1$s に一致する項目が見つかりません</string>
   <string name="no_child_classes">%1$s に子のクラスはありません</string>
   <string name="no_parent_classes">%1$s に親クラスはありません</string>
+  <string name="depictions_image_not_found">描写用の画像がありません</string>
   <string name="categories_skip_explanation">あなたの画像をウィキメディア・コモンズで見つけやすくするためにカテゴリを追加してください。\nカテゴリ名の入力を開始してください。</string>
   <string name="categories_activity_title">カテゴリ</string>
   <string name="title_activity_settings">設定</string>
@@ -132,6 +133,7 @@
   <string name="menu_feedback">フィードバックを送信（メール）</string>
   <string name="no_email_client">メールアプリケーションが見つかりません</string>
   <string name="provider_categories">最近使用したカテゴリ</string>
+  <string name="provider_depictions">最近利用された描写</string>
   <string name="waiting_first_sync">同期を待機中…</string>
   <string name="no_uploads_yet">まだ写真をアップロードしていません。</string>
   <string name="menu_retry_upload">再試行</string>
@@ -187,6 +189,8 @@
   <string name="detail_panel_cats_label">カテゴリ</string>
   <string name="detail_panel_cats_loading">読み込み中…</string>
   <string name="detail_panel_cats_none">ファイルを選択していません</string>
+  <string name="detail_caption_empty">キャプションがありません</string>
+  <string name="detail_depiction_empty">描写がありません</string>
   <string name="detail_description_empty">説明はありません。</string>
   <string name="detail_discussion_empty">議論なし</string>
   <string name="detail_license_empty">不明なライセンス</string>
@@ -200,10 +204,14 @@
   <string name="title_activity_nearby">近くの場所</string>
   <string name="no_nearby">付近の場所が見つかりません</string>
   <string name="warning">警告</string>
+  <string name="duplicate_image_found">重複する画像が見つかりました</string>
   <string name="upload_image_duplicate">このファイルはすでにコモンズに登録済みです。それでも処理を続けますか？</string>
+  <string name="upload">アップロード</string>
   <string name="yes">はい</string>
   <string name="no">いいえ</string>
+  <string name="media_detail_caption">キャプション</string>
   <string name="media_detail_title">タイトル</string>
+  <string name="media_detail_depiction">描写</string>
   <string name="media_detail_description">記述</string>
   <string name="media_detail_discussion">議論</string>
   <string name="media_detail_author">作者</string>
@@ -265,6 +273,7 @@
   <string name="error_while_cache">画像をキャッシュする際のエラー</string>
   <string name="title_info">ファイル固有の説明的な表題。ファイル名として使われます。平易な言葉を使い、空白を入れることができます。拡張子は含めないでください。</string>
   <string name="description_info">可能な限りメディアを説明してください: 撮影地はどこですか? それは何を示していますか? どんな文脈がありますか? 被写体の物や人を説明してください。容易に推測できない情報、例えば風景であれば時刻を明示します。特筆すべき物事が映っている場合は、何が珍しいのかを説明してください。</string>
+  <string name="caption_info">画像に簡単な説明を書いてください。最初のキャプションは画像の題名になります。</string>
   <string name="upload_image_too_dark">この画像は暗すぎますがアップロードしますか？ ウィキメディア・コモンズは百科事典に適した画像のみ受け付けます。</string>
   <string name="upload_image_blurry">ピントが合っていませんが、アップロードしますか？ ウィキメディア・コモンズは百科事典に適した画像のみ受け付けます。</string>
   <string name="upload_problem_exist">この画像には問題があるかもしれません。</string>
@@ -274,6 +283,7 @@
   <string name="upload_problem_different_geolocation">この画像の撮影地点は別の場所です。</string>
   <string name="upload_problem_fbmd">あなた自身の撮影したがぞうに限定してアップロードしてください。他人のFacebookアカウントの画像をアップロードすることはやめてください。</string>
   <string name="upload_problem_do_you_continue">それでもこの画像をアップロードしますか？</string>
+  <string name="upload_problem_image">画像に問題があります</string>
   <string name="internet_downloaded">あなた自身の撮影した画像に限定してアップロードしてください。ウェブ上からダウンロードした画像はアップロードできません。</string>
   <string name="give_permission">権限を付与</string>
   <string name="use_external_storage">外部ストレージを使用</string>
@@ -327,6 +337,9 @@
   <string name="retry">やり直す</string>
   <string name="showcase_view_got_it_button">了解</string>
   <string name="showcase_view_whole_nearby_activity">以下のとおり、近くにウィキペディアの記事に使う写真が足りない場所があります。\n\n\'この近くを検索\' ボタンを押すと、地図をロックしてその地点周辺の検索結果を表示します。</string>
+  <string name="showcase_view_needs_photo">この場所の写真を募集中です。</string>
+  <string name="showcase_view_has_photo">この場所の写真はすでにあります。</string>
+  <string name="showcase_view_no_longer_exists">この場所はもう存在しません。</string>
   <string name="showcase_view_list_icon">このボタンをタップするとリストを表示します</string>
   <string name="showcase_view_plus_fab">場所の写真をアップロードするには、ギャラリーから選ぶことも撮影することもできます</string>
   <string name="no_images_found">画像がありません</string>
@@ -343,9 +356,11 @@
   <string name="search_recent_header">最近の検索:</string>
   <string name="provider_searches">最近、検索したクエリ</string>
   <string name="error_loading_categories">カテゴリの読み込み中にエラーが発生しました。</string>
+  <string name="error_loading_depictions">描写の読み込み中にエラーが発生しました</string>
   <string name="error_loading_subcategories">下位カテゴリの読み込み中にエラーが発生しました。</string>
   <string name="search_tab_title_media">メデイア</string>
   <string name="search_tab_title_categories">カテゴリ</string>
+  <string name="search_tab_title_depictions">項目</string>
   <string name="explore_tab_title_featured">秀逸</string>
   <string name="explore_tab_title_mobile">モバイル機器からアップロード</string>
   <string name="successful_wikidata_edit">ウィキデータの%1$sに画像を追加しました !</string>
@@ -445,6 +460,8 @@
   <string name="desc_language_Pacific">太平洋地域</string>
   <string name="no_categories_selected">カテゴリが選択されていません</string>
   <string name="no_categories_selected_warning_desc">カテゴリを指定しない画像は使用されることがほとんどありません。ほんとうにカテゴリを選択しないまま作業を続けますか？</string>
+  <string name="no_depictions_selected">描写を選択していません</string>
+  <string name="no_depictions_selected_warning_desc">描写を添えた画像はないものよりも探しやすく利用されやすくなります。描写を選ばないまま、先に進んでよいですか？</string>
   <string name="upload_flow_all_images_in_set">（画像全点を組み写真にする場合）</string>
   <string name="search_this_area">この地域を検索</string>
   <string name="nearby_card_permission_title">許可を申請</string>
@@ -454,6 +471,7 @@
   <string name="display_location_permission_title">位置情報の許可の状態を表示</string>
   <string name="display_location_permission_explanation">通知カードで近くの場所を表示するたび、位置情報の使用を許可するかどうか尋ねる</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>
   <string name="display_campaigns_explanation">現在、実施中のキャンペーンを表示</string>
@@ -518,6 +536,7 @@
   <string name="images_featured_explanation">秀逸な画像とは、技術力の高い写真家や作画家による作品で、ウィキメディアコモンズのコミュニティから最高の品質を誇るものとして選出されています。</string>
   <string name="images_via_nearby_explanation">「近くの場所でアップロードした画像」とは、地図上で検索した結果に基づいてアップロードした画像のことです。</string>
   <string name="thanks_received_explanation">この機能を使うと有効な編集をしたユーザーに感謝を伝えることができます – 変更履歴もしくは差分のページに表示される小さな感謝リンクを押します。</string>
+  <string name="previous_image_caption_description">以前のキャプションと説明をコピーする</string>
   <string name="previous_button_tooltip_message">クリックして前の画像に使ったファイル名と説明文をコピーし、投稿画像に合わせて文字を編集</string>
   <string name="welcome_do_upload_content_description">コモンズへの投稿画像の良い例</string>
   <string name="welcome_dont_upload_content_description">投稿に適さない画像のサンプル</string>
@@ -536,6 +555,7 @@
   <string name="share_via">アプリの共有に使うのは…</string>
   <string name="image_info">画像情報</string>
   <string name="no_categories_found">カテゴリが見つかりません</string>
+  <string name="no_depiction_found">描写が見つかりません</string>
   <string name="upload_cancelled">アップロードを中止しました</string>
   <string name="previous_image_title_description_not_found">以前の題名もしくは説明文のデータが見つかりません</string>
   <string name="dialog_box_text_nomination">%1$sを削除しなければならないのはなぜですか？</string>
@@ -562,9 +582,17 @@
   <string name="text_copy">テキストをクリップボードにコピー済み</string>
   <string name="notification_mark_read">通知を既読にしました</string>
   <string name="some_error">エラーが発生しました</string>
+  <string name="place_state">場所の状態：</string>
+  <string name="place_state_exists">存在する</string>
+  <string name="place_state_needs_photo">写真がない</string>
+  <string name="place_type">場所のタイプ：</string>
   <string name="nearby_search_hint">橋・博物館・ホテルなど</string>
   <string name="you_must_reset_your_passsword">ログインがうまくいきませんでした。パスワードを変更してください!!</string>
+  <string name="title_for_media">メディア</string>
+  <string name="title_for_child_classes">子分類</string>
+  <string name="title_for_parent_classes">親クラス</string>
   <string name="upload_nearby_place_found_title">付近の場所が見つかりました</string>
+  <string name="upload_nearby_place_found_description">これは場所%1$sの写真ですか？</string>
   <string name="title_app_shortcut_explore">探してみよう</string>
   <string name="title_app_shortcut_bookmark">ブックマーク</string>
   <string name="title_app_shortcut_setting">設定</string>
@@ -573,10 +601,30 @@
   <string name="wallpaper_set_unsuccessfully">問題が発生しました。壁紙を設定できませんでした。</string>
   <string name="setting_wallpaper_dialog_title">壁紙として設定</string>
   <string name="setting_wallpaper_dialog_message">壁紙を設定中。お待ちください...</string>
+  <string name="theme_default_name">システムのまま</string>
+  <string name="theme_dark_name">ダーク</string>
+  <string name="theme_light_name">ライト</string>
+  <string name="cannot_open_location_settings">位置設定を開ませんでした。手動で位置を有効にしてください</string>
   <string name="recommend_high_accuracy_mode">高品質を確保するには、高精モードを選択してください。</string>
   <string name="ask_to_turn_location_on">位置を有効にしますか？</string>
   <string name="nearby_needs_location">付近が正確に機能するには、位置を有効にしてください</string>
   <string name="use_location_from_similar_image">これら2点の撮影場所は同じですか？ 右側の画像に緯度経度情報を添付しますか？</string>
+  <string name="load_more">さらに読み込む</string>
+  <string name="nearby_no_results">場所が見つかりませんので、検索条件を変えてみてください。</string>
+  <string name="add_picture_to_wikipedia_article_title">ウィキペディアに画像を追加する</string>
+  <string name="add_picture_to_wikipedia_article_desc">この画像を%1$s語版ウィキペディアの記事に追加しますか？</string>
+  <string name="add_picture_to_wikipedia_instructions_title">手順</string>
+  <string name="add_picture_to_wikipedia_instructions_desc">編集のガイドラインを守るようご留意ください！</string>
+  <string name="confirm">確定</string>
+  <string name="instructions_title">手順</string>
+  <string name="wikipedia_instructions_step_1">1. 次のウィキ文を使用します：</string>
+  <string name="wikipedia_instructions_step_2">2. 確定を押すとウィキペディアの記事を表示します</string>
+  <string name="wikipedia_instructions_step_3">3. 記事の見出しから、その画像にふさわしいものを選びます</string>
+  <string name="wikipedia_instructions_step_4">4. 選んだ見出しの端の編集アイコン (鉛筆型のボタン) をクリック。</string>
+  <string name="wikipedia_instructions_step_5">5. 先ほどのウィキ文を適切な位置にペーストします。</string>
+  <string name="wikipedia_instructions_step_6">6. もしその位置に合わせる必要がある場合には、ウィキ文を編集します。詳細は&lt;a href=\"https://ja.wikipedia.org/wiki/Help:画像の表示#一番簡単な方法\"&gt;こちら&lt;/a&gt;をご参照ください。</string>
+  <string name="wikipedia_instructions_step_7">7. 記事を保存して公開</string>
+  <string name="copy_wikicode_to_clipboard">ウィキコードをクリップボードにコピー</string>
   <string name="pause">一時停止</string>
   <string name="resume">継続</string>
   <string name="paused">一時停止</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 3e24279eb1..21826e1a93 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -263,7 +263,7 @@
   <string name="error_while_cache">Грешка при меѓускладирање на сликите</string>
   <string name="title_info">Краток и единствен наслов на податотеката, кој ќе служи како нејзин назив. Можете да користите прост јазик со меѓупростор, но не пишувајте ја податотечната наставка</string>
   <string name="description_info">Објаснете ја податотеката што подобро можете: Каде е направена? Што е прикажано на неа? Кој е контекстот? Опишете ги предметите, објектите и личностите. Дајте сознанија што не можат лесно да се погодат, како на пр. време од денот ако се работи за природен предел. Ако на неа е претставено нешто необично, објаснете зошто прикажаното е необично.</string>
-  <string name="caption_info" fuzzy="true">Ставете краток опис на сликата. (највеќе 255 знаци)</string>
+  <string name="caption_info">Ставете краток опис на сликата. Првиот опис ќе се користи како наслов на сликата.</string>
   <string name="upload_image_too_dark">Сликата ви е претемна. Дали сигурно сакате да ја подигнете? Ризницата е посветена само на слики со енциклопедиска вредност.</string>
   <string name="upload_image_blurry">Сликата ви е матна. Дали сигурно сакате да ја подигнете? Ризницата е посветена само на слики со енциклопедиска вредност.</string>
   <string name="upload_problem_exist">Потенцијални проблеми со сликава:</string>
diff --git a/app/src/main/res/values-nqo/strings.xml b/app/src/main/res/values-nqo/strings.xml
index ce44f99915..2ed58a4245 100644
--- a/app/src/main/res/values-nqo/strings.xml
+++ b/app/src/main/res/values-nqo/strings.xml
@@ -95,7 +95,7 @@
   <string name="menu_retry_upload">ߊ߬ ߡߊߝߍߣߍ߲߫ ߕߎ߲߯</string>
   <string name="menu_cancel_upload">ߊ߬ ߘߐߛߊ߬</string>
   <string name="menu_download">ߟߊ߬ߖߌ߰ߒ߬ߞߎ߲߬ߠߌ߲</string>
-  <string name="preference_theme" fuzzy="true">ߛߎ ߞߍߗߏ߮</string>
+  <string name="preference_theme">ߞߍߗߏ߮</string>
   <string name="license_name_cc_by_sa_3_0_at">CC BY-SA 3.0 (ߏߛߑߕߙߊߟߌ߫)</string>
   <string name="license_name_cc_by_sa_3_0_de">CC BY-SA 3.0 (ߊߟߏߡߊ߲ߘߎ߯)</string>
   <string name="license_name_cc_by_sa_3_0_ee">CC BY-SA 3.0 (ߋߛߑߕߏߣߌ߫)</string>
@@ -164,6 +164,7 @@
   <string name="welcome_image_proprietary">ߖߌ߬ߦߊ߬ߓߍ߫ ߕߌ߰ߟߊ߬ߡߊ</string>
   <string name="welcome_image_welcome_wikipedia">ߌ ߣߌ߫ ߛߣߍ߫ ߥߞߌߡߋߘߌߦߊ ߞߊ߲߬</string>
   <string name="welcome_image_welcome_copyright">ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߛߣߍ߫</string>
+  <string name="welcome_image_sydney_opera_house">ߛߌߘߑߣߋ߫ ߏߔߋߙߊ߫ ߓߏ߲</string>
   <string name="cancel">ߊ߬ ߘߐߛߊ߬</string>
   <string name="navigation_drawer_open">ߊ߬ ߟߊߞߊ߬</string>
   <string name="navigation_drawer_close">ߊ߬ ߘߊߕߎ߲߯</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3c974eb5b7..2445f8de31 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -293,7 +293,7 @@
   <string name="error_while_cache">Błąd podczas buforowania zdjęć</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="description_info">Opisz jak najwięcej mediów: Gdzie zostało zrobione? Co to pokazuje? Jaki jest kontekst? Proszę opisać przedmioty lub osoby. Ujawnij informacje, których nie można łatwo odgadnąć, na przykład porę dnia, jeśli jest to krajobraz. Jeśli media pokazują coś niezwykłego, wyjaśnij, co sprawia, że ​​jest to niezwykłe.</string>
-  <string name="caption_info" fuzzy="true">Proszę napisać krótki opis obrazu. (Limit do 255 znaków)</string>
+  <string name="caption_info">Proszę napisać krótki opis obrazu. Pierwszy podpis zostanie użyty jako tytuł obrazu.</string>
   <string name="upload_image_too_dark">To zdjęcie jest zbyt ciemne, czy na pewno chcesz je załadować? Wikimedia Commons jest tylko dla zdjęć o wartości encyklopedycznej.</string>
   <string name="upload_image_blurry">To zdjęcie jest rozmazane, czy na pewno chcesz je załadować? Wikimedia Commons jest tylko dla zdjęć o wartości encyklopedycznej.</string>
   <string name="upload_problem_exist">Potencjalne problemy z tym obrazem:</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6816cac3cd..48abd0ff3c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -275,7 +275,7 @@
   <string name="error_while_cache">Erro durante o cache de imagens</string>
   <string name="title_info">Um título descritivo exclusivo para o arquivo, que servirá como um nome de arquivo. Você pode usar linguagem simples com espaços. Não inclua a extensão do arquivo</string>
   <string name="description_info">Por favor, descreva a mídia tanto quanto possível: onde foi tomada? O que isso mostra? Qual é o contexto? Descreva os objetos ou pessoas. Revelar informações que não podem ser facilmente adivinhadas, por exemplo, a hora do dia, se for uma paisagem. Se a mídia mostrar algo incomum, explique o que torna incomum.</string>
-  <string name="caption_info" fuzzy="true">Por favor, escreva uma breve descrição da imagem. (Limite a 255 caracteres)</string>
+  <string name="caption_info">Por favor, escreva uma breve descrição da imagem. A primeira legenda seria usada como título da imagem.</string>
   <string name="upload_image_too_dark">Esta foto está muito escura, você tem certeza de que deseja enviá-la? O Wikimedia Commons é apenas para imagens com valor enciclopédico.</string>
   <string name="upload_image_blurry">Esta foto está embaçada, tem certeza de que deseja enviá-la? O Wikimedia Commons é apenas para imagens com valor enciclopédico.</string>
   <string name="upload_problem_exist">Problemas potenciais com esta imagem:</string>
@@ -508,7 +508,7 @@
   <string name="review_spam">Isso é dentro do escopo?</string>
   <string name="review_thanks">Gostaria de agradecer ao colaborador?</string>
   <string name="review_spam_explanation">Clique em NÃO para nomear esta imagem para exclusão, se não for útil.</string>
-  <string name="review_copyright_explanation">Logotipos, capturas de tela, pôsteres de filmes geralmente são violações de direitos autorais.\n  Clique em NÃO para indicar esta imagem para exclusão</string>
+  <string name="review_copyright_explanation">Logotipos, capturas de tela, pôsteres de filmes geralmente são violações de direitos autorais.\n  Clique em NÃO para indicar esta imagem para exclusão</string>
   <string name="review_thanks_explanation">%1$s será encorajado por sua apreciação</string>
   <string name="review_no_category">Ah, isso nem é categorizado!</string>
   <string name="review_category_explanation">Esta imagem está abaixo das %1$s categorias</string>
@@ -523,7 +523,7 @@
   <string name="review_thanks_yes_button_text">Sim, porque não?</string>
   <string name="review_thanks_no_button_text">Próxima imagem</string>
   <string name="skip_image_explanation">Clicando neste botão você terá uma outra imagem carregada recentemente do Wikimedia Commons</string>
-  <string name="review_image_explanation">Você pode rever imagens e melhorar a qualidade dos Wikimedia Commons.\n Os quatro parâmetros de revisão são:\n- Esta imagem está no escopo?\n- Esta imagem segue as regras de direitos autorais?\n- Esta imagem está categorizada corretamente?\n- Se tudo correr bem, você também pode agradecer ao colaborador.</string>
+  <string name="review_image_explanation">Você pode rever imagens e melhorar a qualidade dos Wikimedia Commons.\n Os quatro parâmetros de revisão são:\n- Esta imagem está no escopo?\n- Esta imagem segue as regras de direitos autorais?\n- Esta imagem está categorizada corretamente?\n- Se tudo correr bem, você também pode agradecer ao colaborador.</string>
   <string name="no_image">Nenhuma imagem usada</string>
   <string name="no_image_reverted">Nenhuma imagem revertida</string>
   <string name="no_image_uploaded">Nenhuma imagem enviada</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c79372028e..c660ef3227 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -595,7 +595,7 @@
   <string name="place_state_exists">Существует</string>
   <string name="place_state_needs_photo">Нуждается в фото</string>
   <string name="place_type">Тип места:</string>
-  <string name="nearby_search_hint">Мост, музей, гостиница и т. д.</string>
+  <string name="nearby_search_hint">Мост, музей, гостиница и т. д.</string>
   <string name="you_must_reset_your_passsword">Что-то пошло не так со входом, вы должны сбросить пароль!</string>
   <string name="title_for_media">МЕДИА</string>
   <string name="title_for_child_classes">ДЕТСКИЕ КЛАССЫ</string>
@@ -626,4 +626,7 @@
   <string name="confirm">Подтвердить</string>
   <string name="instructions_title">Инструкции</string>
   <string name="copy_wikicode_to_clipboard">Скопировать вики-код в буфер обмена</string>
+  <string name="pause">пауза</string>
+  <string name="resume">продолжить</string>
+  <string name="paused">Приостановлено</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5195bfd31f..98ed57d039 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -11,6 +11,7 @@
 * Joseph
 * McAang
 * Mirzali
+* MuratTheTurkish
 * Neslihan Turan
 * Okkerem
 * Rapsar
@@ -279,7 +280,7 @@
   <string name="error_while_cache">Resimleri önbelleğe alırken hata oluştu</string>
   <string name="title_info">Dosya adı olarak kullanılacak benzersiz bir açıklayıcı başlık. Sade bir dil kullanabilirsiniz. Dosya uzantısını dahil etmeyin</string>
   <string name="description_info">Lütfen medyayı olabildiğince açıklayın: Nerede çekildi? Ne gösteriyor? Bağlam nedir? Lütfen nesneleri veya kişileri tanımlayın. Kolayca tahmin edilemeyen bilgileri, örneğin bir manzara ise günün saatini gösterin. Medya alışılmadık bir şey gösteriyorsa lütfen alışılmadık hâle getiren şeyi açıklayın.</string>
-  <string name="caption_info" fuzzy="true">Lütfen resmin kısa bir açıklamasını yazın. (255 karakterle sınırı vardır)</string>
+  <string name="caption_info">Lütfen resmin kısa bir açıklamasını yazın. İlk resim yazısı resminin Başlığı olarak kullanılacaktır.</string>
   <string name="upload_image_too_dark">Bu resim çok karanlık, yüklemek istediğinizden emin misiniz? Wikimedia Commons yalnızca ansiklopedik değeri olan resimler içindir.</string>
   <string name="upload_image_blurry">Bu resim bulanık, yüklemek istediğinizden emin misiniz? Wikimedia Commons yalnızca ansiklopedik değeri olan resimler içindir.</string>
   <string name="upload_problem_exist">Bu görselle ilgili olası sorunlar:</string>
@@ -527,7 +528,7 @@
   <string name="review_thanks_yes_button_text">Evet, neden olmasın</string>
   <string name="review_thanks_no_button_text">Sonraki resim</string>
   <string name="skip_image_explanation">Bu butona tıkladığınızda Wikimedia Commons\'tan yeni yüklediğiniz başka bir resim elde edersiniz</string>
-  <string name="review_image_explanation">Görüntüleri inceleyebilir ve Wikimedia Commons\'un kalitesini iyileştirebilirsiniz.\n  İncelemenin dört parametresi:\n  - Bu görüntü kapsam dahilinde mi?\n  - Bu resim telif hakkı kurallarına uyuyor mu?\n  - Bu resim doğru sınıflandırılmış mı?\n  - Her şey yolunda giderse katılımcıya da teşekkür edebilirsiniz.</string>
+  <string name="review_image_explanation">Görüntüleri inceleyebilir ve Wikimedia Commons\'un kalitesini iyileştirebilirsiniz.\n  İncelemenin dört parametresi:\n  - Bu görüntü kapsam dahilinde mi?\n  - Bu resim telif hakkı kurallarına uyuyor mu?\n  - Bu resim doğru sınıflandırılmış mı?\n  - Her şey yolunda giderse katılımcıya da teşekkür edebilirsiniz.</string>
   <string name="no_image">Hiç resim kullanılmadı</string>
   <string name="no_image_reverted">Geri getirilen resim yok</string>
   <string name="no_image_uploaded">Yüklenen resim yok</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f73c0f73ba..a25a3b6774 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -661,9 +661,9 @@ Upload your first media by tapping on the add button.</string>
   <string name="leaderboard_column_rank">Rank</string>
   <string name="leaderboard_column_user">User</string>
   <string name="leaderboard_column_count">Count</string>
-  <string name="setting_avatar_dialog_title">Set as Leaderboard Avatar</string>
-  <string name="setting_avatar_dialog_message">Setting as Avatar, please wait</string>
-  <string name="avatar_set_successfully">Avatar Set Successfully</string>
+  <string name="setting_avatar_dialog_title">Set as leaderboard avatar</string>
+  <string name="setting_avatar_dialog_message">Setting as avatar, please wait</string>
+  <string name="avatar_set_successfully">Avatar set</string>
   <string name="avatar_set_unsuccessfully">Error setting new avatar, please try again</string>
   <string name="menu_set_avatar">Set as avatar</string>
 </resources>
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckboxTriStatesTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckboxTriStatesTest.kt
new file mode 100644
index 0000000000..178a3202cf
--- /dev/null
+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/CheckboxTriStatesTest.kt
@@ -0,0 +1,71 @@
+package fr.free.nrw.commons.nearby
+
+import android.widget.CompoundButton
+import androidx.test.core.app.ApplicationProvider
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
+import fr.free.nrw.commons.TestCommonsApplication
+import fr.free.nrw.commons.location.LatLng
+import fr.free.nrw.commons.nearby.CheckBoxTriStates.CHECKED
+import fr.free.nrw.commons.nearby.CheckBoxTriStates.UNCHECKED
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [21], application = TestCommonsApplication::class)
+class CheckBoxTriStatesTest {
+    @Mock
+    internal lateinit var callback: CheckBoxTriStates.Callback
+    @Mock
+    internal lateinit var onCheckChangeListener: CompoundButton.OnCheckedChangeListener
+    private lateinit var checkBoxTriStates: CheckBoxTriStates
+
+    /**
+     * initial setup
+     */
+    @Before
+    @Throws(Exception::class)
+    fun setUp() {
+        MockitoAnnotations.initMocks(this)
+        checkBoxTriStates = CheckBoxTriStates(ApplicationProvider.getApplicationContext())
+        checkBoxTriStates.setCallback(callback)
+        checkBoxTriStates.setOnCheckedChangeListener(onCheckChangeListener)
+    }
+
+    /**
+     * If same state is trying to be set, nothing should happen
+     */
+    @Test
+    fun testSetStateWhenSameState() {
+        checkBoxTriStates.state = CHECKED
+        checkBoxTriStates.setState(CHECKED)
+        verifyNoMoreInteractions(callback)
+    }
+
+    /**
+     * If different, markers should be filtered by new state
+     */
+    @Test
+    fun testSetStateWhenDiffState() {
+        NearbyController.currentLocation = LatLng(0.0,0.0,0.0f)
+        checkBoxTriStates.state = CHECKED
+        checkBoxTriStates.setState(UNCHECKED)
+        verify(callback).filterByMarkerType(null, UNCHECKED, false, true)
+    }
+
+    /**
+     * If current latitude longtitude null, then no more interactions required
+     */
+    @Test
+    fun testSetStateWhenCurrLatLngNull() {
+        NearbyController.currentLocation = null
+        checkBoxTriStates.state = CHECKED
+        checkBoxTriStates.setState(UNCHECKED)
+        verifyNoMoreInteractions(callback)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/LabelTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/LabelTest.kt
new file mode 100644
index 0000000000..e66765ef61
--- /dev/null
+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/LabelTest.kt
@@ -0,0 +1,37 @@
+package fr.free.nrw.commons.nearby
+
+import fr.free.nrw.commons.R
+import fr.free.nrw.commons.R.*
+import org.junit.Before
+import org.junit.Test
+
+class LabelTest {
+    private lateinit var label: Label
+
+    /**
+     * initial setup
+     */
+    @Before
+    @Throws(Exception::class)
+    fun setUp() {
+        label = Label.fromText("Q44539")
+    }
+
+    /**
+     * test if a random label icon matches with intended one
+     */
+    @Test
+    fun testLabelIcon() {
+        assert(label.icon.equals(R.drawable.round_icon_church))
+    }
+
+    /**
+     * test if label is not found in label set, unknown icon is used
+     */
+    @Test
+    fun testNullLabelIcon() {
+        var nullLabel: Label = Label.fromText("a random text not exist in label texts")
+        assert(nullLabel.icon.equals(R.drawable.round_icon_unknown))
+    }
+
+}
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt
index 27859fa7a4..fa7f3bae75 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/nearby/NearbyParentFragmentPresenterTest.kt
@@ -11,6 +11,7 @@ import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
+import org.mockito.ArgumentMatchers
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.MockitoAnnotations
@@ -264,7 +265,7 @@ class NearbyParentFragmentPresenterTest {
     fun testFilterByMarkerTypeMultiSelectCHECKED() {
         val state = CheckBoxTriStates.CHECKED
         nearbyPresenter.filterByMarkerType(selectedLabels, state, false,true)
-        verify(nearbyParentFragmentView).displayAllMarkers()
+        verify(nearbyParentFragmentView).filterMarkersByLabels(ArgumentMatchers.anyList(),ArgumentMatchers.anyBoolean(),ArgumentMatchers.anyBoolean(),ArgumentMatchers.anyBoolean(),ArgumentMatchers.anyBoolean());
         verify(nearbyParentFragmentView).setRecyclerViewAdapterAllSelected()
         verifyNoMoreInteractions(nearbyParentFragmentView)
     }
@@ -441,4 +442,4 @@ class NearbyParentFragmentPresenterTest {
         verify(nearbyParentFragmentView).isNetworkConnectionEstablished()
         verifyZeroInteractions(nearbyParentFragmentView)
     }
-}
\ No newline at end of file
+}