diff --git a/app/src/main/res/values-b+hif+Latn/error.xml b/app/src/main/res/values-b+hif+Latn/error.xml
new file mode 100644
index 000000000..87f0c91a8
--- /dev/null
+++ b/app/src/main/res/values-b+hif+Latn/error.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="crash_dialog_title">Commons crash hoe gais</string>
+  <string name="crash_dialog_text">Oops, Koi chij wrong hoe gais</string>
+  <string name="crash_dialog_comment_prompt">Ham ke batao ki tum konchi karataa rahaa, tab iske hamaar lage email se share karo. Ii hame fix kare me madat karii!</string>
+  <string name="crash_dialog_ok_toast">Dhanbaad!</string>
+</resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 25bb181d3..e193321bc 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -5,7 +5,7 @@
   <string name="username">Nom d\'usuari:</string>
   <string name="password">Contrasenya</string>
   <string name="login">Inicia una sessió</string>
-  <string name="logging_in_title">Iniciant sessió</string>
+  <string name="logging_in_title">S’està iniciant la sessió</string>
   <string name="logging_in_message">Espereu...</string>
   <string name="login_success">S\'ha iniciat sessió correctament !</string>
   <string name="login_failed">Error en iniciar la sessió!</string>
diff --git a/app/src/main/res/values-diq/strings.xml b/app/src/main/res/values-diq/strings.xml
index ee37309fd..39d60a72e 100644
--- a/app/src/main/res/values-diq/strings.xml
+++ b/app/src/main/res/values-diq/strings.xml
@@ -10,7 +10,7 @@
   <string name="logging_in_message">Tay pıpawe...</string>
   <string name="login_success">Hesab abıya</string>
   <string name="login_failed">Nidekeweya de</string>
-  <string name="upload_failed">Dosya nêvineyê. Dosya ya biner bıcerebnê</string>
+  <string name="upload_failed">Dosya nêvineya. Dosyê da bine bıcerebnê.</string>
   <string name="authentication_failed">Tesdiq kerdış nebı</string>
   <string name="uploading_started">Barkerdış sertera!</string>
   <string name="upload_completed_notification_title">%1$s bıbar!</string>
@@ -38,6 +38,10 @@
   <string name="share_title_hint">Sername</string>
   <string name="share_description_hint">Sılasnayış</string>
   <string name="login_failed_network">Xırabiya kewten-network xeta</string>
+  <string name="login_failed_username">Ronıştışo abeno - Namey karberi ye xo kontrol kerë</string>
+  <string name="login_failed_password">Ronıştışo nêabeno - Parolay xo kontrol kerë</string>
+  <string name="login_failed_throttled">Şıma vêşi cerbnayış xırab kerd. Solığna fına dekewë de</string>
+  <string name="login_failed_blocked">Qısur mewni rê, Karber commons dı bloqe biyo.</string>
   <string name="login_failed_generic">Nidekeweya de</string>
   <string name="share_upload_button">Bar ke</string>
   <string name="multiple_share_base_title">Saze ne nami</string>
@@ -45,21 +49,39 @@
   <string name="menu_upload_single">Bar ke</string>
   <string name="categories_search_text_hint">Kategoriyan dı cı geyr</string>
   <string name="menu_save_categories">Star ke</string>
+  <plurals name="contributions_subtitle">
+    <item quantity="zero">Theba bar nêbı</item>
+    <item quantity="one">1 bar kerdış</item>
+    <item quantity="other">%d bar kerdışi</item>
+  </plurals>
+  <plurals name="starting_multiple_uploads">
+    <item quantity="one">Sergendış 1 bar kerdış</item>
+    <item quantity="other">Sergendış %d bar kerdışi </item>
+  </plurals>
+  <plurals name="multiple_uploads_title">
+    <item quantity="one">1 bar kerdış</item>
+    <item quantity="other">%d bar kerdışi </item>
+  </plurals>
   <string name="categories_not_found">Kategoriyan de %1$s deye theba çıniyo</string>
+  <string name="categories_skip_explanation">Kategori cı kerdışi rê nusnayış bıkeré. Ena gamer ravêrdışi rê mesaci bıpıloğnê yana peyd şırê.</string>
   <string name="categories_activity_title">Kategoriy</string>
   <string name="preference_tracking">Rapore karkerden</string>
