diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1844e29d7..e61b61617 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -90,6 +90,8 @@ Tippe auf diese Nachricht oder drücke „Zurück“, um diesen Schritt zu über
   <string name="use_previous">Vorherige(n) Titel/Beschreibung verwenden</string>
   <string name="allow_gps">Aktuellen Standort automatisch abrufen</string>
   <string name="allow_gps_summary">Ruft den aktuellen Standort ab, um Kategorievorschläge anzubieten, falls das Bild keine Geotags hat.</string>
+  <string name="license_name_cc_by_sa_four">Attribution-ShareAlike 4.0</string>
+  <string name="license_name_cc_by_four">Attribution 4.0</string>
   <string name="license_name_cc_by_sa">Attribution-ShareAlike 3.0</string>
   <string name="license_name_cc_by">Attribution 3.0</string>
   <string name="license_name_cc0">CC0</string>
diff --git a/app/src/main/res/values-diq/strings.xml b/app/src/main/res/values-diq/strings.xml
index 39a5165b2..3313756bc 100644
--- a/app/src/main/res/values-diq/strings.xml
+++ b/app/src/main/res/values-diq/strings.xml
@@ -116,7 +116,7 @@
   <string name="license_name_gfdl">GNU Perekerdışê xoseri lisans</string>
   <string name="tutorial_3_text">Bar mekeri:</string>
   <string name="tutorial_4_text">Misal bar kerden:</string>
-  <string name="welcome_final_text">To no fahm kerd?</string>
+  <string name="welcome_final_text">Şıma fam kerdê?</string>
   <string name="welcome_final_button_text">E!</string>
   <string name="detail_panel_cats_label">Kategoriy</string>
   <string name="detail_panel_cats_loading">Bar beno...</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index b02dfb209..c5bc628fe 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -10,6 +10,7 @@
   <string name="logging_in_message">لطفاً صبر کنید...</string>
   <string name="login_success">ورود موفق!</string>
   <string name="login_failed">ورود ناموفق!</string>
+  <string name="upload_failed">پرونده یافت نشد لطفاً پرونده دیگری را امتحان کنید.</string>
   <string name="authentication_failed">تأیید اعتبار انجام نشد!</string>
   <string name="uploading_started">بارگذاری آغاز شد!</string>
   <string name="upload_completed_notification_title">%1$s بارگذاری شد!</string>
@@ -19,7 +20,7 @@
   <string name="upload_progress_notification_title_finishing">اتمام بارگذاری %1$s</string>
   <string name="upload_failed_notification_title">%1$s بارگذاری نشد</string>
   <string name="upload_failed_notification_subtitle">برای دیدن انگشت بزنید</string>
-  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
+  <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">یک پرونده در حال بارگذاری</item>
     <item quantity="other">%d پرونده در حال بارگذاری</item>
   </plurals>
@@ -70,12 +71,16 @@
   <string name="preference_tracking">گزارش‌های استفاده</string>
   <string name="preference_tracking_summary">برای کمک به بهبود نرم‌افزار، گزارش‌های استفاده را برای ویکی‌مدیا ارسال نمائید</string>
   <string name="title_activity_settings">تنظیمات</string>
+  <string name="title_activity_signup">ثبت نام</string>
   <string name="menu_about">درباره</string>
-  <string name="about_license" fuzzy="true">نرم‌افزار متن‌باز آزاد تحت &lt;a href=\"https://github.com/wikimedia/apps-android-commons/blob/master/COPYING\"&gt;مجوز آپاچی نسخهٔ ۲&lt;/a&gt;</string>
-  <string name="about_improve" fuzzy="true">منبع در &lt;a href=\"https://github.com/wikimedia/apps-android-commons\"&gt;GitHub&lt;/a&gt;. اشکالات در &lt;a href=\"https://github.com/nicolas-raoul/apps-android-commons/issues\"&gt;باگزیلا&lt;/a&gt;.</string>
+  <string name="about_license">نرم‌افزار متن‌باز آزاد تحت &lt;a href=\"https://github.com/wikimedia/apps-android-commons/blob/master/COPYING\"&gt;مجوز آپاچی نسخهٔ ۲&lt;/a&gt;
+
+ویکی‌انبار و نشانش یک نشان تجاری‌ست و با اجازهٔ بنیاد ویکی‌مدیا استفاده می‌شود. ما زیرمجموعه یا شعبهٔ بنیاد نیستیم.</string>
+  <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Source&lt;/a&gt; and &lt;a href=\"https://commons-app.github.io/\"&gt;وب‌سایت&lt;/a&gt; در گیت‌هاب. ایجاد یک &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;درخواست در گیت‌هاب&lt;/a&gt; برای گزارش باگ و یا پیشنهاد یک خصوصیت جدید.</string>
   <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;سیاست حفظ حریم خصوصی&lt;/a&gt;</string>
   <string name="title_activity_about">درباره</string>
   <string name="menu_feedback">ارسال بازخورد (از طریق ایمیل)</string>
