diff --git a/app/src/main/res/values-ab/strings.xml b/app/src/main/res/values-ab/strings.xml
index b0b1cd5aa..b81e82999 100644
--- a/app/src/main/res/values-ab/strings.xml
+++ b/app/src/main/res/values-ab/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
+* DDPAT
 * Envlh
 * Fraxinus.cs
 * Pupsik-ipa
@@ -40,7 +41,7 @@
   <string name="categories_search_text_hint">Актегориа алхра</string>
   <string name="menu_save_categories">Еиқәырхатәуп</string>
   <string name="refresh_button">Ирҿыцтәуп</string>
-  <string name="contributions_subtitle_zero" fuzzy="true">Аҭагаламҭақәа макьана иҟам</string>
+  <string name="contributions_subtitle_zero">(Аҭагаламҭақәа макьана иҟам)</string>
   <string name="categories_activity_title">Акатегориақәа</string>
   <string name="title_activity_settings">Архиарақәа</string>
   <string name="title_activity_signup">Арегистрациа ҟаҵатәуп</string>
diff --git a/app/src/main/res/values-ban/strings.xml b/app/src/main/res/values-ban/strings.xml
index b3bde9e33..9e0d3b2a9 100644
--- a/app/src/main/res/values-ban/strings.xml
+++ b/app/src/main/res/values-ban/strings.xml
@@ -288,7 +288,6 @@
   <string name="resume">lanjut</string>
   <string name="paused">Karérénang</string>
   <string name="more">Malih</string>
-  <string name="favorites">Senengan</string>
   <string name="leaderboard_yearly">Ngawarsa</string>
   <string name="leaderboard_weekly">Ngawuku</string>
   <string name="leaderboard_all_time">Makejang kala</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index def89da16..81269dd94 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -436,7 +436,6 @@
   <string name="resume">reprèn</string>
   <string name="paused">En pausa</string>
   <string name="more">Més</string>
-  <string name="favorites">Favorits</string>
   <string name="achievements_tab_title">Assoliments</string>
   <string name="leaderboard_yearly">Anualment</string>
   <string name="leaderboard_weekly">Setmanalment</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 855fb0b7b..825fde0f0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -70,6 +70,7 @@
   <string name="signup">Registrieren</string>
   <string name="logging_in_title">Anmelden</string>
   <string name="logging_in_message">Bitte warten …</string>
+  <string name="updating_caption_message">Bitte warten …</string>
   <string name="login_success">Anmeldung erfolgreich!</string>
   <string name="login_failed">Anmeldung fehlgeschlagen!</string>
   <string name="upload_failed">Datei nicht gefunden. Bitte versuche es mit einer anderen Datei.</string>
@@ -507,10 +508,13 @@
   <string name="category_edit_button_text">Kategorien aktualisieren</string>
   <string name="coordinates_edit_helper_make_edit_toast">Versuche, die Koordinaten zu aktualisieren.</string>
   <string name="coordinates_edit_helper_show_edit_title">Koordinaten aktualisieren</string>
+  <string name="description_edit_helper_show_edit_title">Beschreibung aktualieren</string>
   <string name="coordinates_edit_helper_show_edit_title_success">Erfolgreich</string>
   <string name="coordinates_edit_helper_show_edit_message">Koordinaten %1$s werden hinzugefügt.</string>
+  <string name="description_edit_helper_show_edit_message">Beschreibungen werden hinzugefügt.</string>
   <string name="coordinates_edit_helper_edit_message_else">Koordinaten konnten nicht hinzugefügt werden.</string>
   <string name="coordinates_picking_unsuccessful">Es können keine Koordinaten abgerufen werden.</string>
+  <string name="descriptions_picking_unsuccessful">Beschreibungen können nicht abgerufen werden</string>
   <string name="share_image_via">Bild teilen via</string>
   <string name="you_have_no_achievements_yet">Du hast noch keine Beiträge verfasst.</string>
   <string name="no_achievements_yet">%s hat noch keine Beiträge geleistet</string>
@@ -565,7 +569,7 @@
   <string name="resume">fortfahren</string>
   <string name="paused">Pausiert</string>
   <string name="more">Weitere</string>