+  <string name="preference_tracking_summary">Dezgeker vırazayışi rê desteg dayışi rê, raporanê karıyayışa bırışê Wikimedia</string>
   <string name="title_activity_settings">Sazi</string>
   <string name="title_activity_signup">Qeyd be</string>
   <string name="menu_about">Heq te cı</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Çıme&lt;/a&gt; u &lt;a href=\"https://commons-app.github.io/\"&gt;website&lt;/a&gt; on GitHub&lt;/a&gt;. Newe vıraz &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub mewzu &lt;/a&gt; U rapor bıweseynê</string>
   <string name="about_privacy_policy">/</string>
   <string name="title_activity_about">Heq te cı</string>
+  <string name="menu_feedback">Peyd rışten bırış (E-posta ra)</string>
+  <string name="no_email_client">E-posta eyar nêbi</string>
+  <string name="provider_categories">Karıyaye Kategoriyê peyêni</string>
   <string name="menu_retry_upload">Fına</string>
   <string name="menu_cancel_upload">Bıtexelne</string>
   <string name="menu_download">Ron</string>
   <string name="preference_license">Lisans</string>
-  <string name="license_name_cc_by_sa" fuzzy="true">CCu00A0Attribution-ShareAlikeu00A03.0</string>
-  <string name="license_name_cc_by" fuzzy="true">CCu00A0Attributionu00A03.0</string>
+  <string name="license_name_cc_by_sa">CC Attribution-ShareAlike 3.0</string>
+  <string name="license_name_cc_by">Attribution 3.0</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 (Awıstırya)</string>
@@ -73,6 +95,8 @@
   <string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (Polonya)</string>
   <string name="license_name_cc_by_sa_3_0_ro">CC BY-SA 3.0 (Romanya)</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">Mala şari (ğebiyayışa mına)</string>
   <string name="license_name_cc_by_sa_2_5">CC-BY-SA 2.5</string>
@@ -90,6 +114,8 @@
   <string name="license_name_pd_ineligible">Mala şari (heqa telifiye çıniya)</string>
   <string name="license_name_attribution">Gırêdayış</string>
   <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_button_text">E!</string>
   <string name="detail_panel_cats_label">Kategoriy</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7383aa0df..e0854ae18 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -6,7 +6,7 @@
   <string name="password">Contraseña</string>
   <string name="login">Acceder</string>
   <string name="signup">Regístrate</string>
-  <string name="logging_in_title">Iniciando sesión</string>
+  <string name="logging_in_title">Accediendo</string>
   <string name="logging_in_message">Espera un momento…</string>
   <string name="login_success">¡Inicio de sesión exitoso!</string>
   <string name="login_failed">¡Inicio de sesión fallido!</string>
@@ -18,7 +18,7 @@
   <string name="upload_progress_notification_title_start">Empezando la subida de %1$s</string>
   <string name="upload_progress_notification_title_in_progress">Cargando «%1$s»</string>
   <string name="upload_progress_notification_title_finishing">Finalizando la subida de %1$s</string>
-  <string name="upload_failed_notification_title">Error al subir \"%1$s\"</string>
+  <string name="upload_failed_notification_title">Falló la carga de «%1$s»</string>
   <string name="upload_failed_notification_subtitle">Toca para ver</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">Cargando 1 archivo</item>
diff --git a/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml
index 4f2d7e7d5..14fc89eef 100644
--- a/app/src/main/res/values-lb/strings.xml
+++ b/app/src/main/res/values-lb/strings.xml
@@ -88,6 +88,7 @@ Leet w.e.g. &lt;a href=\"https://github.com/commons-app/apps-android-commons/iss
   <string name="preference_license">Lizenz</string>
   <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">CCu00A0Attribution-ShareAlikeu00A03.0</string>
   <string name="license_name_cc_by">CCu00A0Attributionu00A03.0</string>
   <string name="license_name_cc0">CC0</string>
@@ -122,10 +123,20 @@ Leet w.e.g. &lt;a href=\"https://github.com/commons-app/apps-android-commons/iss
   <string name="license_name_pd_ineligible">Public domain (net zoulässeg fir Copyright)</string>
   <string name="license_name_attribution">Attributioun</string>
   <string name="license_name_gfdl">GNU Fräi Dokumentatiouns Lizenz</string>