+  <string name="no_email_client">نرم‌افزار ایمیل نصب نیست</string>
   <string name="provider_categories">رده‌هایی که اخیراً استفاده شده‌اند</string>
   <string name="waiting_first_sync">در حال انتظار برای اولین همگام‌سازی...</string>
   <string name="no_uploads_yet">شما هنوز نگاره‌ای بارگذاری نکرده‌اید.</string>
@@ -84,6 +89,9 @@
   <string name="share_license_summary">این نگاره تحت مجوز %1$s است</string>
   <string name="menu_download">دریافت</string>
   <string name="preference_license">مجوز</string>
+  <string name="use_previous">از عنوان/توضیحات پیشین استفاده کنید</string>
+  <string name="allow_gps">دریافت خودکار موقعیت کنونی</string>
+  <string name="allow_gps_summary">درحال دریافت موقعیت برای پیشنهاد رده در صورتی که برچسب جغرافیایی وجود نداشته باشد.</string>
   <string name="license_name_cc_by_sa">CC Attribution-ShareAlike 3.0</string>
   <string name="license_name_cc_by">CC Attribution 3.0</string>
   <string name="license_name_cc0">CC0</string>
@@ -99,6 +107,7 @@
   <string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (لهستان)</string>
   <string name="license_name_cc_by_sa_3_0_ro">CC BY-SA 3.0 (رمانی)</string>
   <string name="license_name_cc_by_3_0">CC BY 3.0</string>
+  <string name="license_name_cc_by_sa_4_0">CC BY-SA 4.0</string>
   <string name="license_name_cc_by_4_0">CC BY 4.0</string>
   <string name="license_name_cc_zero">CC Zero</string>
   <string name="license_name_own_pd">own-pd</string>
@@ -117,6 +126,20 @@
   <string name="license_name_pd_ineligible">مالکیت عمومی (فاقد شرایط لازم برای حق تکثیر)</string>
   <string name="license_name_attribution">انتساب</string>
   <string name="license_name_gfdl">مجوز اسناد آزاد گنو</string>
+  <string name="tutorial_1_text">ویکی‌انبار اکثر پرونده‌هایی که در ویکی‌پدیا استفاده می‌شوند را در خود نگه می‌دارد.</string>
+  <string name="tutorial_1_subtext">تصاویر شما به مردم در اقصی نقاط دنیا کمک می‌کند!</string>
+  <string name="tutorial_2_text">لطفاً تصاویری که توسط خودتان گرفته شده‌اند یا ایجاد شده‌اند را بارگذاری کنید:</string>
+  <string name="tutorial_2_subtext">-اجسام طبیعی (گیاه، جانور، کوه)
+-اجسام کاربردی (دوچرخه، ایستگاه قطار)
+-افراد مشهور (شهردار، قهرمانان المپیک)</string>
+  <string name="tutorial_3_text">لطفاً بارگذاری نکنید:</string>
+  <string name="tutorial_3_subtext">-سلفی خودتان یا تصویر دوستانتان
+-تصاویری که از اینترنت دانلود کردید
+-نماگرفت از دیگر اپلیکیشن‌‌ها</string>
+  <string name="tutorial_4_text">نمونه بارگذاری:</string>
+  <string name="tutorial_4_subtext">-عنوان: خانهٔ اپرای سیدنی
+-توضیحات: خانهٔ اپرای سیدنی از آن طرف خلیج
+-رده‌ها: Sydney Opera House, Sydney Opera House from the west, Sydney Opera House remote views</string>
   <string name="welcome_wikipedia_text">عکس‌های خود را به اشتراک بگذارید. به ویکی‌پدیا کمک کنید تا مقالاتش زنده شوند!</string>
   <string name="welcome_wikipedia_subtext">ویکی‌پدیا از تصویرهای ویکی‌انبار استفاده می‌کند.</string>
   <string name="welcome_copyright_text">تصویرهای شما به مطالعهٔ مردم در سراسر دنیا کمک می‌کنند.</string>