-  <string name="favorites">Favoriten</string>
+  <string name="bookmarks">Lesezeichen</string>
   <string name="achievements_tab_title">Errungenschaften</string>
   <string name="leaderboard_tab_title">Bestenliste</string>
   <string name="rank_prefix">Rang:</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 26c37a899..8c490be76 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -581,7 +581,6 @@
   <string name="resume">reanudar</string>
   <string name="paused">En pausa</string>
   <string name="more">Más</string>
-  <string name="favorites">Favoritos</string>
   <string name="achievements_tab_title">Logros</string>
   <string name="leaderboard_tab_title">Tabla de posiciones</string>
   <string name="rank_prefix">Clasificación</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index a2b7b85e9..b2dccba10 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -345,7 +345,6 @@
   <string name="resume">jarraitu</string>
   <string name="paused">Gelditua</string>
   <string name="more">Gehiago</string>
-  <string name="favorites">Gogokoenak</string>
   <string name="achievements_tab_title">Lorpenak</string>
   <string name="leaderboard_column_user">Erabiltzailea</string>
   <string name="leaderboard_column_count">Zenbaketa</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index d5aec874f..38e110105 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -450,7 +450,6 @@
   <string name="theme_light_name">روشن</string>
   <string name="ask_to_turn_location_on">روشن کردن مکان؟</string>
   <string name="more">بیشتر</string>
-  <string name="favorites">علاقه‌مندی‌ها</string>
   <string name="achievements_tab_title">دستاوردها</string>
   <string name="leaderboard_column_rank">رتبه</string>
   <string name="leaderboard_column_user">کاربر</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index f5d1c57cb..ee34decd2 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -63,6 +63,7 @@
   <string name="signup">Rekisteröidy</string>
   <string name="logging_in_title">Kirjaudutaan</string>
   <string name="logging_in_message">Odota…</string>
+  <string name="updating_caption_title">Päivitetään kuvatekstejä ja kuvauksia</string>
   <string name="updating_caption_message">Odota...</string>
   <string name="login_success">Kirjautuminen onnistui!</string>
   <string name="login_failed">Kirjautuminen epäonnistui!</string>
@@ -467,6 +468,7 @@
   <string name="share_via">Jaa sovellus...</string>
   <string name="image_info">Kuvan tiedot</string>
   <string name="no_categories_found">Luokkia ei löytynyt</string>
+  <string name="no_depiction_found">Kuvauksia ei löytynyt</string>
   <string name="upload_cancelled">Peruutettu tallennus</string>
   <string name="dialog_box_text_nomination">Miksi %1$s tulisi poistaa?</string>
   <string name="review_is_uploaded_by">%1$s oli lähettänyt: %2$s</string>
@@ -492,12 +494,20 @@
   </plurals>
   <string name="category_edit_helper_edit_message_else">Ei voitu lisätä luokkia.</string>
   <string name="category_edit_button_text">Päivitetään luokkia</string>
+  <string name="coordinates_edit_helper_make_edit_toast">Yritetään päivittää koordinaatit.</string>
   <string name="coordinates_edit_helper_show_edit_title">Koordinaattien päivitys</string>
+  <string name="description_edit_helper_show_edit_title">Kuvaus päivitetty</string>
+  <string name="caption_edit_helper_show_edit_title">Kuvateksti päivitetty</string>
   <string name="coordinates_edit_helper_show_edit_title_success">Onnistui</string>
   <string name="coordinates_edit_helper_show_edit_message">Koordinaatit %1$s on lisätty.</string>
+  <string name="description_edit_helper_show_edit_message">Kuvaukset on lisätty.</string>
+  <string name="caption_edit_helper_show_edit_message">Kuvatekstit on lisätty.</string>
   <string name="coordinates_edit_helper_edit_message_else">Koordinaatteja ei voitu lisätä.</string>
   <string name="description_edit_helper_edit_message_else">Kuvauksia ei voitu lisätä.</string>
+  <string name="caption_edit_helper_edit_message_else">Kuvatekstiä ei voitu lisätä.</string>
   <string name="coordinates_picking_unsuccessful">Koordinaattien haku epäonnistui.</string>
+  <string name="descriptions_picking_unsuccessful">Kuvauksia ei voitu hakea.</string>
+  <string name="description_activity_title">Muokkaa kuvauksia ja kuvatekstejä</string>
   <string name="share_image_via">Jaa kuva</string>
   <string name="you_have_no_achievements_yet">Et ole vielä tehnyt muokkauksia</string>
   <string name="no_achievements_yet">%s ei ole vielä tehnyt muokkauksia</string>