+  <string name="tutorial_1_text">Wikimedia Commons späichert déi meescht Biller, déi op Wikipedia benotzt ginn.</string>
   <string name="tutorial_1_subtext">Är Biller hëllefe Leit op der ganzer Welt ze forméieren!</string>
   <string name="tutorial_2_text">Lued w.e.g. Biller erop déi komplett vun Iech opgeholl oder gemaacht goufen:</string>
+  <string name="tutorial_2_subtext">- Natierlech Objeten (Blummen, Déieren, Bierger)
+- Nëtzlech Objeten (Vëloen, Garen)
+- Berühmt Persounen (Äre Buergermeeschter, olympesch Athleten, déi Dir begéint hutt)</string>
   <string name="tutorial_3_text">W.e.g. NET eroplueden:</string>
+  <string name="tutorial_3_subtext">- Selfien oder Biller vun Äre Frënn
+- Biller déi Dir aus dem Internet erofgelueden hutt
+- Screenshots vu proprietäre Programmer</string>
   <string name="tutorial_4_text">Beispill-Upload:</string>
+  <string name="tutorial_4_subtext">- Titel: Sydney Opera House
+- Beschreiwung: Sydney Opera House vun der Bay aus gesinn
+- Kategorien: Sydney Opera House, Sydney Opera House vu Westen, Sydney Opera House vu wäitem</string>
   <string name="welcome_wikipedia_text">Maacht mat mat Äre Biller. Hëlleft Wikipedia-Artikele méi lieweg ze maachen!</string>
   <string name="welcome_wikipedia_subtext">Biller op Wikipedia komme vu Wikimedia Commons.</string>
   <string name="welcome_copyright_text">Är Biller hëllefe Leit op der ganzer Welt ze forméieren.</string>
@@ -138,6 +149,8 @@ Leet w.e.g. &lt;a href=\"https://github.com/commons-app/apps-android-commons/iss
   <string name="detail_description_empty">Keng Beschreiwung</string>
   <string name="detail_license_empty">Onbekannt Lizenz</string>
   <string name="menu_refresh">Aktualiséieren</string>
+  <string name="storage_permission_rationale">Obligatoresch Autorisatioun: Externe Späicher liesen. D\'App kann net ouni dat funktionéieren.</string>
+  <string name="location_permission_rationale">Fakultativ Autorisatioun: Déi aktuell Plaz kréie fir Propose fir Kategorien</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Plazen nobäi</string>
   <string name="warning">Warnung</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index b583c371c..1865bf130 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -87,11 +87,11 @@
   <string name="share_license_summary">Сликава ќе се води под лиценцата %1$s</string>
   <string name="menu_download">Преземи</string>
   <string name="preference_license">Лиценца</string>
-  <string name="use_previous" fuzzy="true">Користи претходен наслов/опис</string>
+  <string name="use_previous">Користи претходен наслов/опис</string>
   <string name="allow_gps">Автоматски давај ја тековната местоположба</string>
   <string name="allow_gps_summary">Добивање на тековната местоположба за да се дадат предлози за категории, доколку сликата нема геоознаки</string>
-  <string name="license_name_cc_by_sa">CCu00A0Наведиu00A0извор-Споделиu00A0подu00A0истиu00A0условиu00A03.0</string>
-  <string name="license_name_cc_by">CCu00A0Наведиu00A0изворu00A03.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>
   <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>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 5eb02fe8c..b2faa4d03 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -73,11 +73,12 @@ Trykk på denne meldingen (eller trykk tilbake) for å hoppe over dette steget.<
   <string name="title_activity_settings">Innstillinger</string>
   <string name="title_activity_signup">Registrer deg</string>
   <string name="menu_about">Om</string>
-  <string name="about_license" fuzzy="true">Åpen kildekode programvare sluppet under &lt;a href=\"https://github.com/wikimedia/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;</string>
-  <string name="about_improve" fuzzy="true">Kildekode på &lt;a href=\"https://github.com/wikimedia/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Feilmeldinger på &lt;a href=\"https://github.com/nicolas-raoul/apps-android-commons/issues\"&gt;Github&lt;/a&gt;.</string>
+  <string name="about_license">Programvare med åpen kildekode sluppet under &lt;a href=\"https://github.com/wikimedia/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. Wikimedia Commons og dets logo er varemerker fra Wikimedia Foundation og brukes med tillatelse fra dem. Vi er verken støttet av eller koblet til Wikimedia Foundation.</string>
+  <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Kildekode&lt;/a&gt; og &lt;a href=\"https://commons-app.github.io/\"&gt;nettside&lt;/a&gt; på GitHub. Opprett en ny &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-sak&lt;/a&gt; for feilrapporter og forslag.</string>
   <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Personvernpolicy&lt;/a&gt;</string>
   <string name="title_activity_about">Om</string>
   <string name="menu_feedback">Send tilbakemelding (via Epost)</string>