@@ -129,8 +152,12 @@
   <string name="detail_description_empty">بدون توضیحات</string>
   <string name="detail_license_empty">مجوز ناشناخته</string>
   <string name="menu_refresh">تازه‌کردن</string>
+  <string name="storage_permission_rationale">اجازه‌های مورد نیاز: مطالعهٔ حافظهٔ خارجی. اپلیکیشن بدون آن نمی‌تواند کار کند.</string>
+  <string name="location_permission_rationale">اجازه‌های اختیاری: دریافت موقعیت برای پیشنهاد رده</string>
   <string name="ok">تأیید</string>
+  <string name="title_activity_nearby">مکان‌‌های اطراف</string>
   <string name="warning">هشدار</string>
+  <string name="file_exists">پرونده در ویکی‌انبار موجود است. آیا مطمئنید که می‌خواهید ادامه دهید؟</string>
   <string name="yes">بله</string>
   <string name="no">خیر</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e69e41948..aba9d7e8e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -90,6 +90,8 @@ Appuyez sur ce message (ou retournez en arrière) pour sauter cette étape.</str
   <string name="use_previous">Utiliser le titre ou la description précédent</string>
   <string name="allow_gps">Obtenir automatiquement l’emplacement actuel</string>
   <string name="allow_gps_summary">Récupérer l’emplacement actuel pour proposer des suggestions de catégorie si l’image n’est pas marquée géographiquement</string>
+  <string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string>
+  <string name="license_name_cc_by_four"> Attribution 4.0</string>
   <string name="license_name_cc_by_sa"> Attribution-ShareAlike 3.0</string>
   <string name="license_name_cc_by">CCu00A0Attributionu00A03.0</string>
   <string name="license_name_cc0">CC0</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 267633c3f..825c9face 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -5,10 +5,12 @@
   <string name="username">利用者名</string>
   <string name="password">パスワード</string>
   <string name="login">ログイン</string>
+  <string name="signup">利用者登録</string>
   <string name="logging_in_title">ログイン中</string>
   <string name="logging_in_message">お待ちください...</string>
   <string name="login_success">ログインしました!</string>
   <string name="login_failed">ログインに失敗しました!</string>
+  <string name="upload_failed">ファイルが見つかりません。別のファイルでお試しください。</string>
   <string name="authentication_failed">認証に失敗しました!</string>
   <string name="uploading_started">アップロードを開始しました!</string>
   <string name="upload_completed_notification_title">%1$s をアップロードしました!</string>
@@ -18,7 +20,9 @@
   <string name="upload_progress_notification_title_finishing">%1$s のアップロードを完了中</string>
   <string name="upload_failed_notification_title">%1$s のアップロードに失敗しました</string>
   <string name="upload_failed_notification_subtitle">閲覧するにはタップしてください</string>
-  <string name="uploads_pending_notification_indicator" fuzzy="true">%d ファイルをアップロード中</string>
+  <plurals name="uploads_pending_notification_indicator">
+    <item quantity="other">%d 件のファイルをアップロード中</item>
+  </plurals>
   <string name="title_activity_contributions">自分のアップロード</string>
   <string name="contribution_state_queued">順番待ち中</string>
   <string name="contribution_state_failed">失敗しました</string>
@@ -26,6 +30,7 @@
   <string name="contribution_state_starting">アップロード中</string>
   <string name="menu_from_gallery">ギャラリーから選択</string>
   <string name="menu_from_camera">写真を撮影</string>
+  <string name="menu_nearby">付近</string>
   <string name="provider_contributions">自分のアップロード</string>
   <string name="menu_share">共有</string>
   <string name="menu_open_in_browser">ブラウザーで表示</string>
@@ -34,7 +39,7 @@
   <string name="login_failed_network">ログインできません - ネットワークのエラーです</string>
   <string name="login_failed_username">ログインできません - 利用者名を確認してください</string>
   <string name="login_failed_password">ログインできません - パスワードを確認してください</string>
-  <string name="login_failed_throttled" fuzzy="true">失敗した回数が多すぎます。数分でもう一度お試しください。</string>
+  <string name="login_failed_throttled">失敗した回数が多すぎます。数分でもう一度お試しください。</string>
   <string name="login_failed_blocked">申し訳ありませんが、この利用者はコモンズでブロックされています。</string>
   <string name="login_failed_generic">ログイン失敗</string>
   <string name="share_upload_button">アップロード</string>
@@ -42,6 +47,16 @@
   <string name="menu_upload_single">アップロード</string>
   <string name="categories_search_text_hint">検索するカテゴリ</string>
   <string name="menu_save_categories">保存</string>