@@ -524,6 +534,7 @@
   <string name="theme_default_name">Käytä järjestelmän</string>
   <string name="theme_dark_name">Tumma</string>
   <string name="theme_light_name">Vaalea</string>
+  <string name="cannot_open_location_settings">Sijaintiasetusten avaaminen epäonnistui. Ota sijainti käyttöön manuaalisesti</string>
   <string name="ask_to_turn_location_on">Ota sijainti käyttöön?</string>
   <string name="load_more">Lataa lisää</string>
   <string name="nearby_no_results">Paikkoja ei löytynyt, yritä vaihtaa hakuehtojasi.</string>
@@ -534,6 +545,7 @@
   <string name="confirm">Vahvista</string>
   <string name="instructions_title">Ohjeet</string>
   <string name="wikipedia_instructions_step_1">1. Käytä seuraavaa wikitekstiä:</string>
+  <string name="wikipedia_instructions_step_2">2. Klikkaamalla \"Vahvista\" Wikipedia-artikkeli avautuu</string>
   <string name="wikipedia_instructions_step_4">4. Klikkaa Muokkaa-ikonia (se kynältä näyttävä) siitä osasta.</string>
   <string name="wikipedia_instructions_step_5">5. Liitä wikiteksti sopivaan paikkaan.</string>
   <string name="wikipedia_instructions_step_7">7. Julkaise artikkeli</string>
@@ -542,7 +554,7 @@
   <string name="resume">jatka</string>
   <string name="paused">Pysäytetty</string>
   <string name="more">Lisää</string>
-  <string name="favorites">Suosikit</string>
+  <string name="bookmarks">Kirjanmerkit</string>
   <string name="achievements_tab_title">Saavutukset</string>
   <string name="leaderboard_tab_title">Pistetaulukko</string>
   <string name="rank_prefix">Sija:</string>
@@ -596,6 +608,7 @@
   <string name="welcome_custom_selector_ok">Mahtava</string>
   <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="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äsivu</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4be0f9d7d..b384e6009 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -583,7 +583,6 @@
   <string name="resume">reprendre</string>
   <string name="paused">En pause</string>
   <string name="more">Plus</string>
-  <string name="favorites">Favoris</string>
   <string name="achievements_tab_title">Réussites</string>
   <string name="leaderboard_tab_title">Tableau de classement</string>
   <string name="rank_prefix">Rang :</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 8d9966e32..a6124c27d 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -550,7 +550,6 @@
   <string name="resume">lanjut</string>
   <string name="paused">Dijeda</string>
   <string name="more">Lainnya</string>
-  <string name="favorites">Favorit</string>
   <string name="achievements_tab_title">Pencapaian</string>
   <string name="leaderboard_tab_title">Papan peringkat</string>
   <string name="rank_prefix">Peringkat:</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index a81d66fab..dbb29ba7e 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -80,7 +80,9 @@
   <string name="forgot_password">שכחת את הסיסמה?</string>
   <string name="signup">רישום</string>
   <string name="logging_in_title">כניסה לחשבון</string>
-  <string name="logging_in_message">נא להמתין…</string>
+  <string name="logging_in_message">נא להמתין...</string>
+  <string name="updating_caption_title">עדכון כיתובים ותיאורים</string>
+  <string name="updating_caption_message">נא להמתין...</string>
   <string name="login_success">הכניסה הצליחה!</string>
   <string name="login_failed">הכניסה נכשלה!</string>
   <string name="upload_failed">הקובץ לא נמצא. נא לנסות קובץ אחר.</string>
@@ -466,7 +468,7 @@
   <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="please_wait">נא להמתין...</string>
   <string name="images_featured_explanation">תמונות מובילות הן תמונות של צלמים ומאיירים מיומנים אותם בחרה קהילת ויקישיתוף בזכות איכות התוצר שהם תורמים לאתר.</string>
   <string name="images_via_nearby_explanation">תמונות שהועלו דרך מקומות בסביבה הן התמונות שנשלחות על ידי גילוי מקומות במפה.</string>
   <string name="thanks_received_explanation">תכונה זו מאפשרת לעורכים לשלוח מסרי תודה למשתמשים שביצעו עריכות מועילות - על ידי שימוש בקישור תודה בעמוד ההיסטוריה או עמוד ההבדלים.</string>