+  <string name="no_email_client">Ingen epostklient installert</string>
   <string name="provider_categories">Nylig brukte kategorier</string>
   <string name="waiting_first_sync">Venter på første synkronisering...</string>
   <string name="no_uploads_yet">Du har ikke lastet opp nøn bilder ennå.</string>
@@ -86,8 +87,11 @@ Trykk på denne meldingen (eller trykk tilbake) for å hoppe over dette steget.<
   <string name="share_license_summary">Dette bildet vil bli lisensiert under %1$s</string>
   <string name="menu_download">Last ned</string>
   <string name="preference_license">Lisens</string>
-  <string name="license_name_cc_by_sa" fuzzy="true">CCu00A0Navngivelse-DelPåSammeVilkåru00A03.0</string>
-  <string name="license_name_cc_by" fuzzy="true">CCu00A0Navngivelseu00A03.0</string>
+  <string name="use_previous">Bruk forrige tittel/beskrivelse</string>
+  <string name="allow_gps">Hent automatisk nåværende plassering</string>
+  <string name="allow_gps_summary">Hent nåværende plassering for å tilby kategoriforslag om bildet ikke er geotagget</string>
+  <string name="license_name_cc_by_sa">Navngivelse-Del på samme vilkår 3.0</string>
+  <string name="license_name_cc_by">Navngivelse 3.0</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 (Østerrike)</string>
@@ -120,6 +124,12 @@ Trykk på denne meldingen (eller trykk tilbake) for å hoppe over dette steget.<
   <string name="license_name_pd_ineligible">Offentlig eiendom (ikke mulig å opphavsrettsbeskytte)</string>
   <string name="license_name_attribution">Navngivelse</string>
   <string name="license_name_gfdl">GNU fri dokumentasjonslisens</string>
+  <string name="tutorial_1_text">Wikimedia Commons lagrer de fleste bildene som brukes på Wikipedia.</string>
+  <string name="tutorial_1_subtext">Dine bilder hjelper til å utdanne mennesker verden over!</string>
+  <string name="tutorial_2_text">Last opp bilder som er tatt eller skapt av deg:</string>
+  <string name="tutorial_2_subtext">– Naturlige objekter (blomster, dyr, fjell)
+– Nyttige objekter (sykler, togstasjoner)
+– Berømte personer (ordføreren din, OL-deltakere du har møtt)</string>
   <string name="tutorial_3_text">Vennligst IKKE last opp:</string>
   <string name="tutorial_3_subtext">- Selfies eller bilder av dine venner
 - Bilder som du har lastet ned ifra Internet
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3c464119c..d1f42d304 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name" fuzzy="true">Wikimedia Commons</string>
+  <string name="app_name">Commons</string>
   <string name="menu_settings">Instellingen</string>
   <string name="username">Gebruikersnaam</string>
   <string name="password">Wachtwoord</string>
@@ -9,6 +9,7 @@
   <string name="logging_in_message">Een ogenblik geduld...</string>
   <string name="login_success">Aanmelden geslaagd</string>
   <string name="login_failed">Aanmelden mislukt</string>
+  <string name="upload_failed">Bestand niet gevonden. Probeer een ander bestand.</string>
   <string name="authentication_failed">Verificatie is mislukt</string>
   <string name="uploading_started">Uploaden is begonnen</string>
   <string name="upload_completed_notification_title">%1$s geüpload</string>
@@ -26,6 +27,7 @@
   <string name="contribution_state_starting">Bezig met uploaden</string>
   <string name="menu_from_gallery">Uit galerij</string>
   <string name="menu_from_camera">Foto nemen</string>
+  <string name="menu_nearby">In de buurt</string>
   <string name="provider_contributions">Mijn uploads</string>
   <string name="menu_share">Delen</string>
   <string name="menu_open_in_browser">In browser bekijken</string>