+  <plurals name="contributions_subtitle">
+    <item quantity="zero">アップロードしたファイルはありません</item>
+    <item quantity="other">%d 件のアップロード</item>
+  </plurals>
+  <plurals name="starting_multiple_uploads">
+    <item quantity="other">%d 件のアップロードを開始中</item>
+  </plurals>
+  <plurals name="multiple_uploads_title">
+    <item quantity="other">%d 件のアップロード</item>
+  </plurals>
   <string name="categories_not_found">%1$s に一致するカテゴリが見つかりません</string>
   <string name="categories_skip_explanation">あなたの画像をウィキメディア・コモンズで見つけやすくするためにカテゴリを追加してください。
 
@@ -51,6 +66,7 @@
   <string name="preference_tracking">使用状況の報告</string>
   <string name="preference_tracking_summary">アプリの改善を支援するために、使用状況の報告をウィキメディアに送信する</string>
   <string name="title_activity_settings">設定</string>
+  <string name="title_activity_signup">利用者登録</string>
   <string name="about_license" fuzzy="true">&lt;a href=\"https://github.com/wikimedia/apps-android-commons/blob/master/COPYING\"&gt;Apache ライセンス v2&lt;/a&gt; のもとで公開されているオープン ソース ソフトウェア</string>
   <string name="about_improve" fuzzy="true">ソースは &lt;a href=\"https://github.com/wikimedia/apps-android-commons\"&gt;GitHub&lt;/a&gt; にあります。バグは &lt;a href=\"https://github.com/nicolas-raoul/apps-android-commons/issues\"&gt;Github&lt;/a&gt; へ。</string>
   <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/プライバシー・ポリシー\"&gt;プライバシー・ポリシー&lt;/a&gt;</string>
diff --git a/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml
index 14fc89eef..ba44879ca 100644
--- a/app/src/main/res/values-lb/strings.xml
+++ b/app/src/main/res/values-lb/strings.xml
@@ -89,6 +89,8 @@ Leet w.e.g. &lt;a href=\"https://github.com/commons-app/apps-android-commons/iss
   <string name="use_previous">Viregen Titel/Beschreiwung benotzen</string>
   <string name="allow_gps">Automatesch déi aktuell Plaz kréien</string>
   <string name="allow_gps_summary">Aktuell Plaz ofruffe fir Propose fir Kategorien ze erméigleche wann d\'Bild keng Geotaggen huet</string>
+  <string name="license_name_cc_by_sa_four">Attribution-ShareAlike 4.0</string>
+  <string name="license_name_cc_by_four">Attribution 4.0</string>
   <string name="license_name_cc_by_sa">CCu00A0Attribution-ShareAlikeu00A03.0</string>
   <string name="license_name_cc_by">CCu00A0Attributionu00A03.0</string>
   <string name="license_name_cc0">CC0</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index fd9fb9b40..ef9171873 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -90,6 +90,8 @@
   <string name="use_previous">Користи претходен наслов/опис</string>
   <string name="allow_gps">Автоматски давај ја тековната местоположба</string>
   <string name="allow_gps_summary">Добивање на тековната местоположба за да се дадат предлози за категории, доколку сликата нема геоознаки</string>
+  <string name="license_name_cc_by_sa_four"> Наведи извор-Сподели под исти услови 4.0</string>
+  <string name="license_name_cc_by_four">Наведи извор 4.0</string>
   <string name="license_name_cc_by_sa"> Наведи извор-Сподели под исти услови 3.0</string>
   <string name="license_name_cc_by">Наведи извор 3.0</string>
   <string name="license_name_cc0">CC0</string>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 1b2922c88..a211af54d 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -1,34 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name" fuzzy="true">විකිමීඩියා කොමන්ස්</string>
+  <string name="app_name">කොමන්ස්</string>
   <string name="menu_settings">සැකසුම්</string>
   <string name="username">පරිශීලක නාමය</string>
   <string name="password">මුරපදය</string>
   <string name="login">පිවිසෙන්න</string>
+  <string name="signup">ලියාපදිංචි වන්න</string>
   <string name="logging_in_title">පිවිසෙමින්</string>
   <string name="logging_in_message">මදක් රැදීසිටින්න...</string>
   <string name="login_success">පිවිසුම සාර්ථකයි!</string>
   <string name="login_failed">පිවිසීම අසාර්ථකයි!</string>