@@ -520,10 +522,18 @@
   <string name="category_edit_button_text">עדכון קטגוריות</string>
   <string name="coordinates_edit_helper_make_edit_toast">מנסים לעדכן נקודות ציון.</string>
   <string name="coordinates_edit_helper_show_edit_title">עדכון נקודות ציון</string>
+  <string name="description_edit_helper_show_edit_title">עדכון תיאור</string>
+  <string name="caption_edit_helper_show_edit_title">עדכון כיתוב</string>
   <string name="coordinates_edit_helper_show_edit_title_success">זה עבד</string>
   <string name="coordinates_edit_helper_show_edit_message">נקודות הציון %1$s נוספות.</string>
+  <string name="description_edit_helper_show_edit_message">התיאורים נוספים.</string>
+  <string name="caption_edit_helper_show_edit_message">הכיתוב נוסף.</string>
   <string name="coordinates_edit_helper_edit_message_else">לא היה אפשר להוסיף נקודות ציון.</string>
+  <string name="description_edit_helper_edit_message_else">לא היה אפשר להוסיף תיאורים.</string>
+  <string name="caption_edit_helper_edit_message_else">לא היה אפשר להוסיף כיתוב.</string>
   <string name="coordinates_picking_unsuccessful">לא ניתן לעדכן נקודות ציון.</string>
+  <string name="descriptions_picking_unsuccessful">אי־אפשר לקבל תיאורים.</string>
+  <string name="description_activity_title">עריכת תיאורים וכיתובים</string>
   <string name="share_image_via">שיתוף תמונה דרך</string>
   <string name="you_have_no_achievements_yet">לא תרמת בינתיים שום דבר</string>
   <string name="no_achievements_yet">%s עדיין לא תרם שום דבר</string>
@@ -578,7 +588,7 @@
   <string name="resume">להמשיך</string>
   <string name="paused">מושהה</string>
   <string name="more">עוד</string>
-  <string name="favorites">מועדפים</string>
+  <string name="bookmarks">סימניות</string>
   <string name="achievements_tab_title">הישגים</string>
   <string name="leaderboard_tab_title">לוח מובילים</string>
   <string name="rank_prefix">דירוג:</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 94f331f5f..e8b7609ae 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -549,7 +549,6 @@
   <string name="resume">継続</string>
   <string name="paused">一時停止</string>
   <string name="more">もっと見る</string>
-  <string name="favorites">お気に入り</string>
   <string name="achievements_tab_title">貢献</string>
   <string name="leaderboard_tab_title">リーダーボード</string>
   <string name="rank_prefix">順位</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index bf6348422..5c5de06dd 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -62,6 +62,8 @@
   <string name="signup">가입하기</string>
   <string name="logging_in_title">로그인 중</string>
   <string name="logging_in_message">기다려 주세요…</string>
+  <string name="updating_caption_title">캡션 및 설명를 업데이트하는 중</string>
+  <string name="updating_caption_message">기다려 주십시오...</string>
   <string name="login_success">로그인 성공!</string>
   <string name="login_failed">로그인 실패!</string>
   <string name="upload_failed">파일을 찾을 수 없습니다. 다른 파일을 사용해 주십시오.</string>
@@ -459,8 +461,16 @@
   <string name="category_edit_helper_edit_message_else">분류를 추가하지 못했습니다.</string>
   <string name="category_edit_button_text">분류 업데이트</string>
   <string name="coordinates_edit_helper_show_edit_title">좌표 업데이트</string>
+  <string name="description_edit_helper_show_edit_title">설명 업데이트</string>
+  <string name="caption_edit_helper_show_edit_title">캡션 업데이트</string>
   <string name="coordinates_edit_helper_show_edit_title_success">성공</string>
+  <string name="description_edit_helper_show_edit_message">설명이 추가되었습니다.</string>
+  <string name="caption_edit_helper_show_edit_message">캡션이 추가되었습니다.</string>
+  <string name="description_edit_helper_edit_message_else">설명을 추가하지 못했습니다.</string>
+  <string name="caption_edit_helper_edit_message_else">캡션을 추가하지 못했습니다.</string>
   <string name="coordinates_picking_unsuccessful">좌표를 가져올 수 없습니다.</string>