@@ -66,12 +68,14 @@ Klik op dit bericht, of ga terug, om deze stap over te slaan.</string>
   <string name="preference_tracking">Gebruiksrapporten</string>
   <string name="preference_tracking_summary">Gebruiksrapporten verzenden naar Wikimedia om ons te helpen de app te verbeteren</string>
   <string name="title_activity_settings">Instellingen</string>
+  <string name="title_activity_signup">Registreren</string>
   <string name="menu_about">Over</string>
   <string name="about_license" fuzzy="true">Open sourcesoftware vrijgegeven onder de &lt;a href=\"https://github.com/wikimedia/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;</string>
   <string name="about_improve" fuzzy="true">Broncode op &lt;a href=\"https://github.com/wikimedia/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Bugs in &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/Privacy_policy\"&gt;Privacybeleid&lt;/a&gt;</string>
   <string name="title_activity_about">Over</string>
   <string name="menu_feedback">Terugkoppeling geven (via e-mail)</string>
+  <string name="no_email_client">Geen e-mail-client geïnstalleerd</string>
   <string name="provider_categories">Recent gebruikte categorieën</string>
   <string name="waiting_first_sync">Wachten op de eerste synchronisatie...</string>
   <string name="no_uploads_yet">U hebt nog geen afbeeldingen geüpload.</string>
@@ -81,7 +85,7 @@ Klik op dit bericht, of ga terug, om deze stap over te slaan.</string>
   <string name="menu_download">Downloaden</string>
   <string name="preference_license">Licentie</string>
   <string name="license_name_cc_by_sa" fuzzy="true">CCu00A0Naamsvermelding-Gelijku00A0delenu00A03.0</string>
-  <string name="license_name_cc_by" fuzzy="true">CCu00A0Naamsvermeldingu00A03.0</string>
+  <string name="license_name_cc_by">Naamsvermelding 3.0</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 (Oostenrijk)</string>
@@ -95,6 +99,8 @@ Klik op dit bericht, of ga terug, om deze stap over te slaan.</string>
   <string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (Polen)</string>
   <string name="license_name_cc_by_sa_3_0_ro">CC BY-SA 3.0 (Roemenië)</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">eigen-pd</string>
   <string name="license_name_cc_by_sa_2_5">CC-BY-SA-2.5</string>
@@ -112,6 +118,7 @@ Klik op dit bericht, of ga terug, om deze stap over te slaan.</string>
   <string name="license_name_pd_ineligible">Publiek domein (komt niet in aanmerking voor auteursrechten)</string>
   <string name="license_name_attribution">Naamsvermelding</string>
   <string name="license_name_gfdl">GNU-licentie voor vrije documentatie</string>
+  <string name="tutorial_3_text">Gelieve NIET te uploaden:</string>
   <string name="welcome_wikipedia_text">Draag uw afbeelding bij. Help pagina\'s in Wikipedia tot leven te laten komen!</string>
   <string name="welcome_wikipedia_subtext">Afbeeldingen op Wikipedia komen van Wikimedia Commons.</string>
   <string name="welcome_copyright_text">Uw afbeeldingen helpen mensen van over de hele wereld te leren.</string>
@@ -124,4 +131,9 @@ Klik op dit bericht, of ga terug, om deze stap over te slaan.</string>
   <string name="detail_description_empty">Geen beschrijving</string>
   <string name="detail_license_empty">Onbekende licentie</string>
   <string name="menu_refresh">Vernieuwen</string>
+  <string name="ok">OK</string>
+  <string name="warning">Waarschuwing</string>
+  <string name="file_exists">Dit bestand bestaat al op Commons. Weet u zeker dat u wilt doorgaan?</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nee</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4010627e1..665b6fe4b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -10,6 +10,7 @@
   <string name="logging_in_message">Proszę czekać...</string>
   <string name="login_success">Zalogowano pomyślnie</string>
   <string name="login_failed">Logowanie nie powiodło się!</string>
+  <string name="upload_failed">Pliku nie znaleziono. Spróbuj innego pliku.</string>
   <string name="authentication_failed">Błąd uwierzytelniania!</string>
   <string name="uploading_started">Wysyłanie rozpoczęte</string>
   <string name="upload_completed_notification_title">Przesłano %1$s!</string>
@@ -19,6 +20,10 @@
   <string name="upload_progress_notification_title_finishing">Zakończono wysyłanie pliku %1$s</string>
   <string name="upload_failed_notification_title">Wysyłanie %1$s zakończone porażką</string>
   <string name="upload_failed_notification_subtitle">Kliknij aby zobaczyć</string>