+  <string name="upload_failed">ගොනුව හමු නොවිණි. තවත් ගොනුවක් උත්සාහ කරන්න.</string>
   <string name="authentication_failed">සහතික කිරීම අසාර්ථකයි</string>
   <string name="uploading_started">උඩුගතකිරීම ආරම්හවූවා!</string>
-  <string name="upload_completed_notification_title">%1$s උදුගතකලා!</string>
+  <string name="upload_completed_notification_title">%1$s උඩුගතකලා!</string>
   <string name="upload_completed_notification_text">ඔබගේ උඩුගතකිරීම පෙන්වන්න තට්ටු කරන්න</string>
   <string name="upload_progress_notification_title_start">%1$s උඩුගතකිරීම් ආරම්භ කරමින්</string>
   <string name="upload_progress_notification_title_in_progress">%1$s උඩුගත කෙරිමින්</string>
   <string name="upload_progress_notification_title_finishing"> %1$s උඩුගතකිරීම් අවසන් කරමින්</string>
   <string name="upload_failed_notification_title">උදුගතකරමින්  %1$s අසාර්ථකයි</string>
   <string name="upload_failed_notification_subtitle">පෙන්වන්න තට්ටු කරන්න.</string>
-  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
-    <item quantity="one">ගොනුවක් උඩුගත කෙරේ</item>
-    <item quantity="other">ගොනු %dක් උඩුගත කෙරේ</item>
+  <plurals name="uploads_pending_notification_indicator">
+    <item quantity="one">1 ගොනුවක් උඩුගත කෙරේ</item>
+    <item quantity="other">ගොනු %d ක් උඩුගත කෙරේ</item>
   </plurals>
   <string name="title_activity_contributions">මගේ උඩුගතකිරීම්</string>
   <string name="contribution_state_queued">පෝලිමට එක්වූවා</string>
   <string name="contribution_state_failed">අසාර්ථකයි</string>
-  <string name="contribution_state_in_progress">%1$d%% ක් ඉවරයි</string>
+  <string name="contribution_state_in_progress">%1$d%% ක් සම්පුර්ණයි</string>
   <string name="contribution_state_starting">උඩුගත කෙරෙමින් පවතී</string>
   <string name="menu_from_gallery">ගැලරියෙන්</string>
   <string name="menu_from_camera">ඡායාරූපයක් ගන්න</string>
+  <string name="menu_nearby">අවට</string>
   <string name="provider_contributions">මගේ උඩුගතකිරීම්</string>
   <string name="menu_share">හුවමාරු කරන්න</string>
   <string name="menu_open_in_browser">ගවේෂකයෙහි විවෘත කරන්න</string>
@@ -37,7 +40,7 @@
   <string name="login_failed_network">පිවිසීමට නොහැකිය-ජාලය ඇනහිටීමක්</string>
   <string name="login_failed_username">පිවිසීමට නොහැකිය-කරුණාකර ඔබගේ පිවිසුම්-නාමය පරික්ෂා කරන්න</string>
   <string name="login_failed_password">පිවිසීමට නොහැකිය-කරුණාකර ඔබගේ මුරපදය පරික්ෂා කරන්න.</string>
-  <string name="login_failed_throttled" fuzzy="true">බොහෝ අසාර්ථක උත්සාහයන් කරඇත.කරුණාකර මඳ වෙලාවකට පසුව උත්සාහ කරන්න</string>
+  <string name="login_failed_throttled">බොහෝ අසාර්ථක උත්සාහයන් කර ඇත. කරුණාකර මිනිත්තු කිහිපයකට පසුව උත්සාහ කරන්න</string>
   <string name="login_failed_blocked">කණගාටුයි,මෙම පරිශීලක වාරණයට ලක්කර ඇත.</string>
   <string name="login_failed_generic">පිවිසීම අසාර්ථකයි</string>
   <string name="share_upload_button">උඩුගත කරන්න</string>
@@ -51,21 +54,68 @@
     <item quantity="one">එක් උඩුගත කිරීමක්</item>
     <item quantity="other">උඩුගත කිරීම් %d ක්</item>
   </plurals>
+  <plurals name="starting_multiple_uploads">
+    <item quantity="one">1 උඩුගත කිරීමක් ආරම්භ කරමින්</item>
+    <item quantity="other">උඩුගත කිරීම් %d ක් ආරම්භ කරමින්</item>
+  </plurals>
+  <plurals name="multiple_uploads_title">
+    <item quantity="one">1 උඩුගත කිරීමක්</item>
+    <item quantity="other">උඩුගත කිරීම් %d ක්</item>
+  </plurals>
   <string name="categories_not_found">ප්‍රවර්ග සැසඳේන්නේ නැත %1$s හමුවිsය</string>
   <string name="categories_activity_title">ප්‍රවර්ග</string>
   <string name="preference_tracking">භාවිත වාර්තා</string>
   <string name="title_activity_settings">සැකසුම්</string>