+  <string name="descriptions_picking_unsuccessful">설명을 가져오지 못했습니다.</string>
+  <string name="description_activity_title">설명 및 캡션 편집</string>
   <string name="share_image_via">다음을 통해 이미지 공유</string>
   <string name="you_have_no_achievements_yet">아직 기여가 없습니다</string>
   <string name="no_achievements_yet">%s님은 아직 기여가 없습니다</string>
@@ -504,6 +514,7 @@
   <string name="pause">일시 정지</string>
   <string name="resume">계속하기</string>
   <string name="paused">일시 중단됨</string>
+  <string name="bookmarks">책갈피</string>
   <string name="rank_prefix">순위:</string>
   <string name="leaderboard_column_rank">순위</string>
   <string name="leaderboard_column_user">사용자</string>
diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index a5703618d..807985850 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -161,7 +161,6 @@
   <string name="resume">dewam bike</string>
   <string name="paused">Sekinandî ye</string>
   <string name="more">Zêdetir</string>
-  <string name="favorites">Favorî</string>
   <string name="achievements_tab_title">Serkeftin</string>
   <string name="leaderboard_tab_title">Texteya lîderan</string>
   <string name="rank_prefix">Ast:</string>
diff --git a/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml
index 30d8c0c0a..fb2a0dcf2 100644
--- a/app/src/main/res/values-lb/strings.xml
+++ b/app/src/main/res/values-lb/strings.xml
@@ -328,7 +328,6 @@
   <string name="resume">virufueren</string>
   <string name="paused">Ënnerbrach</string>
   <string name="more">Méi</string>
-  <string name="favorites">Favoritten</string>
   <string name="achievements_tab_title">Realisatiounen</string>
   <string name="leaderboard_tab_title">Leaderboard</string>
   <string name="rank_prefix">Klassement:</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 10b816c97..ce1a114ad 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -556,7 +556,7 @@
   <string name="resume">продолжи</string>
   <string name="paused">Запрено</string>
   <string name="more">Повеќе</string>
-  <string name="favorites">Омилени</string>
+  <string name="bookmarks">Обележани</string>
   <string name="achievements_tab_title">Достигнувања</string>
   <string name="leaderboard_tab_title">Предводници</string>
   <string name="rank_prefix">Место:</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index c1f421fd4..2e4470924 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -355,7 +355,6 @@
   <string name="resume">ခေတ္တရပ်နားရာမှ ပြန်လုပ်ရန်</string>
   <string name="paused">ခေတ္တရပ်ပြီး</string>
   <string name="more">ပို၍</string>
-  <string name="favorites">ကြိုက်နှစ်သက်သည်များ</string>
   <string name="achievements_tab_title">အောင်မြင်မှုပန်းတိုင်များ</string>
   <string name="leaderboard_tab_title">အကြီးအကဲခုံရုံး</string>
   <string name="rank_prefix">အဆင့်-</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 9da7d7203..64f7fb751 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -553,7 +553,6 @@
   <string name="resume">hervatten</string>
   <string name="paused">Gepauzeerd</string>
   <string name="more">Meer</string>
-  <string name="favorites">Favorieten</string>
   <string name="achievements_tab_title">Prestaties</string>
   <string name="leaderboard_tab_title">Scorebord</string>
   <string name="rank_prefix">Ranking:</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index a829b1e8b..a1b2a4f9a 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -565,7 +565,6 @@
   <string name="resume">wznów</string>
   <string name="paused">Zatrzymano</string>
   <string name="more">Więcej</string>
-  <string name="favorites">Ulubione</string>
   <string name="achievements_tab_title">Osiągnięcia</string>
   <string name="leaderboard_tab_title">Ranking</string>
   <string name="count_prefix">Licznik:</string>
diff --git a/app/src/main/res/values-pms/strings.xml b/app/src/main/res/values-pms/strings.xml
index 2c6fac6cd..dfc4efc27 100644
--- a/app/src/main/res/values-pms/strings.xml
+++ b/app/src/main/res/values-pms/strings.xml
@@ -554,7 +554,7 @@
   <string name="resume">ancaminé torna</string>
   <string name="paused">An pàura</string>
   <string name="more">Ëd pi</string>