+  <plurals name="uploads_pending_notification_indicator">
+    <item quantity="one">Przesyłanie 1 pliku</item>
+    <item quantity="other">Przesyłanie %d plików</item>
+  </plurals>
   <string name="title_activity_contributions">Moje wysłane pliki</string>
   <string name="contribution_state_queued">W kolejce</string>
   <string name="contribution_state_failed">Porażka</string>
@@ -53,12 +58,14 @@ Dotknij tej wiadomości (lub naciśnij \"cofnij\") aby pominąć ten krok</strin
   <string name="preference_tracking">Raporty użycia</string>
   <string name="preference_tracking_summary">Wyślij raporty do Wikimedia, aby pomóc w ulepszeniu aplikacji</string>
   <string name="title_activity_settings">Ustawienia</string>
+  <string name="title_activity_signup">Zarejestruj się</string>
   <string name="menu_about">O aplikacji</string>
-  <string name="about_license" fuzzy="true">Oprogramowanie Open Source, wydane na licencji  &lt;a href=\"https://github.com/wikimedia/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;</string>
-  <string name="about_improve" fuzzy="true">Kod źródłowy na &lt;a href=\"https://github.com/wikimedia/apps-android-commons\"&gt;GitHub&lt;/a&gt;. Błędy - &lt;a href=\"https://github.com/nicolas-raoul/apps-android-commons/issues\"&gt;Github&lt;/a&gt;.</string>
+  <string name="about_license">Oprogramowanie Open Source, wydane na licencji &lt;a href=\"https://github.com/wikimedia/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. Wikimedia Commons i jego logo są znakami towarowymi Wikimedia Foundation i są wykorzystywane za zgodą Wikimedia Foundation. Nie jesteśmy powiązani z Wikimedia Foundation.</string>
+  <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Kod źródłowy&lt;/a&gt; oraz &lt;a href=\"https://commons-app.github.io/\"&gt;strona internetowa&lt;/a&gt; na GitHub&lt;/a&gt;. Aby zgłosić błąd lub sugestię, utwórz nowe &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;zgłoszenie na GitHubie&lt;/a&gt;.</string>
   <string name="about_privacy_policy">Wikimedia:Commons-android-strings-about privacy policy/uk</string>
   <string name="title_activity_about">O aplikacji</string>
   <string name="menu_feedback">Wyślij opinię (przez e-mail)</string>
+  <string name="no_email_client">Klient e-mail nie jest zainstalowany</string>
   <string name="provider_categories">Niedawno używane Kategorie</string>
   <string name="waiting_first_sync">Oczekiwanie na pierwszą synchronizację ...</string>
   <string name="no_uploads_yet">Nie wgrałeś jeszcze żadnych zdjęć.</string>
@@ -67,6 +74,8 @@ Dotknij tej wiadomości (lub naciśnij \"cofnij\") aby pominąć ten krok</strin
   <string name="share_license_summary">Ten obraz będzie udostępniany na licencji %1$s</string>
   <string name="menu_download">Pobieranie</string>
   <string name="preference_license">Licencja</string>
+  <string name="use_previous">Użyj poprzedniego tytułu/opisu</string>
+  <string name="allow_gps">Automatycznie uzyskaj bieżącą lokalizację</string>
   <string name="license_name_cc_by_sa"> Uznanie autorstwa-Na tych samych warunkach 3.0</string>
   <string name="license_name_cc_by"> Uznanie autorstwa 3.0</string>
   <string name="license_name_cc0">CC0</string>
@@ -99,6 +108,14 @@ Dotknij tej wiadomości (lub naciśnij \"cofnij\") aby pominąć ten krok</strin
   <string name="license_name_pd_ineligible">Domena publiczna (nie podlega ochronie prawa autorskiego)</string>
   <string name="license_name_attribution">Uznanie autorstwa</string>
   <string name="license_name_gfdl">GNU Free Documentation License</string>
+  <string name="tutorial_2_text">Można przesyłać zdjęcia zrobione lub stworzone całkowicie przez Ciebie:</string>
+  <string name="tutorial_2_subtext">- Obiektów natury (kwiaty, zwierzęta, góry)
+- Przydatne obiekty (rowery, dworce)
+- Znani ludzie (burmistrz, olimpijczyków, z którymi się spotkałeś)</string>
+  <string name="tutorial_3_text">Prosimy NIE wysyłać:</string>
+  <string name="tutorial_3_subtext">- Zdjęć przedstawiających siebie lub znajomych
+- Zdjęć pobranych z Internetu
+- Zrzutów ekranów płatnych aplikacji</string>
   <string name="welcome_wikipedia_text">Dołóż swoje grafiki. Pomóż artykułom w Wikipedii ożywić się!</string>
   <string name="welcome_wikipedia_subtext">Ilustracje w Wikipedii pochodzą z Wikimedia Commons.</string>
   <string name="welcome_copyright_text">Twoje ilustracje pomagają w edukacji ludzi na całym świecie.</string>
@@ -112,7 +129,9 @@ Dotknij tej wiadomości (lub naciśnij \"cofnij\") aby pominąć ten krok</strin
   <string name="detail_license_empty">Nieznana licencja</string>
   <string name="menu_refresh">Odśwież</string>
   <string name="ok">OK</string>
+  <string name="title_activity_nearby">Pobliskie miejsca</string>
   <string name="warning">Ostrzeżenie</string>
+  <string name="file_exists">Ten plik już istnieje na Commons. Jesteś pewien, że chcesz kontynuować?</string>
   <string name="yes">Tak</string>
   <string name="no">Nie</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 307162f50..f23fcf165 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -130,8 +130,17 @@
   <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>
@@ -144,6 +153,8 @@
   <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">OK</string>
   <string name="title_activity_nearby">Места поблизости</string>
   <string name="warning">Внимание</string>
diff --git a/app/src/main/res/values-x-invalidLanguageCode/strings.xml b/app/src/main/res/values-x-invalidLanguageCode/strings.xml
deleted file mode 100644
index b75b22af4..000000000
--- a/app/src/main/res/values-x-invalidLanguageCode/strings.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name" fuzzy="true">ۋىكى ۋاستە ھەمبەھىر</string>
-  <string name="menu_settings">تەڭشەكلەر</string>
-  <string name="username">ئىشلەتكۇچى ئىسمى</string>
-  <string name="password">پارول</string>
-  <string name="login">تىزىمغا كىرىڭ</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="uploading_started">يۈكلەش باشلاندى!</string>
-  <string name="upload_completed_notification_title">%1$s يۈكلەندى!</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="title_activity_contributions">يۈكلىگەنلىرىم</string>
-  <string name="contribution_state_in_progress">%1$d%% تاماملاندى</string>
-  <string name="contribution_state_starting">يۈكلەۋاتىدۇ</string>
-  <string name="menu_from_camera">سۈرەتكە تارتىڭ</string>
-  <string name="provider_contributions">يۈكلىگەنلىرىم</string>
-  <string name="menu_share">ئورتاقلىشىش</string>
-  <string name="menu_open_in_browser">توركۆرگۈدە ئېچىڭ</string>
-  <string name="share_description_hint">چۈشەندۈرۈش</string>
-  <string name="share_upload_button">يۈكلەڭ</string>
-  <string name="menu_upload_single">يۈكلە</string>
-  <string name="categories_search_text_hint">كاتېگورىيىنى ئىزدەڭ</string>
-  <string name="menu_save_categories">ساقلاڭ</string>
-  <string name="title_activity_settings">تەڭشەكلەر</string>
-  <string name="menu_about">ھەققىدە</string>
-  <string name="menu_download">چۈشۈرۈڭ</string>
-  <string name="preference_license">ئىجازەتنامە</string>
-  <string name="license_name_cc_by_sa" fuzzy="true">CCu00A0Attribution-ShareAlikeu00A03.0</string>
-  <string name="license_name_cc_by" fuzzy="true">CCu00A0Attributionu00A03.0</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_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_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_zero">CC0</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_fal">ھەقسىز سەنئەت ئىجازەتنامىسى</string>
-  <string name="welcome_final_button_text">ھەئە!</string>
-  <string name="detail_panel_cats_label">كاتېگورىيە</string>
-  <string name="detail_panel_cats_loading">يۈكلەۋاتىدۇ…</string>
-  <string name="detail_panel_cats_none">تاللانمىغان</string>
-  <string name="detail_description_empty">چۈشەندۈرۈلۈشى يوق</string>
-</resources>