+  <string name="title_activity_signup">ලියාපදිංචි වන්න</string>
   <string name="menu_about">පිළිබඳ</string>
   <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;පෞද්ගලිකත්ව ප්‍රතිපත්තිය&lt;/a&gt;</string>
   <string name="title_activity_about">පිළිබඳ</string>
+  <string name="menu_feedback">අදහස් යවන්න (විද්‍යුත් තැපෑල හරහා)</string>
+  <string name="no_email_client">විද්‍යුත් තැපැල් සේවාදායකයා ස්ථාපනය කර නැත</string>
+  <string name="provider_categories">මෑතකදී භාවිතා කල ප්‍රවර්ග</string>
+  <string name="waiting_first_sync">පළමු සමමුහුර්තය සඳහා රැඳී සිටිමින්...</string>
   <string name="no_uploads_yet">ඔබ තවමත් කිසිදු ඡායාරුපයක් උඩුගත කර නැත.</string>
   <string name="menu_retry_upload">නැවත උත්සහ කරන්න</string>
   <string name="menu_cancel_upload">අවලංගු කරන්න</string>
   <string name="share_license_summary">මෙම පින්තූරය %1$s යටතේ වලංගු වනු ඇත</string>
   <string name="menu_download">බාගන්න</string>
   <string name="preference_license">බලපත්‍රය</string>
+  <string name="use_previous">පෙර මාතෘකාව/විස්තරය භාවිතා කරන්න</string>
+  <string name="allow_gps">වත්මන් ස්ථානය ස්වයංක්රීයව ලබාගන්න</string>
+  <string name="license_name_cc_by_sa">ඇට්‍රිබ්යුශන්-ශෙයාඅලයික් 3.0</string>
+  <string name="license_name_cc_by">ඇට්‍රිබ්යුශන්</string>
+  <string name="license_name_cc0">CC0</string>
+  <string name="license_name_cc_by_sa_3_0">CC BY-SA 3.0</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>
+  <string name="license_name_cc_by_sa_3_0_es">CC BY-SA 3.0 (ස්පාඤ්ඤය)</string>
+  <string name="license_name_cc_by_sa_3_0_hr">CC BY-SA 3.0 (ක්රොඒෂියාව)</string>
+  <string name="license_name_cc_by_sa_3_0_lu">CC BY-SA 3.0 (ලක්සම්බර්ග්)</string>
+  <string name="license_name_cc_by_sa_3_0_nl">CC BY-SA 3.0 (නෙදර්ලන්තය)</string>
+  <string name="license_name_cc_by_sa_3_0_no">CC BY-SA 3.0 (නෝර්වේ)</string>
+  <string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (පෝලන්තය)</string>
+  <string name="license_name_cc_by_sa_3_0_ro">CC BY-SA 3.0 (රුමේනියාව)</string>
+  <string name="license_name_cc_by_3_0">CC BY 3.0</string>
+  <string name="license_name_cc_by_sa_4_0">CC BY-SA 4.0</string>
+  <string name="license_name_cc_by_4_0">CC BY 4.0</string>
+  <string name="license_name_cc_zero">CC Zero</string>
+  <string name="license_name_own_pd">own-pd</string>
+  <string name="license_name_cc_by_sa_2_5">CC BY-SA 2.5</string>
+  <string name="license_name_cc_by_2_5">CC BY 2.5</string>
+  <string name="license_name_cc_by_sa_2_0">CC BY-SA 2.0</string>
+  <string name="license_name_cc_by_2_0">CC BY-SA 2.0</string>
+  <string name="license_name_cc_2_0">CC BY 2.0</string>
+  <string name="license_name_pd_old">පොදු වසම (හිමිකම් කල් ඉකුත් වී ඇත)</string>
+  <string name="license_name_pd_us">පොදු වසම (එක්සත් ජනපදය)</string>
+  <string name="license_name_pd_usgov">පොදු වසම (එක්සත් ජනපද රජය)</string>
+  <string name="license_name_pd_usgov_nasa">පොදු වසම (නාසා)</string>
+  <string name="license_name_pd_ineligible">පොදු වසම (ප්‍රකාශන අයිතිය සඳහා නුසුදුසු)</string>
   <string name="license_name_attribution">ආරෝපණය</string>
   <string name="license_name_gfdl">GNU නිදහස් ප්‍රලේඛන බලපත්‍රය</string>