-  <string name="favorites">Preferì</string>
+  <string name="bookmarks">Marcapàgine</string>
   <string name="achievements_tab_title">Realisassion</string>
   <string name="leaderboard_tab_title">Classìfica</string>
   <string name="rank_prefix">Rangh:</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1cd8b3862..123f2b045 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -559,7 +559,6 @@
   <string name="resume">continuar</string>
   <string name="paused">Pausado</string>
   <string name="more">Mais</string>
-  <string name="favorites">Favoritos</string>
   <string name="achievements_tab_title">Conquistas</string>
   <string name="leaderboard_tab_title">Tabela de classificação</string>
   <string name="rank_prefix">Classificação:</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d543b6971..b6e250f63 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -558,7 +558,6 @@
   <string name="resume">continuar</string>
   <string name="paused">Em pausa</string>
   <string name="more">Mais</string>
-  <string name="favorites">Preferidos</string>
   <string name="achievements_tab_title">Realizações</string>
   <string name="leaderboard_tab_title">Tabela de classificação</string>
   <string name="rank_prefix">Classificação:</string>
diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml
index 624f199fe..c57888736 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -173,7 +173,6 @@
   <string name="exif_tag_name_location">{{Identical|Location}}</string>
   <string name="title_app_shortcut_bookmark">{{identical|Bookmark}}</string>
   <string name="more">{{Identical|More}}</string>
-  <string name="favorites">{{Identical|Favorite}}</string>
   <string name="map_attribution">&lt;code&gt;&amp;amp;#169;&lt;/code&gt;  is the copyright symbol (©).</string>
   <string name="location_picker_image_view_shadow">A description of a visual element, location picker image shadow. Used for accesibility usually.</string>
   <string name="done">{{identical|Done}}</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index d3cfbc84b..731b22a73 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -557,7 +557,6 @@
   <string name="resume">reia</string>
   <string name="paused">întrerupt</string>
   <string name="more">Mai mult</string>
-  <string name="favorites">Favorite</string>
   <string name="achievements_tab_title">Realizări</string>
   <string name="leaderboard_tab_title">Clasament</string>
   <string name="rank_prefix">Loc:</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b59ff1533..ee5900b59 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -535,10 +535,13 @@
   <string name="category_edit_button_text">Обновить категории</string>
   <string name="coordinates_edit_helper_make_edit_toast">Попытка обновить координаты.</string>
   <string name="coordinates_edit_helper_show_edit_title">Обновление координат</string>
+  <string name="description_edit_helper_show_edit_title">Обновление описания</string>
   <string name="coordinates_edit_helper_show_edit_title_success">Успешно</string>
   <string name="coordinates_edit_helper_show_edit_message">Координаты %1$s добавлены.</string>
+  <string name="description_edit_helper_show_edit_message">Описания добавлены.</string>
   <string name="coordinates_edit_helper_edit_message_else">Не удалось добавить координаты.</string>
   <string name="coordinates_picking_unsuccessful">Не удалось получить координаты.</string>
+  <string name="descriptions_picking_unsuccessful">Не удалось получить описания.</string>
   <string name="share_image_via">Поделиться изображением с помощью</string>
   <string name="you_have_no_achievements_yet">Вы пока что не внесли вклада.</string>
   <string name="no_achievements_yet">У %s пока ещё нет вклада</string>
@@ -593,7 +596,7 @@
   <string name="resume">продолжить</string>
   <string name="paused">Приостановлено</string>
   <string name="more">Ещё</string>
-  <string name="favorites">Избранное</string>
+  <string name="bookmarks">Закладки</string>
   <string name="achievements_tab_title">Достижения</string>
   <string name="leaderboard_tab_title">Таблица лидеров</string>
   <string name="rank_prefix">Ранг:</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 17935ada4..80394c077 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -577,7 +577,6 @@
   <string name="resume">pokračovať</string>
   <string name="paused">Pozastavené</string>
   <string name="more">Viac</string>
-  <string name="favorites">Obľúbené</string>
   <string name="achievements_tab_title">Úspechy</string>
   <string name="leaderboard_tab_title">Výsledková tabuľka</string>
   <string name="rank_prefix">Poradie:</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index b0bd57ad1..c01d3a1be 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -536,7 +536,6 @@
   <string name="resume">nadaljuj</string>
   <string name="paused">Premor</string>
   <string name="more">Več</string>
-  <string name="favorites">Priljubljene</string>
   <string name="achievements_tab_title">Dosežki</string>
   <string name="leaderboard_tab_title">Lestvica</string>
   <string name="rank_prefix">Mesto:</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index f65794722..c99201f25 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -551,7 +551,6 @@
   <string name="resume">återuppta</string>
   <string name="paused">Pausad</string>
   <string name="more">Mer</string>
-  <string name="favorites">Favoriter</string>
   <string name="achievements_tab_title">Prestationer</string>
   <string name="leaderboard_tab_title">Topplista</string>
   <string name="rank_prefix">Rang:</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index 18b26b772..ae2a78202 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -472,7 +472,6 @@
   <string name="instructions_title">సూచనలు</string>
   <string name="wikipedia_instructions_step_7">7. వ్యాసాన్ని ప్రచురించండి</string>
   <string name="more">మరిన్ని</string>
-  <string name="favorites">ఇష్టాంశాలు</string>
   <string name="leaderboard_column_user">వాడుకరి</string>
   <string name="statistics_quality">నాణ్యమైన బొమ్మలు</string>
   <string name="license_step_title">మాధ్యమ లైసెన్సు</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3a24338b4..bb93b2df2 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -566,7 +566,6 @@
   <string name="resume">devam et</string>
   <string name="paused">Durduruldu</string>
   <string name="more">Daha fazla</string>
-  <string name="favorites">Favoriler</string>
   <string name="achievements_tab_title">Başarılar</string>
   <string name="leaderboard_tab_title">Liderlik sıralaması</string>
   <string name="rank_prefix">Sıra:</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 36977ae9c..7b421360c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -583,7 +583,7 @@
   <string name="resume">продовжити</string>
   <string name="paused">Призупинено</string>
   <string name="more">Більше</string>
-  <string name="favorites">Улюблені</string>
+  <string name="bookmarks">Закладки</string>
   <string name="achievements_tab_title">Досягнення</string>
   <string name="leaderboard_tab_title">Таблиця лідерів</string>
   <string name="rank_prefix">Ранг:</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 57fb793bb..ca7f48c68 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -2,6 +2,7 @@
 <!-- Authors:
 * Bluetpp
 * Harriettruong3
+* Keo010122
 * Leducthn
 * Leduyquang753
 * Minh Nguyen
@@ -50,6 +51,7 @@
   <string name="signup">Mở tài khoản</string>
   <string name="logging_in_title">Đang đăng nhập</string>
   <string name="logging_in_message">Vui lòng chờ…</string>
+  <string name="updating_caption_message">Vui lòng chờ…</string>
   <string name="login_success">Đã đăng nhập thành công!</string>
   <string name="login_failed">Đăng nhập thất bại!</string>
   <string name="upload_failed">Không tìm thấy tập tin. Xin vui lòng thử tập tin khác.</string>
@@ -246,7 +248,9 @@
   <string name="category_edit_helper_show_edit_title_success">Thành công</string>
   <string name="category_edit_helper_edit_message_else">Không thể thêm danh mục.</string>
   <string name="category_edit_button_text">Cập nhật danh mục</string>
+  <string name="description_edit_helper_edit_message_else">Không thể thêm mô tả.</string>
   <string name="todo_improve">Các cải thiện được đề xuất:</string>
   <string name="missing_category">- Thêm danh mục vào hình ảnh này để cải thiện khả năng sử dụng.</string>
   <string name="missing_article">- Thêm hình ảnh này vào bài viết Wikipedia được liên kết không có hình ảnh.</string>
+  <string name="bookmarks">Dấu trang</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index cecf45813..8fef893b5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -568,7 +568,7 @@
   <string name="resume">繼續</string>
   <string name="paused">已暫停</string>
   <string name="more">更多</string>
-  <string name="favorites">個人最愛</string>
+  <string name="bookmarks">書籤</string>
   <string name="achievements_tab_title">成果</string>
   <string name="leaderboard_tab_title">排行榜</string>
   <string name="rank_prefix">排名：</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 22c6b52cc..8a83402c4 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -576,7 +576,6 @@
   <string name="resume">继续</string>
   <string name="paused">已暂停</string>
   <string name="more">更多</string>
-  <string name="favorites">我的收藏</string>
   <string name="achievements_tab_title">成就</string>
   <string name="leaderboard_tab_title">排行榜</string>
   <string name="rank_prefix">排名：</string>