+  <string name="tutorial_1_text">විකිමාධ්‍ය කොමන්ස් විසින් විකිපීඩියාහි බාවිතා වන ඡායාරූප වලින් වැඩි කොටසක් සදහා සත්කාරකත්වය දරයි.</string>
+  <string name="tutorial_1_subtext">ඔබේ ඡායාරූප ලොව පුරා ජනතාව දැනුවත් කිරීමට උදව් වේ!</string>
+  <string name="tutorial_4_text">උදාහරණ උඩුගත කිරීම:</string>
   <string name="welcome_final_button_text">ඔව්!</string>
   <string name="detail_panel_cats_label">ප්‍රවර්ග</string>
   <string name="detail_panel_cats_loading">ප්‍රවේශනය වෙමින් පවතී...</string>
@@ -73,4 +123,9 @@
   <string name="detail_description_empty">විස්තරයක් නැත</string>
   <string name="detail_license_empty">නොදන්නා බලපත්‍රය</string>
   <string name="menu_refresh">නැවත ප්‍රාණවත් කරන්න</string>
+  <string name="ok">හරි</string>
+  <string name="title_activity_nearby">අවට ස්ථාන</string>
+  <string name="warning">අනතුරු හැඟවීමයි</string>
+  <string name="yes">ඔව්</string>
+  <string name="no">නැත</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/error.xml b/app/src/main/res/values-zh-rTW/error.xml
index 1f1f8798d..dfd90899b 100644
--- a/app/src/main/res/values-zh-rTW/error.xml
+++ b/app/src/main/res/values-zh-rTW/error.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="crash_dialog_title">維基共享資源已當機</string>
+  <string name="crash_dialog_title">共享資源已當機</string>
   <string name="crash_dialog_text">哎呀。出了錯 ！</string>
-  <string name="crash_dialog_comment_prompt">通過電郵告訴我們你剛才在做什麼。將會幫助我們解決錯誤！</string>
+  <string name="crash_dialog_comment_prompt">透過電子郵件告訴我們您先前做了什麼。這將協助我們修復它！</string>
   <string name="crash_dialog_ok_toast">謝謝！</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 3078e235d..a80cd0213 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -12,41 +12,41 @@
   <string name="login_failed">登入失敗！</string>
   <string name="upload_failed">找不到檔案。請嘗試其它檔案看看。</string>
   <string name="authentication_failed">驗證失敗 ！</string>
-  <string name="uploading_started">開始上載！</string>
-  <string name="upload_completed_notification_title">已%1$s上載！</string>
-  <string name="upload_completed_notification_text">點選檢視您的上載</string>
-  <string name="upload_progress_notification_title_start">開始上載%1$s</string>
-  <string name="upload_progress_notification_title_in_progress">正在上載%1$s</string>
-  <string name="upload_progress_notification_title_finishing">正在完成上載%1$s</string>
-  <string name="upload_failed_notification_title">上載%1$s失敗</string>
-  <string name="upload_failed_notification_subtitle">點選檢視</string>
+  <string name="uploading_started">開始上傳！</string>
+  <string name="upload_completed_notification_title">已上傳%1$s！</string>
+  <string name="upload_completed_notification_text">點選檢視您上傳的項目</string>
+  <string name="upload_progress_notification_title_start">開始上傳%1$s</string>
+  <string name="upload_progress_notification_title_in_progress">正在上傳%1$s</string>
+  <string name="upload_progress_notification_title_finishing">正在完成上傳%1$s</string>
+  <string name="upload_failed_notification_title">上傳%1$s失敗</string>
+  <string name="upload_failed_notification_subtitle">輕觸檢視</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">正在上載一個檔案</item>
     <item quantity="other">正在上載%d檔案</item>
   </plurals>
-  <string name="title_activity_contributions">我的上載</string>
-  <string name="contribution_state_queued">隊列</string>
+  <string name="title_activity_contributions">我的上傳</string>
+  <string name="contribution_state_queued">已佇列</string>
   <string name="contribution_state_failed">失敗</string>
   <string name="contribution_state_in_progress">%1$d%%完成</string>
-  <string name="contribution_state_starting">上載中</string>
+  <string name="contribution_state_starting">上傳中</string>
   <string name="menu_from_gallery">從圖庫</string>
   <string name="menu_from_camera">拍照</string>
   <string name="menu_nearby">附近</string>
-  <string name="provider_contributions">我的上載</string>
+  <string name="provider_contributions">我的上傳</string>
   <string name="menu_share">分享</string>
   <string name="menu_open_in_browser">在瀏覽器中開啟</string>
   <string name="share_title_hint">標題</string>
   <string name="share_description_hint">描述</string>
-  <string name="login_failed_network">無法登入-網路故障</string>
-  <string name="login_failed_username">無法登入-請檢查您的使用者名稱</string>
-  <string name="login_failed_password">無法登入-請檢查您的密碼</string>
-  <string name="login_failed_throttled">太多次不成功的嘗試。請於幾分鐘後再嘗試。</string>
+  <string name="login_failed_network">無法登入－網路故障</string>
+  <string name="login_failed_username">無法登入－請檢查您的使用者名稱</string>
+  <string name="login_failed_password">無法登入－請檢查您的密碼</string>
+  <string name="login_failed_throttled">失敗次數過多。請於幾分鐘後重試。</string>
   <string name="login_failed_blocked">很抱歉，該使用者在維基共享資源上已被封禁</string>
   <string name="login_failed_generic">登入失敗</string>
-  <string name="share_upload_button">上載</string>
+  <string name="share_upload_button">上傳</string>
   <string name="multiple_share_base_title">命名此組</string>
   <string name="provider_modifications">修改</string>
-  <string name="menu_upload_single">上載</string>
+  <string name="menu_upload_single">上傳</string>
   <string name="categories_search_text_hint">搜尋分類</string>
   <string name="menu_save_categories">儲存</string>
   <plurals name="contributions_subtitle">
@@ -62,14 +62,14 @@
     <item quantity="one">1 上傳</item>
     <item quantity="other">%d 上傳</item>
   </plurals>
-  <string name="categories_not_found">沒有發現與 %1$s 匹配的分類</string>
-  <string name="categories_skip_explanation">添加分類使您的相片在維基共享資源上更容易發現。
+  <string name="categories_not_found">沒有發現與 %1$s 相符的分類</string>
+  <string name="categories_skip_explanation">添加分類使您的圖片在維基共享資源上更容易被找到。
 
-開始輸入要添加的分類。
+開始輸入以添加分類。
 按此（或按返回）跳過此步驟。</string>
   <string name="categories_activity_title">分類</string>
   <string name="preference_tracking">使用報告</string>
-  <string name="preference_tracking_summary">向維基媒體傳送使用報告，幫助我們改進此程式</string>
+  <string name="preference_tracking_summary">向維基媒體傳送使用報告，協助我們改進此應用程式</string>
   <string name="title_activity_settings">設定</string>
   <string name="title_activity_signup">註冊</string>
   <string name="menu_about">關於</string>
@@ -81,7 +81,7 @@
   <string name="no_email_client">未安裝電子郵件客戶端</string>
   <string name="provider_categories">最近使用過的分類</string>
   <string name="waiting_first_sync">等待首次同步…</string>
-  <string name="no_uploads_yet">你尚未上傳任何照片。</string>
+  <string name="no_uploads_yet">您尚未上傳任何照片。</string>
   <string name="menu_retry_upload">重試</string>
   <string name="menu_cancel_upload">取消</string>
   <string name="share_license_summary">此圖片將以%1$s協議授權下上載</string>
@@ -142,7 +142,7 @@
   <string name="welcome_wikipedia_subtext">維基百科上的圖像來自維基共享資源。</string>
   <string name="welcome_copyright_text">您的圖片可以幫助教育世界各地的人。</string>
   <string name="welcome_copyright_subtext">避免受版權保護的材料，例如從互聯網的圖片、海報、書籍封面等</string>
-  <string name="welcome_final_text">你覺得你明白了嗎？</string>
+  <string name="welcome_final_text">您明白了嗎？</string>
   <string name="welcome_final_button_text">是！</string>
   <string name="detail_panel_cats_label">分類</string>
   <string name="detail_panel_cats_loading">載入中…</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 04b414160..2660ce9fd 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -25,7 +25,7 @@
     <item quantity="other">%d个文件正在上传</item>
   </plurals>
   <string name="title_activity_contributions">我的上传</string>
-  <string name="contribution_state_queued">已加入队列</string>
+  <string name="contribution_state_queued">已入队列</string>
   <string name="contribution_state_failed">失败</string>
   <string name="contribution_state_in_progress">%1$d%%完成</string>
   <string name="contribution_state_starting">正在上传</string>