diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 7ce350f66..f490e8147 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -21,8 +21,8 @@
   <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">%d رفع ملف</item>
-    <item quantity="other">%d رفع ملفات</item>
+    <item quantity="one">%1$d رفع ملف</item>
+    <item quantity="other">%1$d رفع ملفات</item>
   </plurals>
   <string name="title_activity_contributions">مرفوعاتي الأخيرة</string>
   <string name="contribution_state_queued">في قائمة الانتظار</string>
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index 9180e90c9..dde062d2c 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Toque pa velo</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">Xubiendo un ficheru</item>
-    <item quantity="other">Xubiendo %d ficheros</item>
+    <item quantity="other">Xubiendo %1$d ficheros</item>
   </plurals>
   <string name="title_activity_contributions">Les mios xubes recién</string>
   <string name="contribution_state_queued">En cola</string>
@@ -57,15 +57,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
     <item quantity="one">1 carga</item>
-    <item quantity="other">%d cargues</item>
+    <item quantity="other">%1$d cargues</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Principiando 1 carga</item>
-    <item quantity="other">Principiando %d cargues</item>
+    <item quantity="other">Principiando %1$d cargues</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">1 carga</item>
-    <item quantity="other">%d cargues</item>
+    <item quantity="other">%1$d cargues</item>
   </plurals>
   <string name="categories_not_found">Nun s\'alcontró denguna categoría que case con %1$s</string>
   <string name="categories_skip_explanation">Amiesta categoríes pa facer les imaxes más fáciles d\'alcontrar en Wikimedia Commons.\nPrincipia a escribir p\'amestar categoríes.</string>
diff --git a/app/src/main/res/values-b+sr+Latn/strings.xml b/app/src/main/res/values-b+sr+Latn/strings.xml
index af3aaa3e0..9fa4d67a1 100644
--- a/app/src/main/res/values-b+sr+Latn/strings.xml
+++ b/app/src/main/res/values-b+sr+Latn/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Ne mogu da otpremim „%1$s“</string>
   <string name="upload_failed_notification_subtitle">Tapnite da biste videli</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d datoteka se otprema</item>
-    <item quantity="other">%d datoteke se otpremaju</item>
+    <item quantity="one">%1$d datoteka se otprema</item>
+    <item quantity="other">%1$d datoteke se otpremaju</item>
   </plurals>
   <string name="title_activity_contributions">Moja skorašnja otpremanja</string>
   <string name="contribution_state_queued">Na čekanju</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Još uvek nema otpremanja</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d otpremanje</item>
-    <item quantity="other">%d otpremanja</item>
+    <item quantity="one">%1$d otpremanje</item>
+    <item quantity="other">%1$d otpremanja</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Započni %d otpremanje</item>
-    <item quantity="other">Započni %d otpremanja</item>
+    <item quantity="one">Započni %1$d otpremanje</item>
+    <item quantity="other">Započni %1$d otpremanja</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d otpremanje</item>
-    <item quantity="other">%d otpremanja</item>
+    <item quantity="one">%1$d otpremanje</item>
+    <item quantity="other">%1$d otpremanja</item>
   </plurals>
   <string name="categories_not_found">Nema kategorija koje odgovaraju %1$s</string>
   <string name="categories_skip_explanation">Dodajte kategorije na slike da biste olakšali korisnicima njihovo pronalaženje na Ostavi.\n\nDa biste dodali kategoriju, počnite sa pisanjem njenog imena.</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 4628ca951..abb15ac3d 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -32,8 +32,8 @@
   <string name="menu_upload_single">Качване</string>
   <string name="menu_save_categories">Съхраняване</string>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d качване</item>
-    <item quantity="other">%d качвания</item>
+    <item quantity="one">%1$d качване</item>
+    <item quantity="other">%1$d качвания</item>
   </plurals>
   <string name="categories_activity_title">Категории</string>
   <string name="title_activity_settings">Настройки</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 545cbbf73..95a60eb54 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">এখনো কোন আপলোড নেই</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%dটি আপলোড</item>
-    <item quantity="other">%dটি আপলোড</item>
+    <item quantity="one">%1$dটি আপলোড</item>
+    <item quantity="other">%1$dটি আপলোড</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%dটি আপলোড শুরু হয়েছে</item>
-    <item quantity="other">%dটি আপলোড শুরু হয়েছে</item>
+    <item quantity="one">%1$dটি আপলোড শুরু হয়েছে</item>
+    <item quantity="other">%1$dটি আপলোড শুরু হয়েছে</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%dটি আপলোড</item>
-    <item quantity="other">%dটি আপলোড</item>
+    <item quantity="one">%1$dটি আপলোড</item>
+    <item quantity="other">%1$dটি আপলোড</item>
   </plurals>
   <string name="categories_not_found">%1$s-এর সাথে মিলে এমন কোন বিষয়শ্রেণী পাওয়া যায়নি</string>
   <string name="categories_skip_explanation">উইকিমিডিয়া কমন্স থেকে আপনার মিডিয়া ফাইলটি সহজে খুঁজে পেতে বিষয়শ্রেণী যুক্ত করুন।\n\nবিষয়শ্রেণী যোগ করার জন্য টাইপিং শুরু করুন।</string>
@@ -209,8 +209,8 @@
   <string name="location_permission_rationale_nearby">কাছাকাছি স্থানসমূহের একটি তালিকা প্রদর্শন করতে অনুমতি প্রয়োজন</string>
   <string name="get_directions">নির্দেশনা পান</string>
   <string name="read_article">নিবন্ধ পড়ুন</string>
-  <string name="notifications_welcome">উইকিমিডিয়া কমন্সে স্বাগতম, %s! আপনাকে এখানে পেয়ে আমরা আনন্দিত।</string>
-  <string name="notifications_talk_page_message">%s আপনার আলাপ পাতায় একটি বার্তা দিয়েছেন</string>
+  <string name="notifications_welcome">উইকিমিডিয়া কমন্সে স্বাগতম, %1$s! আপনাকে এখানে পেয়ে আমরা আনন্দিত।</string>
+  <string name="notifications_talk_page_message">%1$s আপনার আলাপ পাতায় একটি বার্তা দিয়েছেন</string>
   <string name="notifications_thank_you_edit">একটি সম্পাদনা করার জন্য আপনাকে ধন্যবাদ</string>
-  <string name="notifications_mention">%s আপনাকে %s-এ উল্লেখ করেছেন।</string>
+  <string name="notifications_mention">%1$s আপনাকে %2$s-এ উল্লেখ করেছেন।</string>
 </resources>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 01a0bc962..5b8232c5e 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">C\'hwitet en deus enporzhiañ %1$s</string>
   <string name="upload_failed_notification_subtitle">Pouezit evit diskwel</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d restr o vezañ karget</item>
-    <item quantity="other">%d restr o vezañ karget</item>
+    <item quantity="one">%1$d restr o vezañ karget</item>
+    <item quantity="other">%1$d restr o vezañ karget</item>
   </plurals>
   <string name="title_activity_contributions">Ma enporzhiadennoù nevez</string>
   <string name="contribution_state_queued">Lakaet el lostenn</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Enporzhiadenn ebet c\'hoazh !</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">Pellgardenn ebet c\'hoazh</item>
-    <item quantity="one">%d bellgargadenn</item>
-    <item quantity="other">%d Pellgargadennoù</item>
+    <item quantity="one">%1$d bellgargadenn</item>
+    <item quantity="other">%1$d Pellgargadennoù</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d bellgargadenn loc\'het</item>
-    <item quantity="other">%d pellgargadennoù loc\'het</item>
+    <item quantity="one">%1$d bellgargadenn loc\'het</item>
+    <item quantity="other">%1$d pellgargadennoù loc\'het</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d bellgargadenn</item>
-    <item quantity="other">%d pellgargadennoù</item>
+    <item quantity="one">%1$d bellgargadenn</item>
+    <item quantity="other">%1$d pellgargadennoù</item>
   </plurals>
   <string name="categories_not_found">N\'eus bet kavet rummad ebet o klotañ gant %1$s</string>
   <string name="categories_skip_explanation">Ouzhpennit rummadoù evit ma vo aesoc\'h kavout ho skeudennoù war Wikimedia Commons.\n\nKrogit da skrivañ evit ouzhpennañ rummadoù.</string>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index b107dda91..35425cb3c 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Postavljanje datoteke %1$s nije uspjelo</string>
   <string name="upload_failed_notification_subtitle">Dodirnite da biste vidjeli</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">postavlja se %d datoteka</item>
-    <item quantity="other">postavlja se %d datoteka</item>
+    <item quantity="one">postavlja se %1$d datoteka</item>
+    <item quantity="other">postavlja se %1$d datoteka</item>
   </plurals>
   <string name="title_activity_contributions">Moje nedavno postavljene datoteke</string>
   <string name="contribution_state_queued">Na čekanju</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Zasad nema postavljenih datoteka</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">postavljena %d datoteka</item>
-    <item quantity="other">postavljenih datoteka: %d</item>
+    <item quantity="one">postavljena %1$d datoteka</item>
+    <item quantity="other">postavljenih datoteka: %1$d</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Započinjem postavljanje %d datoteke</item>
-    <item quantity="other">Započinjem postavljanje %d datoteka/-e</item>
+    <item quantity="one">Započinjem postavljanje %1$d datoteke</item>
+    <item quantity="other">Započinjem postavljanje %1$d datoteka/-e</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d postavljanje</item>
-    <item quantity="other">%d postavljanja</item>
+    <item quantity="one">%1$d postavljanje</item>
+    <item quantity="other">%1$d postavljanja</item>
   </plurals>
   <string name="categories_not_found">Nema kategorija koje odgovoraju %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Dodajte kategorije da biste korisnicima olakšali pronalaženje slika na Wikimedia Commonsu.\n\nPočnite pisati da biste dodali kategoriju.\nDodirnite ovu poruku (ili pritisnite dugme \"nazad\") da biste preskočili ovaj korak.</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 5109eed55..3338e9880 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Prem per veure-ho</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">s\'està carregant 1 fitxer</item>
-    <item quantity="other">s\'estan carregant %d fitxers</item>
+    <item quantity="other">s\'estan carregant %1$d fitxers</item>
   </plurals>
   <string name="title_activity_contributions">Les meves càrregues recents</string>
   <string name="contribution_state_queued">En cua</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Encara no hi ha cap càrrega</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d càrrega</item>
-    <item quantity="other">%d càrregues</item>
+    <item quantity="one">%1$d càrrega</item>
+    <item quantity="other">%1$d càrregues</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">S\'està iniciant %d càrrega</item>
-    <item quantity="other">S\'estan iniciant %d càrregues</item>
+    <item quantity="one">S\'està iniciant %1$d càrrega</item>
+    <item quantity="other">S\'estan iniciant %1$d càrregues</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">1 càrrega</item>
-    <item quantity="other">%d càrregues</item>
+    <item quantity="other">%1$d càrregues</item>
   </plurals>
   <string name="categories_not_found">No s\'ha trobat cap categoria que coincideixi amb %1$s</string>
   <string name="categories_skip_explanation">Afegiu categories per fer que les vostres imatges siguin més fàcils de trobar a Wikimedia Commons.</string>
@@ -178,5 +178,5 @@
   <string name="get_directions">COM ANAR-HI</string>
   <string name="read_article">LLEGIU L’ARTICLE</string>
   <string name="notifications_thank_you_edit">Gràcies per fer una modificació</string>
-  <string name="notifications_mention">%s us ha mencionat a %s.</string>
+  <string name="notifications_mention">%1$s us ha mencionat a %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 6e15b7d9a..6d2ef7f2f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Načítání souboru %1$s se nezdařilo</string>
   <string name="upload_failed_notification_subtitle">Klepnutím zobrazíte</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d soubor se nahrává</item>
-    <item quantity="other">%d souborů se nahrává</item>
+    <item quantity="one">%1$d soubor se nahrává</item>
+    <item quantity="other">%1$d souborů se nahrává</item>
   </plurals>
   <string name="title_activity_contributions">Moje nedávné obrázky</string>
   <string name="contribution_state_queued">Ve frontě</string>
@@ -57,15 +57,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">Žádné soubory</item>
     <item quantity="one">1 soubor</item>
-    <item quantity="other">%d souborů</item>
+    <item quantity="other">%1$d souborů</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Spouští se nahrávání %d souboru</item>
-    <item quantity="other">Spouští se nahrávání %d souborů</item>
+    <item quantity="one">Spouští se nahrávání %1$d souboru</item>
+    <item quantity="other">Spouští se nahrávání %1$d souborů</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d nahrávání</item>
-    <item quantity="other">%d nahrávání</item>
+    <item quantity="one">%1$d nahrávání</item>
+    <item quantity="other">%1$d nahrávání</item>
   </plurals>
   <string name="categories_not_found">Žádné kategorie neodpovídají „%1$s“</string>
   <string name="categories_skip_explanation">Přidejte kategorie, aby bylo vaše obrázky možno na Wikimedia Commons najít.</string>
diff --git a/app/src/main/res/values-csb/strings.xml b/app/src/main/res/values-csb/strings.xml
index 47f21d85d..6f2b493a0 100644
--- a/app/src/main/res/values-csb/strings.xml
+++ b/app/src/main/res/values-csb/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Wladënk %1$s nie darzëł sã</string>
   <string name="upload_failed_notification_subtitle">Tkni, abë òbôczëc</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">Wladënk %d lopka</item>
-    <item quantity="other">Wladënk %d lopków</item>
+    <item quantity="one">Wladënk %1$d lopka</item>
+    <item quantity="other">Wladënk %1$d lopków</item>
   </plurals>
   <string name="title_activity_contributions">Mòjé slédno wladowóné lopczi</string>
   <string name="contribution_state_queued">Żdające</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Nie dô jesz wladënków</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">Przesłano @string/contributions_subtitle_zero</item>
-    <item quantity="one">Przesłano %d lopk</item>
-    <item quantity="other">Przesłano %d lopczi</item>
+    <item quantity="one">Przesłano %1$d lopk</item>
+    <item quantity="other">Przesłano %1$d lopczi</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Naczãto %d wladënk</item>
-    <item quantity="other">Naczãto %d wladënczi</item>
+    <item quantity="one">Naczãto %1$d wladënk</item>
+    <item quantity="other">Naczãto %1$d wladënczi</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d wladënk</item>
-    <item quantity="other">%d wladënczi</item>
+    <item quantity="one">%1$d wladënk</item>
+    <item quantity="other">%1$d wladënczi</item>
   </plurals>
   <string name="categories_not_found">Felënk pasowny kategòrëji do %1$s</string>
   <string name="categories_activity_title">Kategòrëje</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 5af28c3cf..27480ee3d 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Tapiwch i weld</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">1 ffeil yn uwchlwytho</item>
-    <item quantity="other">%d ffeil yn uwchlwytho</item>
+    <item quantity="other">%1$d ffeil yn uwchlwytho</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">Fy uwchlwythiadau</string>
   <string name="contribution_state_queued">Yn y ciw</string>
@@ -52,15 +52,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Dim Uwchlwythiadau eto</item>
     <item quantity="one">1 uwchlwythiad</item>
-    <item quantity="other">%d uwchlwythiad</item>
+    <item quantity="other">%1$d uwchlwythiad</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">Cychwyn uwchlwytho 1 ffeil</item>
-    <item quantity="other">Cychwyn uwchlwytho %d ffeil</item>
+    <item quantity="other">Cychwyn uwchlwytho %1$d ffeil</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 uwchlwythiad</item>
-    <item quantity="other">%d uwchlwythiad</item>
+    <item quantity="other">%1$d uwchlwythiad</item>
   </plurals>
   <string name="categories_not_found">Dim categori\'n cyfateb i %1$s ar gael</string>
   <string name="categories_skip_explanation" fuzzy="true">Cychwynwch deipio i ychwanegu categoriau.\nCyffyrddwch y neges hon (neu ddewis Nôl) i fynd i\'r cam nesaf.</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 4c73a1e5e..27635b391 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Overførsel af %1$s mislykkedes</string>
   <string name="upload_failed_notification_subtitle">Klik for at se</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fil overføres</item>
-    <item quantity="other">%d filer overføres</item>
+    <item quantity="one">%1$d fil overføres</item>
+    <item quantity="other">%1$d filer overføres</item>
   </plurals>
   <string name="title_activity_contributions">Mine seneste overførsler</string>
   <string name="contribution_state_queued">I kø</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Ingen overførelser endnu</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d overførsel</item>
-    <item quantity="other">%d overførelser</item>
+    <item quantity="one">%1$d overførsel</item>
+    <item quantity="other">%1$d overførelser</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Starter %d overførsel</item>
-    <item quantity="other">Starter %d overførsler</item>
+    <item quantity="one">Starter %1$d overførsel</item>
+    <item quantity="other">Starter %1$d overførsler</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d overførsel</item>
-    <item quantity="other">%d overførsler</item>
+    <item quantity="one">%1$d overførsel</item>
+    <item quantity="other">%1$d overførsler</item>
   </plurals>
   <string name="categories_not_found">Ingen kategorier matchende %1$s er fundet</string>
   <string name="categories_skip_explanation">Tilføj kategorier for at gøre billederne mere synlig på Wikimedia Commons. Tast for at tilføje kategorier.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0318473ff..7d5d6b267 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Tippen zum Betrachten</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">Eine Datei wird hochgeladen</item>
-    <item quantity="other">%d Dateien werden hochgeladen</item>
+    <item quantity="other">%1$d Dateien werden hochgeladen</item>
   </plurals>
   <string name="title_activity_contributions">Meine kürzlich hochgeladenen Dateien</string>
   <string name="contribution_state_queued">In der Warteschlange</string>
@@ -57,15 +57,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
     <item quantity="one">Eine hochgeladene Datei</item>
-    <item quantity="other">%d hochgeladene Dateien</item>
+    <item quantity="other">%1$d hochgeladene Dateien</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Starte einen Upload</item>
-    <item quantity="other">Starte %d Uploads</item>
+    <item quantity="other">Starte %1$d Uploads</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">Eine hochgeladene Datei</item>
-    <item quantity="other">%d hochgeladene Dateien</item>
+    <item quantity="other">%1$d hochgeladene Dateien</item>
   </plurals>
   <string name="categories_not_found">Die Kategorie „%1$s“ wurde nicht gefunden</string>
   <string name="categories_skip_explanation">Füge Kategorien hinzu, um deine Bilder auf Wikimedia Commons auffindbarer zu machen.\nBeginne mit der Eingabe, um Kategorien hinzuzufügen.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Berechtigung zur Anzeige einer Liste mit Orten in der Nähe erforderlich</string>
   <string name="get_directions">RICHTUNGEN ABRUFEN</string>
   <string name="read_article">ARTIKEL LESEN</string>
-  <string name="notifications_welcome">Willkommen auf Wikimedia Commons, %s! Wir sind froh, dass du hier bist.</string>
-  <string name="notifications_talk_page_message">%s hinterließ eine Nachricht auf deiner Diskussionsseite</string>
+  <string name="notifications_welcome">Willkommen auf Wikimedia Commons, %1$s! Wir sind froh, dass du hier bist.</string>
+  <string name="notifications_talk_page_message">%1$s hinterließ eine Nachricht auf deiner Diskussionsseite</string>
   <string name="notifications_thank_you_edit">Vielen Dank für deine Bearbeitung</string>
-  <string name="notifications_mention">%s erwähnte dich auf %s.</string>
+  <string name="notifications_mention">%1$s erwähnte dich auf %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-diq/strings.xml b/app/src/main/res/values-diq/strings.xml
index d5f18eeac..2b67f1917 100644
--- a/app/src/main/res/values-diq/strings.xml
+++ b/app/src/main/res/values-diq/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">pıpawane xo bıvin</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">1 dosye selagnayış</item>
-    <item quantity="other">%d dosye Selagnayışi</item>
+    <item quantity="other">%1$d dosye Selagnayışi</item>
   </plurals>
   <string name="title_activity_contributions">Barkerdışê mınê peyêni</string>
   <string name="contribution_state_queued">Ratneya</string>
@@ -52,15 +52,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Theba bar nêbı</item>
     <item quantity="one">1 bar kerdış</item>
-    <item quantity="other">%d bar kerdışi</item>
+    <item quantity="other">%1$d bar kerdışi</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">Sergendış 1 bar kerdış</item>
-    <item quantity="other">Sergendış %d bar kerdışi </item>
+    <item quantity="other">Sergendış %1$d bar kerdışi </item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 bar kerdış</item>
-    <item quantity="other">%d bar kerdışi </item>
+    <item quantity="other">%1$d bar kerdışi </item>
   </plurals>
   <string name="categories_not_found">Kategoriyan de %1$s deye theba çıniyo</string>
   <string name="categories_skip_explanation" fuzzy="true">Kategori cı kerdışi rê nusnayış bıkeré. Ena gamer ravêrdışi rê mesaci bıpıloğnê yana peyd şırê.</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 87713802f..e2b7f4090 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Πατήστε για να δείτε</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">1 αρχείο επιφορτώνεται</item>
-    <item quantity="other">%d αρχεία επιφορτώνονται</item>
+    <item quantity="other">%1$d αρχεία επιφορτώνονται</item>
   </plurals>
   <string name="title_activity_contributions">Οι Πρόσφατες Φορτώσεις Μου</string>
   <string name="contribution_state_queued">Στην ουρά</string>
@@ -57,15 +57,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">Δεν υπάρχουν επιφορτώσεις ακόμη</item>
     <item quantity="one">1 επιφόρτωση</item>
-    <item quantity="other">%d επιφορτώσεις</item>
+    <item quantity="other">%1$d επιφορτώσεις</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Έναρξη 1 επιφόρτωσης</item>
-    <item quantity="other">Έναρτξη %d επιφορτώσεων</item>
+    <item quantity="other">Έναρτξη %1$d επιφορτώσεων</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">1 επιφόρτωση</item>
-    <item quantity="other">%d επιφορτώσεις</item>
+    <item quantity="other">%1$d επιφορτώσεις</item>
   </plurals>
   <string name="categories_not_found">Δεν βρέθηκαν κατηγορίες που ταιριάζουν %1$s</string>
   <string name="categories_skip_explanation">Προσθέστε κατηγορίες για να κάνετε τις εικόνες σας πιο ανιχνεύσιμες στα Wikimedia Commons.\n\nΑρχίστε να γράφετε για να προσθέσετε κατηγορίες.\nΠατήστε αυτό το μήνυμα (ή πατήστε επιστροφή) για να παραλείψετε αυτό το βήμα.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Απαιτείται άδεια για την εμφάνιση λίστας κοντινών σημείων</string>
   <string name="get_directions">Λάβετε κατευθύνσεις</string>
   <string name="read_article">Ανάγνωση άρθρου</string>
-  <string name="notifications_welcome">Καλωσήρθατε στο Wikimedia Commons, %s! Είμαστε χαρούμενοι που είστε εδώ.</string>
-  <string name="notifications_talk_page_message">Ο %s άφησε ένα μήνυμα στην σελίδα συζήτησής σας</string>
+  <string name="notifications_welcome">Καλωσήρθατε στο Wikimedia Commons, %1$s! Είμαστε χαρούμενοι που είστε εδώ.</string>
+  <string name="notifications_talk_page_message">Ο %1$s άφησε ένα μήνυμα στην σελίδα συζήτησής σας</string>
   <string name="notifications_thank_you_edit">Ευχαριστούμε που κάνατε μια επεξεργασία</string>
-  <string name="notifications_mention">Ο %s σας ανέφερε στο %s.</string>
+  <string name="notifications_mention">Ο %1$s σας ανέφερε στο %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b5accc246..8d9955528 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -21,8 +21,8 @@
   <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">Subiendo %d archivo</item>
-    <item quantity="other">Subiendo %d archivos</item>
+    <item quantity="one">Subiendo %1$d archivo</item>
+    <item quantity="other">Subiendo %1$d archivos</item>
   </plurals>
   <string name="title_activity_contributions">Mis subidas recientes</string>
   <string name="contribution_state_queued">En la cola</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">No hay subidas aún</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d subida</item>
-    <item quantity="other">%d subidas</item>
+    <item quantity="one">%1$d subida</item>
+    <item quantity="other">%1$d subidas</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Iniciando 1 subida</item>
-    <item quantity="other">Iniciando %d subidas</item>
+    <item quantity="other">Iniciando %1$d subidas</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d subida</item>
-    <item quantity="other">%d subidas</item>
+    <item quantity="one">%1$d subida</item>
+    <item quantity="other">%1$d subidas</item>
   </plurals>
   <string name="categories_not_found">No se encontraron categorías que coincidieran con %1$s</string>
   <string name="categories_skip_explanation">Añade categorías para hacer que tus imágenes sean más fáciles de encontrar en Wikimedia Commons.\nComienza a escribir para añadir categorías.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Se necesita permiso para mostrar una lista de lugares cercanos</string>
   <string name="get_directions">CÓMO LLEGAR</string>
   <string name="read_article">LEER ARTÍCULO</string>
-  <string name="notifications_welcome">¡Te damos la bienvenida a Wikimedia Commons, %s! Qué bueno que estés aquí.</string>
-  <string name="notifications_talk_page_message">%s dejó un mensaje en tu página de discusión</string>
+  <string name="notifications_welcome">¡Te damos la bienvenida a Wikimedia Commons, %1$s! Qué bueno que estés aquí.</string>
+  <string name="notifications_talk_page_message">%1$s dejó un mensaje en tu página de discusión</string>
   <string name="notifications_thank_you_edit">Gracias por realizar una edición</string>
-  <string name="notifications_mention">%s te ha mencionado en %s.</string>
+  <string name="notifications_mention">%1$s te ha mencionado en %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index dc7947c87..a340d7d72 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -51,7 +51,7 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Oraindik igoerarik ez</item>
     <item quantity="one">igoera 1</item>
-    <item quantity="other">%d igoera</item>
+    <item quantity="other">%1$d igoera</item>
   </plurals>
   <string name="categories_not_found">Ez da kategoriak aukritu %1$s izenarekin</string>
   <string name="categories_skip_explanation" fuzzy="true">Gehitu kategoriak zure argazkiak Wikimedia Commonsen aurkitzen errazagoak izan daitezen.</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index ee9cd0a67..aa4e17c8a 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -21,8 +21,8 @@
   <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">%d پرونده در حال بارگذاری</item>
-    <item quantity="other">%d پرونده در حال بارگذاری</item>
+    <item quantity="one">%1$d پرونده در حال بارگذاری</item>
+    <item quantity="other">%1$d پرونده در حال بارگذاری</item>
   </plurals>
   <string name="title_activity_contributions">بارگذاری‌های اخیر من</string>
   <string name="contribution_state_queued">در صف</string>
@@ -57,15 +57,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
     <item quantity="one">بارگذاری شد</item>
-    <item quantity="other">%d بارگذاری شد</item>
+    <item quantity="other">%1$d بارگذاری شد</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">شروع %d بارگذاری پرونده</item>
-    <item quantity="other">شروع بارگذاری %d پرونده</item>
+    <item quantity="one">شروع d1$% بارگذاری پرونده</item>
+    <item quantity="other">شروع بارگذاری d1$% پرونده</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d بارگذاری</item>
-    <item quantity="other">%d بارگذاری</item>
+    <item quantity="one">%1$d بارگذاری</item>
+    <item quantity="other">%1$d بارگذاری</item>
   </plurals>
   <string name="categories_not_found">رده‌ای منطبق با %1$s یافت نشد</string>
   <string name="categories_skip_explanation">برای دسترسی آسان‌تر در ویکی‌انبار به تصویرهایتان رده بیافزائید.\n\nشروع به افزودن رده.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">برای نمایش مکان‌ّای اطراف نیاز به اجازه است.</string>
   <string name="get_directions">دریافت جهت‌‌ها</string>
   <string name="read_article">خواندن مقاله</string>
-  <string name="notifications_welcome">%s، به ویکی‌انبار خوش آمدید! خوشحالیم که اینجا هستید.</string>
-  <string name="notifications_talk_page_message">%s در صفحهٔ بحث شما پیامی گذاشته‌است</string>
+  <string name="notifications_welcome">%1$s، به ویکی‌انبار خوش آمدید! خوشحالیم که اینجا هستید.</string>
+  <string name="notifications_talk_page_message">%1$s در صفحهٔ بحث شما پیامی گذاشته‌است</string>
   <string name="notifications_thank_you_edit">برای ویرایش ممنون</string>
-  <string name="notifications_mention">%s در %s به شما اشاره کرده‌است.</string>
+  <string name="notifications_mention">%1$s در %2$s به شما اشاره کرده‌است.</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b69e08fe1..3c815b34a 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Napauta katsoaksesi</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">1 tiedosto tallentuu</item>
-    <item quantity="other">%d tiedostoa tallentuu</item>
+    <item quantity="other">%1$d tiedostoa tallentuu</item>
   </plurals>
   <string name="title_activity_contributions">Viimeaikaiset tallennukseni</string>
   <string name="contribution_state_queued">Jonossa</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Ei tallennuksia vielä</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d tallennus</item>
-    <item quantity="other">%d tallennusta</item>
+    <item quantity="one">%1$d tallennus</item>
+    <item quantity="other">%1$d tallennusta</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">aloitetaan %d tallennus</item>
-    <item quantity="other">aloitetaan %d tallennusta</item>
+    <item quantity="one">aloitetaan %1$d tallennus</item>
+    <item quantity="other">aloitetaan %1$d tallennusta</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d tallennus</item>
-    <item quantity="other">%d tallennusta</item>
+    <item quantity="one">%1$d tallennus</item>
+    <item quantity="other">%1$d tallennusta</item>
   </plurals>
   <string name="categories_not_found">Luokkaa %1$s ei löytynyt</string>
   <string name="categories_skip_explanation">Lisää luokkia tehdäksesi kuvistasi enemmän löydettäviä Wikimedia Commonssissa.\nAloita kirjoittaminen lisätäksesi luokkia.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0666be16b..f8deac4f3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Le téléversement de %1$s a échoué</string>
   <string name="upload_failed_notification_subtitle">Appuyer pour afficher</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fichier en cours de téléversement</item>
-    <item quantity="other">%d fichiers en cours de téléversement</item>
+    <item quantity="one">%1$d fichier en cours de téléversement</item>
+    <item quantity="other">%1$d fichiers en cours de téléversement</item>
   </plurals>
   <string name="title_activity_contributions">Mes téléversements récents</string>
   <string name="contribution_state_queued">Mis en file d\'attente</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Encore aucun téléversement</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d téléversement</item>
-    <item quantity="other">%d téléversements</item>
+    <item quantity="one">%1$d téléversement</item>
+    <item quantity="other">%1$d téléversements</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d téléversement démarré</item>
-    <item quantity="other">%d téléversements démarrés</item>
+    <item quantity="one">%1$d téléversement démarré</item>
+    <item quantity="other">%1$d téléversements démarrés</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d téléversement</item>
-    <item quantity="other">%d téléversements</item>
+    <item quantity="one">%1$d téléversement</item>
+    <item quantity="other">%1$d téléversements</item>
   </plurals>
   <string name="categories_not_found">Aucune catégorie correspondant à %1$s trouvée</string>
   <string name="categories_skip_explanation">Ajoutez des catégories pour rendre vos images plus simples à trouver sur Wikimedia Commons. \nCommencer à ajouter des catégories.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Une permission est requise pour afficher une liste de lieux relatifs</string>
   <string name="get_directions">OBTENIR DES DIRECTIVES</string>
   <string name="read_article">LIRE L’ARTICLE</string>
-  <string name="notifications_welcome">Bienvenue sur Wikimedia Commons, %s! Nous sommes heureux que vous soyez venu.</string>
-  <string name="notifications_talk_page_message">%s a laissé un message sur votre page de discussion</string>
+  <string name="notifications_welcome">Bienvenue sur Wikimedia Commons, %1$s! Nous sommes heureux que vous soyez venu.</string>
+  <string name="notifications_talk_page_message">%1$s a laissé un message sur votre page de discussion</string>
   <string name="notifications_thank_you_edit">Merci de faire une modification</string>
-  <string name="notifications_mention">%s vous a mentionné sur %s .</string>
+  <string name="notifications_mention">%1$s vous a mentionné sur %2$s .</string>
 </resources>
diff --git a/app/src/main/res/values-frr/strings.xml b/app/src/main/res/values-frr/strings.xml
index 317890630..2fb2ba14a 100644
--- a/app/src/main/res/values-frr/strings.xml
+++ b/app/src/main/res/values-frr/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Huuchschüüren faan „%1$s“ skiaf gingen</string>
   <string name="upload_failed_notification_subtitle">Tipe, am det uuntulukin</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d datei woort huuchschüürd</item>
-    <item quantity="other">%d datein wurd huuchschüürd</item>
+    <item quantity="one">%1$d datei woort huuchschüürd</item>
+    <item quantity="other">%1$d datein wurd huuchschüürd</item>
   </plurals>
   <string name="title_activity_contributions">Min tuleetst huuchschüürd datein</string>
   <string name="contribution_state_queued">Skal noch teew</string>
@@ -57,15 +57,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
     <item quantity="one">Ian huuchschüürd datei</item>
-    <item quantity="other">%d huuchschüürd datein</item>
+    <item quantity="other">%1$d huuchschüürd datein</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Began %d upload</item>
-    <item quantity="other">Began %d uploads</item>
+    <item quantity="one">Began %1$d upload</item>
+    <item quantity="other">Began %1$d uploads</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d huuchschüürd datei</item>
-    <item quantity="other">%d huuchschüürd datein</item>
+    <item quantity="one">%1$d huuchschüürd datei</item>
+    <item quantity="other">%1$d huuchschüürd datein</item>
   </plurals>
   <string name="categories_not_found">Det kategorii „%1$s“ küd ei fünjen wurd.</string>
   <string name="categories_skip_explanation" fuzzy="true">Dü könst nei kategoriin iinracht, amdat din bilen beeder fünjen wurd. Eder skriiw en kategorii-nööm of tipe üüb det nooracht (of gung üüb det \'turag\'-fial), an läät di straal ütj.</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 8e4f3cd12..90de742cc 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Erro ao cargar \"%1$s\"</string>
   <string name="upload_failed_notification_subtitle">Prema para mostralo</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">Cargando %d ficheiro</item>
-    <item quantity="other">Cargando %d ficheiros</item>
+    <item quantity="one">Cargando %1$d ficheiro</item>
+    <item quantity="other">Cargando %1$d ficheiros</item>
   </plurals>
   <string name="title_activity_contributions">As miñas subas recentes</string>
   <string name="contribution_state_queued">Na cola</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Aínda non hai subas</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d carga</item>
-    <item quantity="other">%d cargas</item>
+    <item quantity="one">%1$d carga</item>
+    <item quantity="other">%1$d cargas</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Iniciando %d carga</item>
-    <item quantity="other">Iniciando %d cargas</item>
+    <item quantity="one">Iniciando %1$d carga</item>
+    <item quantity="other">Iniciando %1$d cargas</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d carga</item>
-    <item quantity="other">%d cargas</item>
+    <item quantity="one">%1$d carga</item>
+    <item quantity="other">%1$d cargas</item>
   </plurals>
   <string name="categories_not_found">Non se atopou ningunha categoría que coincidise con \"%1$s\"</string>
   <string name="categories_skip_explanation">Engada categorías para facer máis accesibles as súas imaxes na Wikimedia Commons.\nComece a escribir para engadir categorías.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Precísase permiso para amosar unha lista de lugares preto de aquí</string>
   <string name="get_directions">OBTER DIRECCIÓNS</string>
   <string name="read_article">LER ARTIGO</string>
-  <string name="notifications_welcome">Benvido a Wikimedia Commons, %s! Alegrámonos de que estea aquí.</string>
-  <string name="notifications_talk_page_message">%s deixoulle unha mensaxe na súa páxina de conversa</string>
+  <string name="notifications_welcome">Benvido a Wikimedia Commons, %1$s! Alegrámonos de que estea aquí.</string>
+  <string name="notifications_talk_page_message">%1$s deixoulle unha mensaxe na súa páxina de conversa</string>
   <string name="notifications_thank_you_edit">Grazas por realizar unha edición</string>
-  <string name="notifications_mention">%s mencionouno en %s.</string>
+  <string name="notifications_mention">%1$s mencionouno en %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 288ea8f00..30444747b 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -55,16 +55,16 @@
   <string name="enable_gps">जीपीएस सक्षम करें</string>
   <string name="contributions_subtitle_zero">अभी तक कोई अपलोड नहीं</string>
   <plurals name="contributions_subtitle">
-    <item quantity="one">%d अपलोड</item>
-    <item quantity="other">%d अपलोड्स</item>
+    <item quantity="one">%1$d अपलोड</item>
+    <item quantity="other">%1$d अपलोड्स</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d अपलोड शुरू</item>
-    <item quantity="other">%d अपलोड शुरू</item>
+    <item quantity="one">%1$d अपलोड शुरू</item>
+    <item quantity="other">%1$d अपलोड शुरू</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d अपलोड</item>
-    <item quantity="other">%d अपलोड</item>
+    <item quantity="one">%1$d अपलोड</item>
+    <item quantity="other">%1$d अपलोड</item>
   </plurals>
   <string name="categories_not_found">%1$s से कोई श्रेणी मेल नहीं खाती</string>
   <string name="categories_skip_explanation">विकिमीडिया कॉमन्स पर अपनी छवियों को अधिक खोजने योग्य बनाने के लिए श्रेणियां जोड़ें|\nश्रेणियां जोड़ने के लिए टाइप करना प्रारंभ करें|</string>
@@ -209,8 +209,8 @@
   <string name="location_permission_rationale_nearby">आसपास के स्थान दिखाने के लिए अनुमति चाहिए</string>
   <string name="get_directions">दिशा - निर्देश प्राप्त करें</string>
   <string name="read_article">लेख पढ़ें</string>
-  <string name="notifications_welcome">विकिमीडिया कॉमन्स पर आपका स्वागत है, %s! हमें हर्ष है कि आप यहाँ हैं।</string>
-  <string name="notifications_talk_page_message">%s ने आपके वार्ता पृष्ठ पर सन्देश छोड़ा है</string>
+  <string name="notifications_welcome">विकिमीडिया कॉमन्स पर आपका स्वागत है, %1$s! हमें हर्ष है कि आप यहाँ हैं।</string>
+  <string name="notifications_talk_page_message">%1$s ने आपके वार्ता पृष्ठ पर सन्देश छोड़ा है</string>
   <string name="notifications_thank_you_edit">सम्पादन करने के लिए धन्यवाद</string>
-  <string name="notifications_mention">%s ने %s में आपका उल्लेख किया है</string>
+  <string name="notifications_mention">%1$s ने %2$s में आपका उल्लेख किया है</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 0910c3b42..62f7aa83e 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">%1$s feltöltése sikertelen</string>
   <string name="upload_failed_notification_subtitle">Érintsd meg a megtekintéshez</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fájl feltöltése folyamatban</item>
-    <item quantity="other">%d fájl feltöltése folyamatban</item>
+    <item quantity="one">%1$d fájl feltöltése folyamatban</item>
+    <item quantity="other">%1$d fájl feltöltése folyamatban</item>
   </plurals>
   <string name="title_activity_contributions">Legutóbbi feltöltéseim</string>
   <string name="contribution_state_queued">Várólistán</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Még nincsenek feltöltések</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d feltöltés</item>
-    <item quantity="other">%d feltöltés</item>
+    <item quantity="one">%1$d feltöltés</item>
+    <item quantity="other">%1$d feltöltés</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d feltöltés kezdése</item>
-    <item quantity="other">%d feltöltés kezdése</item>
+    <item quantity="one">%1$d feltöltés kezdése</item>
+    <item quantity="other">%1$d feltöltés kezdése</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d feltöltés</item>
-    <item quantity="other">%d feltöltés</item>
+    <item quantity="one">%1$d feltöltés</item>
+    <item quantity="other">%1$d feltöltés</item>
   </plurals>
   <string name="categories_not_found">Nincs a(z) „%1$s” keresési kifejezésnek megfelelő kategória</string>
   <string name="categories_skip_explanation">Adj kategóriákat a képekhez, hogy könnyebben meg lehessen találni őket a Commonson.\nKezdd el beírni a kategória nevét, hogy hozzáadd.\nBökj erre az üzenetre (vagy a vissza gombra) a lépés kihagyásához</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 6cb355fee..a739449c4 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_failed_notification_subtitle">Tekan untuk melihat</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">Mengunggah 1 berkas</item>
-    <item quantity="other">Mengunggah %d berkas</item>
+    <item quantity="other">Mengunggah %1$d berkas</item>
   </plurals>
   <string name="title_activity_contributions">Unggahan saya</string>
   <string name="contribution_state_queued">Antrean</string>
@@ -49,15 +49,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">Tidak ada unggahan</item>
     <item quantity="one">1 unggahan</item>
-    <item quantity="other">%d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Memulai 1 unggahan</item>
-    <item quantity="other">Memulai %d unggahan</item>
+    <item quantity="other">Memulai %1$d unggahan</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">1 unggahan</item>
-    <item quantity="other">%d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
   <string name="categories_not_found">Tidak ada kategori yang cocok dengan %1$s</string>
   <string name="categories_skip_explanation">Tambahkan kategori agar foto Anda lebih mudah ditemukan di Wikimedia Commons.
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 397d78312..3d766f26d 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Tekan untuk melihat</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">mengunggah 1 berkas</item>
-    <item quantity="other">mengunggah %d berkas</item>
+    <item quantity="other">mengunggah %1$d berkas</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">Unggahan saya</string>
   <string name="contribution_state_queued">Antrean</string>
@@ -52,15 +52,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Tidak ada unggahan</item>
     <item quantity="one">1 unggahan</item>
-    <item quantity="other">%d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">Memulai 1 unggahan</item>
-    <item quantity="other">Memulai %d unggahan</item>
+    <item quantity="other">Memulai %1$d unggahan</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 unggahan</item>
-    <item quantity="other">%d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
   <string name="categories_not_found">Tidak ada kategori yang cocok dengan %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Tambahkan kategori agar foto Anda lebih mudah ditemukan di Wikimedia Commons.\n\nMulai mengetik untuk menambahkan kategori.\nTekan pesan ini (atau tekan kembali) untuk melewatkan langkah ini.</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index a3e397117..af2ed3635 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Innsending á %1$s mistókst</string>
   <string name="upload_failed_notification_subtitle">Bankaðu til að skoða</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d skrá að sendast inn</item>
-    <item quantity="other">%d skrár að sendast inn</item>
+    <item quantity="one">%1$d skrá að sendast inn</item>
+    <item quantity="other">%1$d skrár að sendast inn</item>
   </plurals>
   <string name="title_activity_contributions">Nýlega innsendar skrár</string>
   <string name="contribution_state_queued">Í biðröð</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Engar innsendingar ennþá</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d innsending</item>
-    <item quantity="other">%d innsendingar</item>
+    <item quantity="one">%1$d innsending</item>
+    <item quantity="other">%1$d innsendingar</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Byrja %d innsendingu</item>
-    <item quantity="other">Byrja %d innsendingar</item>
+    <item quantity="one">Byrja %1$d innsendingu</item>
+    <item quantity="other">Byrja %1$d innsendingar</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d innsending</item>
-    <item quantity="other">%d innsendingar</item>
+    <item quantity="one">%1$d innsending</item>
+    <item quantity="other">%1$d innsendingar</item>
   </plurals>
   <string name="categories_not_found">Engir flokkar sem samsvara %1$s fundust</string>
   <string name="categories_skip_explanation">Bættu við flokkum til að gera myndirnar þínar aðgengilegri á Wikimedia Commons\nByrjaðu að skrifa til að bæta við flokkum.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Heimild þarf til að birta lista yfir staði í nágrenninu</string>
   <string name="get_directions">FÁ LEIÐSÖGN</string>
   <string name="read_article">LESA GREIN</string>
-  <string name="notifications_welcome">Velkomin á Wikimedia Commons, %s! Við erum ánægð með að þú skulir vera hérna.</string>
-  <string name="notifications_talk_page_message">%s skildi eftir skilaboð á spjallsíðunni þinni</string>
+  <string name="notifications_welcome">Velkomin á Wikimedia Commons, %1$s! Við erum ánægð með að þú skulir vera hérna.</string>
+  <string name="notifications_talk_page_message">%1$s skildi eftir skilaboð á spjallsíðunni þinni</string>
   <string name="notifications_thank_you_edit">Takk fyrir að hafa gert breytingar</string>
-  <string name="notifications_mention">%s minntist á þig á %s.</string>
+  <string name="notifications_mention">%1$s minntist á þig á %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9e24b8de4..17b3d5cb8 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Caricamento di %1$s non riuscito</string>
   <string name="upload_failed_notification_subtitle">Premi per visualizzare</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d file in caricamento</item>
-    <item quantity="other">%d file in caricamento</item>
+    <item quantity="one">%1$d file in caricamento</item>
+    <item quantity="other">%1$d file in caricamento</item>
   </plurals>
   <string name="title_activity_contributions">I miei ultimi caricamenti</string>
   <string name="contribution_state_queued">In coda</string>
@@ -57,15 +57,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
     <item quantity="one">1 caricamento</item>
-    <item quantity="other">%d caricamenti</item>
+    <item quantity="other">%1$d caricamenti</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Iniziato %d caricamento</item>
-    <item quantity="other">Iniziati %d caricamenti</item>
+    <item quantity="one">Iniziato %1$d caricamento</item>
+    <item quantity="other">Iniziati %1$d caricamenti</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d caricamento</item>
-    <item quantity="other">%d caricamenti</item>
+    <item quantity="one">%1$d caricamento</item>
+    <item quantity="other">%1$d caricamenti</item>
   </plurals>
   <string name="categories_not_found">Non è stata trovata alcuna categoria che contiene %1$s</string>
   <string name="categories_skip_explanation">Aggiungi categorie per rendere le tue immagini più facilmente individuabili su Wikimedia Commons.\nInizia a digitare per aggiungere categorie.</string>
@@ -181,8 +181,8 @@
   <string name="nearby_location_not_available">Posizione non disponibile.</string>
   <string name="get_directions">OTTIENI DIREZIONI</string>
   <string name="read_article">LEGGI VOCE</string>
-  <string name="notifications_welcome">Benvenuto in Wikimedia Commons, %s! Siamo contenti che tu sia qui.</string>
-  <string name="notifications_talk_page_message">%s ti ha lasciato un messaggio nella tua pagina di discussione</string>
+  <string name="notifications_welcome">Benvenuto in Wikimedia Commons, %1$s! Siamo contenti che tu sia qui.</string>
+  <string name="notifications_talk_page_message">%1$s ti ha lasciato un messaggio nella tua pagina di discussione</string>
   <string name="notifications_thank_you_edit">Grazie per aver fatto una modifica</string>
-  <string name="notifications_mention">%s ti ha menzionato su %s.</string>
+  <string name="notifications_mention">%1$s ti ha menzionato su %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index e986ef259..17a03ae7f 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -56,15 +56,15 @@
   <string name="contributions_subtitle_zero">לא הועלה עדיין שום דבר</string>
   <plurals name="contributions_subtitle">
     <item quantity="one">העלאה אחת</item>
-    <item quantity="other">%d העלאות</item>
+    <item quantity="other">%1$d העלאות</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">התחלת העלאה</item>
-    <item quantity="other">התחלת %d העלאות</item>
+    <item quantity="other">התחלת 1$d% העלאות</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">העלאה אחת</item>
-    <item quantity="other">%d העלאות</item>
+    <item quantity="other">%1$d העלאות</item>
   </plurals>
   <string name="categories_not_found">לא נמצאו קטגוריות בשם %1$s</string>
   <string name="categories_skip_explanation">יש להוסיף קטגוריות כדי שיהיה קל יותר למצוא את התמונות שלך בוויקישיתוף.\nכדי להוסיף קטגוריה יש להתחיל לכתוב.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4b7135d0b..f02e0978f 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -54,13 +54,13 @@
   <string name="contributions_subtitle_zero">まだ何もアップロードされていません。</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="other">%d 件のアップロード</item>
+    <item quantity="other">%1$d 件のアップロード</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="other">%d 件のアップロードを開始中</item>
+    <item quantity="other">%1$d 件のアップロードを開始中</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="other">%d 件のアップロード</item>
+    <item quantity="other">%1$d 件のアップロード</item>
   </plurals>
   <string name="categories_not_found">%1$s に一致するカテゴリが見つかりません</string>
   <string name="categories_skip_explanation">あなたの画像をウィキメディア・コモンズで見つけやすくするためにカテゴリを追加してください。\n\nカテゴリ名の入力を開始してください。\nこの手順をスキップするにはこのメッセージをタップしてください(または戻るボタン)。</string>
diff --git a/app/src/main/res/values-jv/strings.xml b/app/src/main/res/values-jv/strings.xml
index 10afc01bf..6488f1ae4 100644
--- a/app/src/main/res/values-jv/strings.xml
+++ b/app/src/main/res/values-jv/strings.xml
@@ -55,16 +55,16 @@
   <string name="contributions_subtitle_zero">Durung ana unggahan</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d unggahan</item>
-    <item quantity="other">%d unggahan</item>
+    <item quantity="one">%1$d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Miwiti %d unggahan</item>
-    <item quantity="other">Miwiti %d unggahan</item>
+    <item quantity="one">Miwiti %1$d unggahan</item>
+    <item quantity="other">Miwiti %1$d unggahan</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d unggahan</item>
-    <item quantity="other">%d unggahan</item>
+    <item quantity="one">%1$d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
   <string name="categories_not_found">Ora ana kategori sing cocog karo %1$s</string>
   <string name="categories_activity_title">Kategori</string>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 276550210..93cec1483 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">%1$ ატვირთვა ვერ მოხერხდა</string>
   <string name="upload_failed_notification_subtitle">დააჭირეთ სანახავად</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d ფაილი იტვირთება</item>
-    <item quantity="other">%d ფაილი იტვირთება</item>
+    <item quantity="one">%1$d ფაილი იტვირთება</item>
+    <item quantity="other">%1$d ფაილი იტვირთება</item>
   </plurals>
   <string name="title_activity_contributions">ჩემი ბოლო ატვირთვები</string>
   <string name="contribution_state_queued">რიგი</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">ატვირთვები არ არის</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d ატვირთვა</item>
-    <item quantity="other">%d ატვირთვა</item>
+    <item quantity="one">%1$d ატვირთვა</item>
+    <item quantity="other">%1$d ატვირთვა</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">იწყება %d ატვირთვა</item>
-    <item quantity="other">იწყება %d ატვირთვა</item>
+    <item quantity="one">იწყება %1$d ატვირთვა</item>
+    <item quantity="other">იწყება %1$d ატვირთვა</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d ატვირთვა</item>
-    <item quantity="other">%d ატვირთვა</item>
+    <item quantity="one">%1$d ატვირთვა</item>
+    <item quantity="other">%1$d ატვირთვა</item>
   </plurals>
   <string name="categories_activity_title">კატეგორია</string>
   <string name="title_activity_settings">კონფიგურაცია</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 87795b9c2..5c020e1d1 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Asali n  %1$s ur yeddi ara</string>
   <string name="upload_failed_notification_subtitle">Senned akken ad sekneḍ</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d n ufaylu yezga yettali</item>
-    <item quantity="other">%d n ifuyla zgan ttalin</item>
+    <item quantity="one">%1$d n ufaylu yezga yettali</item>
+    <item quantity="other">%1$d n ifuyla zgan ttalin</item>
   </plurals>
   <string name="title_activity_contributions">Ifuyla yulin melmi kan</string>
   <string name="contribution_state_queued">Ttraǧun</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Usla ayen yulin</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d n usali</item>
-    <item quantity="other">%d n usali</item>
+    <item quantity="one">%1$d n usali</item>
+    <item quantity="other">%1$d n usali</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Beddu n %d n usali</item>
-    <item quantity="other">Beddu n %d n usali</item>
+    <item quantity="one">Beddu n %1$d n usali</item>
+    <item quantity="other">Beddu n %1$d n usali</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d n usali</item>
-    <item quantity="other">%d n usali</item>
+    <item quantity="one">%1$d n usali</item>
+    <item quantity="other">%1$d n usali</item>
   </plurals>
   <string name="categories_not_found">Ulac taggayin imenṭaḍen akked %1$s i yettwafen</string>
   <string name="categories_skip_explanation">Rnu taggayin akken ad terreḍ tugniwin-ik sehlent i tifin di Wikimedia Commons.\n\nBdu timerna n taggayin.</string>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 48b531318..370026cd4 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -21,8 +21,8 @@
   <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">%d ಕಡತ ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item>
-    <item quantity="other">%d ಕಡತಗಳು ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item>
+    <item quantity="one">%1$d ಕಡತ ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item>
+    <item quantity="other">%1$d ಕಡತಗಳು ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item>
   </plurals>
   <string name="title_activity_contributions">ನನ್ನ ಇತ್ತಿಚಿನ ಅಪ್ಲೋಡ್ಗಳು</string>
   <string name="contribution_state_queued">ಸರತಿಸಾಲಿನಲ್ಲಿದೆ</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 829b07aa9..0ec4d9350 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -21,8 +21,8 @@
   <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">%d개의 파일을 올리는 중</item>
-    <item quantity="other">%d개의 파일을 올리는 중</item>
+    <item quantity="one">%1$d개의 파일을 올리는 중</item>
+    <item quantity="other">%1$d개의 파일을 올리는 중</item>
   </plurals>
   <string name="title_activity_contributions">내 최근 업로드</string>
   <string name="contribution_state_queued">대기 중</string>
@@ -57,14 +57,14 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
     <item quantity="one">1개 업로드</item>
-    <item quantity="other">%d개 업로드</item>
+    <item quantity="other">%1$d개 업로드</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d장의 업로드를 시작합니다</item>
-    <item quantity="other">%d장의 업로드를 시작합니다</item>
+    <item quantity="one">%1$d장의 업로드를 시작합니다</item>
+    <item quantity="other">%1$d장의 업로드를 시작합니다</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d개 업로드</item>
+    <item quantity="one">%1$d개 업로드</item>
   </plurals>
   <string name="categories_not_found">%1$s와(과) 일치하는 분류를 찾을 수 없습니다</string>
   <string name="categories_skip_explanation">위키미디어 공용에서 그림을 더 찾기 쉽게 만들기 위해 분류를 추가합니다.\n분류를 추가하려면 입력을 시작하세요.</string>
diff --git a/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml
index 5dcb02a77..517570895 100644
--- a/app/src/main/res/values-ky/strings.xml
+++ b/app/src/main/res/values-ky/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_failed_notification_subtitle">Көрүү үчүн басыңыз</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">1 файл жүктөлүүдө</item>
-    <item quantity="other">%d файл жүктөлүүдө</item>
+    <item quantity="other">%1$d файл жүктөлүүдө</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">Менин жүктөөлөрүм</string>
   <string name="contribution_state_queued">Кезек</string>
@@ -49,15 +49,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Азырынча жүктөөлөр жок</item>
     <item quantity="one">1 жүктөө</item>
-    <item quantity="other">%d жүктөө</item>
+    <item quantity="other">%1$d жүктөө</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">1 жүктөө башталды</item>
-    <item quantity="other">%d жүктөө башталды</item>
+    <item quantity="other">%1$d жүктөө башталды</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 жүктөө</item>
-    <item quantity="other">%d жүктөө</item>
+    <item quantity="other">%1$d жүктөө</item>
   </plurals>
   <string name="categories_not_found">%1$s түрмөктөрү табылган жок</string>
   <string name="categories_skip_explanation" fuzzy="true">Уикиказынада Сиздин сүрөттөрдү жеңил табуу үчүн түрмөктөрдү кошуңуз.\n\nТүрмөктөрдү жазууну баштаңыз.\nБул кадамды аттап өтүү үчүн, бул билдирүүнү (же кийинкини) басыңыз.</string>
diff --git a/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml
index 734841765..72a8e2f3e 100644
--- a/app/src/main/res/values-lb/strings.xml
+++ b/app/src/main/res/values-lb/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Dréckt fir nach eng Kéier ze probéieren</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">ee Fichier eroplueden</item>
-    <item quantity="other">%d Fichieren eroplueden</item>
+    <item quantity="other">%1$d Fichieren eroplueden</item>
   </plurals>
   <string name="title_activity_contributions">Meng rezent eropgeluede Fichieren</string>
   <string name="contribution_state_queued">An der Queue</string>
@@ -56,15 +56,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">N@string/contributions_subtitle_zero</item>
     <item quantity="one">1 Fichier eropgelueden</item>
-    <item quantity="other">%d Fichieren eropgelueden</item>
+    <item quantity="other">%1$d Fichieren eropgelueden</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Ugefaang 1 Fichier eropzelueden</item>
-    <item quantity="other">Ugefaang %d Fichieren eropzelueden</item>
+    <item quantity="other">Ugefaang %1$d Fichieren eropzelueden</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">1 Fichier eropgelueden</item>
-    <item quantity="other">%d Fichieren eropgelueden</item>
+    <item quantity="other">%1$d Fichieren eropgelueden</item>
   </plurals>
   <string name="categories_not_found">D\'Kategorie %1$s gouf net fonnt</string>
   <string name="categories_skip_explanation">Setzt Kategorien dobäi fir datt Är Biller méi einfach op Wikimedia Commons ze fanne sinn.\n\nFänkt u mat Tippe fir Kategorien dobäizesetzen.</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index ed9bcec38..effd5481e 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Įkelti %1$s nepavyko</string>
   <string name="upload_failed_notification_subtitle">Bakstelėkite norėdami Rodyti</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d keliamas failas</item>
-    <item quantity="other">%d keliamų failų</item>
+    <item quantity="one">%1$d keliamas failas</item>
+    <item quantity="other">%1$d keliamų failų</item>
   </plurals>
   <string name="title_activity_contributions">Naujausi mano įkėlimai</string>
   <string name="contribution_state_queued">Eilėje</string>
@@ -56,15 +56,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Dar nėra įkėlimų</item>
     <item quantity="one">1 įkėlimas</item>
-    <item quantity="other">%d įkėlimai</item>
+    <item quantity="other">%1$d įkėlimai</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Pradedamas %d įkėlimas</item>
-    <item quantity="other">Pradedami %d įkėlimai</item>
+    <item quantity="one">Pradedamas %1$d įkėlimas</item>
+    <item quantity="other">Pradedami %1$d įkėlimai</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d įkėlimas</item>
-    <item quantity="other">%d įkėlimai</item>
+    <item quantity="one">%1$d įkėlimas</item>
+    <item quantity="other">%1$d įkėlimai</item>
   </plurals>
   <string name="categories_not_found">Nerasta kategorijų, atitinkančiu %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Pridėkite kategorijas, kad jūsų paveikslėliai būtų lengviau randami Vikimedija Commons.\n -\n -Pradėkite rašyti, kad pridėtumėte kategorijas.</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 3633e5169..62a0cd95b 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -21,8 +21,8 @@
   <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">Се подига %d податотека</item>
-    <item quantity="other">Се подигаат %d податотеки</item>
+    <item quantity="one">Се подига %1$d податотека</item>
+    <item quantity="other">Се подигаат %1$d податотеки</item>
   </plurals>
   <string name="title_activity_contributions">Мои скорешни подигања</string>
   <string name="contribution_state_queued">Чека ред</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Сè уште нема подигања</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d подигање</item>
-    <item quantity="other">%d подигања</item>
+    <item quantity="one">%1$d подигање</item>
+    <item quantity="other">%1$d подигања</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Започнувам %d подигање</item>
-    <item quantity="other">Започнувам %d подигања</item>
+    <item quantity="one">Започнувам %1$d подигање</item>
+    <item quantity="other">Започнувам %1$d подигања</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d подигање</item>
-    <item quantity="other">%d подигања</item>
+    <item quantity="one">%1$d подигање</item>
+    <item quantity="other">%1$d подигања</item>
   </plurals>
   <string name="categories_not_found">Нема категории што одговараат на %1$s</string>
   <string name="categories_skip_explanation">Ставете им категории на сликите, за да можат корисниците полесно да ги најдат на Ризницата.\n\nЗа да ставите категорија, почнете со пишување на нејзиното име.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Се бара дозвола за приказ на список на околни места</string>
   <string name="get_directions">ДАЈ НАСОКИ</string>
   <string name="read_article">ПРОЧИТАЈ СТАТИЈА</string>
-  <string name="notifications_welcome">Добре дојдовте на Ризницата, %s! Драго ни е што сте тука.</string>
-  <string name="notifications_talk_page_message">%s ви остави порака на разговорната страница</string>
+  <string name="notifications_welcome">Добре дојдовте на Ризницата, %1$s! Драго ни е што сте тука.</string>
+  <string name="notifications_talk_page_message">%1$s ви остави порака на разговорната страница</string>
   <string name="notifications_thank_you_edit">Ви благодариме за уредувањето</string>
-  <string name="notifications_mention">%s ве спомна на %s.</string>
+  <string name="notifications_mention">%1$s ве спомна на %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index a5248015a..fe59034e2 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_failed_notification_subtitle">കാണാനായി ടാപ് ചെയ്യുക</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">1 പ്രമാണം അപ്‌ലോഡ് ചെയ്യുന്നു</item>
-    <item quantity="other">%d പ്രമാണങ്ങൾ അപ്‌ലോഡ് ചെയ്യുന്നു</item>
+    <item quantity="other">%1$d പ്രമാണങ്ങൾ അപ്‌ലോഡ് ചെയ്യുന്നു</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">എന്റെ അപ്‌ലോഡുകൾ</string>
   <string name="contribution_state_queued">നിരയായി വെച്ചു</string>
@@ -49,15 +49,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">ഒരു അപ്‌ലോഡും ചെയ്തില്ല</item>
     <item quantity="one">ഒരു അപ്‌ലോഡ്</item>
-    <item quantity="other">%d അപ്‌ലോഡുകൾ</item>
+    <item quantity="other">%1$d അപ്‌ലോഡുകൾ</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">ഒരു അപ്‌ലോഡ് തുടങ്ങുന്നു</item>
-    <item quantity="other">%d അപ്‌ലോഡുകൾ തുടങ്ങുന്നു</item>
+    <item quantity="other">%1$d അപ്‌ലോഡുകൾ തുടങ്ങുന്നു</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">ഒരു അപ്‌ലോഡ്</item>
-    <item quantity="other">%d അപ്‌ലോഡുകൾ</item>
+    <item quantity="other">%1$d അപ്‌ലോഡുകൾ</item>
   </plurals>
   <string name="categories_not_found">%1$s എന്നതുമായി പൊരുത്തമുള്ള ഒരു വർഗ്ഗവും കണ്ടെത്താനായില്ല</string>
   <string name="categories_skip_explanation" fuzzy="true">താങ്കളുടെ ചിത്രങ്ങൾ വിക്കിമീഡിയ കോമൺസിൽ കൂടുതൽ എളുപ്പത്തിൽ കണ്ടെത്തപ്പെടാനായി വർഗ്ഗങ്ങൾ ചേർക്കുക.\n\nവർഗ്ഗങ്ങൾ ചേർക്കാനായി ടൈപ്പ് ചെയ്ത് തുടങ്ങുക.\nഈ ഘട്ടം ഒഴിവാക്കാൻ ടാപ് ചെയ്യുക (അല്ലെങ്കിൽ പിന്നോട്ട് പോവുക).</string>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 9a766f31a..f7f65ef00 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">बघण्यास अलगद टपली मारा</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">१ संचिका अपभारीत आहे</item>
-    <item quantity="other">%d संचिका अपभारीत आहे</item>
+    <item quantity="other">%1$d संचिका अपभारीत आहे</item>
   </plurals>
   <string name="title_activity_contributions">माझी अपभारणे</string>
   <string name="contribution_state_queued">प्रतिक्षावलीत ठेवले</string>
@@ -53,15 +53,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">अद्याप अपभारणे नाहीत</item>
     <item quantity="one">एक अपभारण</item>
-    <item quantity="other">%d अपभारणे</item>
+    <item quantity="other">%1$d अपभारणे</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">१ अपभारण सुरू करीत आहे upload</item>
-    <item quantity="other">%d अपभारणे सुरू करीत आहे</item>
+    <item quantity="other">%1$d अपभारणे सुरू करीत आहे</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">१ अपभारण</item>
-    <item quantity="other">%d अपभारणे</item>
+    <item quantity="other">%1$d अपभारणे</item>
   </plurals>
   <string name="categories_not_found">%1$s शी जुळणारे कोणतेच वर्ग सापडले नाहीत</string>
   <string name="categories_skip_explanation" fuzzy="true">विकिमिडिया कॉमन्सवर आपल्या संचिकांना शोधणे सोपी जाण्यासाठी त्यांना वर्ग जोडा.\n\nवर्ग जोडण्यास टंकन सुरू करा.\nही पायरी चुकविण्यास या संदेशावर अलगद टिचका (किंवा बॅक कळ टिचका)</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 5fb921843..51c3173be 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -45,13 +45,13 @@
   <string name="menu_save_categories">Simpan</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">Belum ada muatnaik</item>
-    <item quantity="one">%d muatnaik</item>
-    <item quantity="other">%d muatnaik</item>
+    <item quantity="one">%1$d muatnaik</item>
+    <item quantity="other">%1$d muatnaik</item>
   </plurals>
   <string name="starting_multiple_uploads" fuzzy="true">Memulakan %d kerja muat naik</string>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d muatnaik</item>
-    <item quantity="other">%d muatnaik</item>
+    <item quantity="one">%1$d muatnaik</item>
+    <item quantity="other">%1$d muatnaik</item>
   </plurals>
   <string name="categories_not_found">Tiada kategori yang sepadan dengan %1$s dijumpai</string>
   <string name="categories_skip_explanation" fuzzy="true">Tambahkan kategori supaya gambar-gambar anda lebih senang ditemui di Wikimedia Commons.\n\nMula menaip untuk menambahkan kategori.\nKetik mesej ini (atau tekan butang undur) untuk melangkau langkah ini.</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index a0f8eb05a..a19633499 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Opplastingen av %1$s feilet</string>
   <string name="upload_failed_notification_subtitle">Trykk for å vise</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fil lastes opp</item>
-    <item quantity="other">%d filer lastes opp</item>
+    <item quantity="one">%1$d fil lastes opp</item>
+    <item quantity="other">%1$d filer lastes opp</item>
   </plurals>
   <string name="title_activity_contributions">Mine nylige opplastinger</string>
   <string name="contribution_state_queued">I ventekø</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Ingen opplastinger ennå</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d opplasting</item>
-    <item quantity="other">%d opplastinger</item>
+    <item quantity="one">%1$d opplasting</item>
+    <item quantity="other">%1$d opplastinger</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Starter %d opplasting</item>
-    <item quantity="other">Starter %d opplastinger</item>
+    <item quantity="one">Starter %1$d opplasting</item>
+    <item quantity="other">Starter %1$d opplastinger</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d opplasting</item>
-    <item quantity="other">%d opplastinger</item>
+    <item quantity="one">%1$d opplasting</item>
+    <item quantity="other">%1$d opplastinger</item>
   </plurals>
   <string name="categories_not_found">Ingen kategorier som stemte overens med %1$s funnet</string>
   <string name="categories_skip_explanation">Legg til kategorier for å gjøre bildene dine lettere å finne på Wikimedia Commons.\n\nBegynn å skrive navnet på kategoriene.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 23314b38f..69c35cada 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Het uploaden van %1$s is mislukt</string>
   <string name="upload_failed_notification_subtitle">Wijs aan om te bekijken</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
-    <item quantity="one">%d bestand aan het uploaden</item>
-    <item quantity="other">%d bestanden aan het uploaden</item>
+    <item quantity="one">%1$d bestand aan het uploaden</item>
+    <item quantity="other">%1$d bestanden aan het uploaden</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">Mijn uploads</string>
   <string name="contribution_state_queued">In wachtrij</string>
@@ -54,15 +54,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Nog geen uploads</item>
     <item quantity="one">1 upload</item>
-    <item quantity="other">%d uploads</item>
+    <item quantity="other">%1$d uploads</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">Bezig met 1 upload</item>
-    <item quantity="other">Bezig met %d uploads</item>
+    <item quantity="other">Bezig met %1$d uploads</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 upload</item>
-    <item quantity="other">%d uploads</item>
+    <item quantity="other">%1$d uploads</item>
   </plurals>
   <string name="categories_not_found">Er zijn geen categorieën met \"%1$s\" gevonden</string>
   <string name="categories_skip_explanation" fuzzy="true">Voeg categorieën toe om uw afbeeldingen makkelijker te vinden te maken op Wikimedia Commons.\n\nBegin met het toevoegen van categorieën.\n\nKlik op dit bericht, of ga terug, om deze stap over te slaan.</string>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index c3783f760..f8aff4100 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Telecargament fracassat a %1$s</string>
   <string name="upload_failed_notification_subtitle">Quichar per afichar</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fichièr en cors de cargament</item>
-    <item quantity="other">%d fichièrs en cors de cargament</item>
+    <item quantity="one">%1$d fichièr en cors de cargament</item>
+    <item quantity="other">%1$d fichièrs en cors de cargament</item>
   </plurals>
   <string name="title_activity_contributions">Mos darrièrs cargaments</string>
   <string name="contribution_state_queued">Mes en fila d\'espèra</string>
@@ -52,16 +52,16 @@
   <string name="refresh_button">Refrescar</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d cargament</item>
-    <item quantity="other">%d cargaments</item>
+    <item quantity="one">%1$d cargament</item>
+    <item quantity="other">%1$d cargaments</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d cargament aviat</item>
-    <item quantity="other">%d cargaments aviats</item>
+    <item quantity="one">%1$d cargament aviat</item>
+    <item quantity="other">%1$d cargaments aviats</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d cargament</item>
-    <item quantity="other">%d cargaments</item>
+    <item quantity="one">%1$d cargament</item>
+    <item quantity="other">%1$d cargaments</item>
   </plurals>
   <string name="categories_not_found">Cap de categoria que correspond a %1$s pas trobada</string>
   <string name="categories_activity_title">Categorias</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 4d74c2cd6..a0d00bc5a 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -21,7 +21,7 @@
   <string name="upload_failed_notification_subtitle">ਵੇਖਣ ਲਈ ਥਪੇੜੋ</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">੧ ਫ਼ਾਈਲ ਚੜ੍ਹਾਈ ਜਾ ਰਹੀ ਹੈ</item>
-    <item quantity="other">%d ਫ਼ਾਈਲਾਂ ਚੜ੍ਹਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ</item>
+    <item quantity="other">%1$d ਫ਼ਾਈਲਾਂ ਚੜ੍ਹਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">ਮੇਰੇ ਅੱਪਲੋਡ</string>
   <string name="contribution_state_queued">ਕਤਾਰ ਵਿਚ</string>
@@ -54,16 +54,16 @@
   <string name="contributions_subtitle_zero">ਫ਼ਿਲਹਾਲ ਕੋਈ ਅੱਪਲੋਡ ਨਹੀਂ</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d upload</item>
-    <item quantity="other">%d ਅੱਪਲੋਡ</item>
+    <item quantity="one">%1$d upload</item>
+    <item quantity="other">%1$d ਅੱਪਲੋਡ</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d ਅੱਪਲੋਡ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ</item>
-    <item quantity="other">%d ਸ਼ੁਰੂ ਹੋ ਰਹੇ ਹਨ</item>
+    <item quantity="one">%1$d ਅੱਪਲੋਡ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ</item>
+    <item quantity="other">%1$d ਸ਼ੁਰੂ ਹੋ ਰਹੇ ਹਨ</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">&amp;d ਅੱਪਲੋਡ</item>
-    <item quantity="other">%d ਅੱਪਲੋਡਾਂ</item>
+    <item quantity="other">%1$d ਅੱਪਲੋਡਾਂ</item>
   </plurals>
   <string name="categories_not_found">%1$s ਨਾਲ਼ ਮੇਲ ਖਾਂਦੀ ਕੋਈ ਸ਼੍ਰੇਣੀ ਨਹੀਂ ਲੱਭੀ</string>
   <string name="categories_skip_explanation" fuzzy="true">ਆਪਣੀਆਂ ਤਸਵੀਰਾਂ ਨੂੰ ਵਿਕੀਮੀਡੀਆ ਕਾਮਨਜ਼ ਵਿਚ ਜ਼ਿਆਦਾ ਲੱਭਣਯੋਗ ਬਣਾਉਣ ਲਈ ਸ਼੍ਰੇਣੀਆਂ ਜੋੜੋ।\n\nਸ਼੍ਰੇਣੀਆਂ ਜੋੜਨ ਲਈ ਟਾਈਪ ਕਰਨ ਅਰੰਭ ਕਰੋ।\nਇਸ ਕਾਰਜ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਨ ਲਈ ਇਹ ਸੁਨੇਹਾ ਥਪੇੜੋ (ਜਾਂ ਵਾਪਸੀ ਬਟਨ ਦਬਾਓ)।</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index be7f6c752..78f82b7ef 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Wysyłanie %1$s nieudane</string>
   <string name="upload_failed_notification_subtitle">Dotknij, aby zobaczyć</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">Przesyłanie %d pliku</item>
-    <item quantity="other">Przesyłanie %d plików</item>
+    <item quantity="one">Przesyłanie %1$d pliku</item>
+    <item quantity="other">Przesyłanie %1$d plików</item>
   </plurals>
   <string name="title_activity_contributions">Niedawno przesłane</string>
   <string name="contribution_state_queued">W kolejce</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Na razie brak przesłanych plików!</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">Przesłano @string/contributions_subtitle_zero</item>
-    <item quantity="one">Przesłano %d plik</item>
-    <item quantity="other">Przesłano %d pliki</item>
+    <item quantity="one">Przesłano %1$d plik</item>
+    <item quantity="other">Przesłano %1$d pliki</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Rozpoczęto %d przesyłanie</item>
-    <item quantity="other">Rozpoczęto %d przesyłania</item>
+    <item quantity="one">Rozpoczęto %1$d przesyłanie</item>
+    <item quantity="other">Rozpoczęto %1$d przesyłania</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d przesłanie</item>
-    <item quantity="other">%d przesłania</item>
+    <item quantity="one">%1$d przesłanie</item>
+    <item quantity="other">%1$d przesłania</item>
   </plurals>
   <string name="categories_not_found">Nie znaleziono kategorii pasujących do %1$s</string>
   <string name="categories_skip_explanation">Dodaj kategorie, aby ułatwić odnalezienie plików w Wikimedia Commons.\nZacznij pisać, aby dodać kategorie.</string>
@@ -183,5 +183,5 @@
   <string name="nearby_info_menu_wikidata_article">Element Wikidanych</string>
   <string name="title_info">Podaj krótką, opisową i unikalną nazwę, która będzie służyła jako nazwa pliku. Możesz używać prostego języka i spacji. Nie dodawaj rozszerzenia pliku.</string>
   <string name="login_to_your_account">Zaloguj się na swoje konto</string>
-  <string name="notifications_welcome">Witamy w Wikimedia Commons, %s! Cieszymy się, że tu jesteś.</string>
+  <string name="notifications_welcome">Witamy w Wikimedia Commons, %1$s! Cieszymy się, że tu jesteś.</string>
 </resources>
diff --git a/app/src/main/res/values-pms/strings.xml b/app/src/main/res/values-pms/strings.xml
index 5d627dea4..14176d509 100644
--- a/app/src/main/res/values-pms/strings.xml
+++ b/app/src/main/res/values-pms/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Cariament falì a %1$s</string>
   <string name="upload_failed_notification_subtitle">Sgnaché për ësmon-e</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d archivi an camin ch\'as caria</item>
-    <item quantity="other">%d archivi an camin ch\'as cario</item>
+    <item quantity="one">%1$d archivi an camin ch\'as caria</item>
+    <item quantity="other">%1$d archivi an camin ch\'as cario</item>
   </plurals>
   <string name="title_activity_contributions">Ij mè cariament recent</string>
   <string name="contribution_state_queued">An coa</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Ancor gnun cariament</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d cariament</item>
-    <item quantity="other">%d cariament</item>
+    <item quantity="one">%1$d cariament</item>
+    <item quantity="other">%1$d cariament</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d cariament ancaminà</item>
-    <item quantity="other">%d cariament ancaminà</item>
+    <item quantity="one">%1$d cariament ancaminà</item>
+    <item quantity="other">%1$d cariament ancaminà</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d cariament</item>
-    <item quantity="other">%d cariament</item>
+    <item quantity="one">%1$d cariament</item>
+    <item quantity="other">%1$d cariament</item>
   </plurals>
   <string name="categories_not_found">Gnun-e categorìe rëspondente a %1$s trovà</string>
   <string name="categories_skip_explanation">Ch\'a gionta dle categorìe, për ch\'a sia pi belfé trové soe plance su Wikimedia Commons.\nCh\'a ancamin-a a scrive për gionté dle categorìe.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">A-i é da manca dël përmess pr\'ësmon-e na lista dij pòst davzin</string>
   <string name="get_directions">OTEN-E D\'ANSTRUSSION</string>
   <string name="read_article">LESE L\'ARTÌCOL</string>
-  <string name="notifications_welcome">Bin-ëvnù an Wikimedia Commons, %s! I soma content ëd vëdd-lo sì.</string>
-  <string name="notifications_talk_page_message">%s a l\'ha lassà un mëssagi su soa pàgina ëd ciaciarade</string>
+  <string name="notifications_welcome">Bin-ëvnù an Wikimedia Commons, %1$s! I soma content ëd vëdd-lo sì.</string>
+  <string name="notifications_talk_page_message">%1$s a l\'ha lassà un mëssagi su soa pàgina ëd ciaciarade</string>
   <string name="notifications_thank_you_edit">Mersì d\'avèj fàit na modìfica</string>
-  <string name="notifications_mention">%s a l\'ha massionalo su %s .</string>
+  <string name="notifications_mention">%1$s a l\'ha massionalo su %2$s .</string>
 </resources>
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 800bb79ba..77bbec1cd 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -34,7 +34,7 @@
   <string name="refresh_button">بياتازه کول</string>
   <plurals name="multiple_uploads_title">
     <item quantity="one">1 پورته کول</item>
-    <item quantity="other">%d پورته کول</item>
+    <item quantity="other">%1$d پورته کول</item>
   </plurals>
   <string name="categories_activity_title">وېشنيزې</string>
   <string name="title_activity_settings">امستنې</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a2c679c3c..96d8cc53f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Toque para ver</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">carregando arquivo</item>
-    <item quantity="other">carregando %d arquivos</item>
+    <item quantity="other">carregando %1$d arquivos</item>
   </plurals>
   <string name="title_activity_contributions">Meus envios recentes</string>
   <string name="contribution_state_queued">Na fila</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Ainda não carregado</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d envio</item>
-    <item quantity="other">%d envios</item>
+    <item quantity="one">%1$d envio</item>
+    <item quantity="other">%1$d envios</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Iniciando 1 carregamento</item>
-    <item quantity="other">Iniciando %d carregamentos</item>
+    <item quantity="other">Iniciando %1$d carregamentos</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">1 carregamento</item>
-    <item quantity="other">%d carregamentos</item>
+    <item quantity="other">%1$d carregamentos</item>
   </plurals>
   <string name="categories_not_found">Nenhuma categoria correspondente %1$s encontrada</string>
   <string name="categories_skip_explanation">Adicione categorias para fazer suas imagens mais vistas no Wikimedia Commons. \n\nComece a digitar para adicionar categorias.\nAperte nesta mensagem (ou aperte para voltar) para pular este passo</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Permissão necessária para exibir uma lista de locais próximos</string>
   <string name="get_directions">OBTER DIREÇÕES</string>
   <string name="read_article">LER ARTIGO</string>
-  <string name="notifications_welcome">Bem-vindo ao Wikimedia Commons, %s! É um prazer tê-lo aqui.</string>
-  <string name="notifications_talk_page_message">%s deixou uma mensagem na sua página de discussão</string>
+  <string name="notifications_welcome">Bem-vindo ao Wikimedia Commons, %1$s! É um prazer tê-lo aqui.</string>
+  <string name="notifications_talk_page_message">%1$s deixou uma mensagem na sua página de discussão</string>
   <string name="notifications_thank_you_edit">Obrigado por ter realizado uma edição</string>
-  <string name="notifications_mention">%s fez menção a você em %s.</string>
+  <string name="notifications_mention">%1$s fez menção a você em %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a3ac9c1d5..f9b7735da 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">O carregamento de %1$s falhou</string>
   <string name="upload_failed_notification_subtitle">Toque para ver</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d a carregar um ficheiro</item>
-    <item quantity="other">a carregar %d ficheiros</item>
+    <item quantity="one">%1$d a carregar um ficheiro</item>
+    <item quantity="other">a carregar %1$d ficheiros</item>
   </plurals>
   <string name="title_activity_contributions">Meus carregamentos recentes</string>
   <string name="contribution_state_queued">Em espera</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Ainda não foram enviados ficheiros</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d carregamento</item>
-    <item quantity="other">%d carregamentos</item>
+    <item quantity="one">%1$d carregamento</item>
+    <item quantity="other">%1$d carregamentos</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">A iniciar %d carregamento</item>
-    <item quantity="other">A iniciar %d carregamentos</item>
+    <item quantity="one">A iniciar %1$d carregamento</item>
+    <item quantity="other">A iniciar %1$d carregamentos</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d carregamento</item>
-    <item quantity="other">%d carregamentos</item>
+    <item quantity="one">%1$d carregamento</item>
+    <item quantity="other">%1$d carregamentos</item>
   </plurals>
   <string name="categories_not_found">Nenhuma categoria correspondente %1$s encontrada</string>
   <string name="categories_skip_explanation">Adicione categorias para tornar as suas imagens mais fáceis de encontrar no Wikimedia Commons.\nComece a digitar para adicionar categorias.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">É necessária a permissão para mostrar uma lista dos sítios aqui perto</string>
   <string name="get_directions">OBTER DIREÇÕES</string>
   <string name="read_article">LER ARTIGO</string>
-  <string name="notifications_welcome">Bem-vindo ao Wikimedia Commons, %s! É um prazer tê-lo aqui.</string>
-  <string name="notifications_talk_page_message">%s deixou uma mensagem na sua página de discussão</string>
+  <string name="notifications_welcome">Bem-vindo ao Wikimedia Commons, %1$s! É um prazer tê-lo aqui.</string>
+  <string name="notifications_talk_page_message">%1$s deixou uma mensagem na sua página de discussão</string>
   <string name="notifications_thank_you_edit">Obrigado por ter realizado uma edição</string>
-  <string name="notifications_mention">%s fez menção a si em %s.</string>
+  <string name="notifications_mention">%1$s fez menção a si em %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml
index 1c92111cb..3f2035941 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -20,8 +20,8 @@
   <string name="upload_failed_notification_title">Title for notification about upload failing. %1$s represents file name</string>
   <string name="upload_failed_notification_subtitle">Text for notification about upload being completed.</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">Status text about number of uploads left.\n* %d represents number of uploads left, including current one\n</item>
-    <item quantity="other">Status text about number of uploads left.\n* %d represents number of uploads left, including current one\n</item>
+    <item quantity="one">Status text about number of uploads left.\n* %1$d represents number of uploads left, including current one\n</item>
+    <item quantity="other">Status text about number of uploads left.\n* %1$d represents number of uploads left, including current one\n</item>
   </plurals>
   <string name="title_activity_contributions">Title for screen showing my contributions.</string>
   <string name="contribution_state_queued">Show status of upload as currently queued.\n{{Identical|Queue}}</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index cea885296..9b5574407 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -22,8 +22,8 @@
   <string name="upload_failed_notification_subtitle">Atingeți pentru a vizualiza</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">1 fișier se încarcă</item>
-    <item quantity="few">%d fișiere se încarcă</item>
-    <item quantity="other">%d de fișiere se încarcă</item>
+    <item quantity="few">%1$d fișiere se încarcă</item>
+    <item quantity="other">%1$d de fișiere se încarcă</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">Încărcările mele</string>
   <string name="contribution_state_queued">În așteptare</string>
@@ -52,19 +52,19 @@
   <string name="menu_save_categories">Salvare</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d încărcare</item>
-    <item quantity="few">%d încărcări</item>
-    <item quantity="other">%d de încărcări</item>
+    <item quantity="one">%1$d încărcare</item>
+    <item quantity="few">%1$d încărcări</item>
+    <item quantity="other">%1$d de încărcări</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Se pornește 1 încărcare</item>
-    <item quantity="few">Se pornesc %d încărcări</item>
-    <item quantity="other">Se pornesc %d de încărcări</item>
+    <item quantity="few">Se pornesc %1$d încărcări</item>
+    <item quantity="other">Se pornesc %1$d de încărcări</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">1 încărcare</item>
-    <item quantity="few">%d încărcări</item>
-    <item quantity="other">%d de încărcări</item>
+    <item quantity="few">%1$d încărcări</item>
+    <item quantity="other">%1$d de încărcări</item>
   </plurals>
   <string name="categories_not_found">Nu s-a găsit nicio categorie corespunzătoare cu %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Adăugați categorii pentru a facilita găsirea imaginilor dumneavoastră la Wikimedia Commons.\n\nÎncepeți să tastați pentru a adăuga categorii.\nAtingeți acest mesaj (sau mergeți înapoi) pentru a omite acest pas.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 387090d7f..ff0572123 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -21,9 +21,9 @@
   <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">%d файл загружается</item>
-    <item quantity="few">%d файла загружается</item>
-    <item quantity="other">%d файлов загружается</item>
+    <item quantity="one">%1$d файл загружается</item>
+    <item quantity="few">%1$d файла загружается</item>
+    <item quantity="other">%1$d файлов загружается</item>
   </plurals>
   <string name="title_activity_contributions">Мои недавние загрузки</string>
   <string name="contribution_state_queued">В очереди</string>
@@ -57,19 +57,19 @@
   <string name="contributions_subtitle_zero">Загрузок пока нет</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d загрузка</item>
-    <item quantity="few">%d загрузки</item>
-    <item quantity="other">%d загрузок</item>
+    <item quantity="one">%1$d загрузка</item>
+    <item quantity="few">%1$d загрузки</item>
+    <item quantity="other">%1$d загрузок</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Начинается %d загрузка</item>
-    <item quantity="few">Начинается %d загрузки</item>
-    <item quantity="other">Начинается %d загрузок</item>
+    <item quantity="one">Начинается %1$d загрузка</item>
+    <item quantity="few">Начинается %1$d загрузки</item>
+    <item quantity="other">Начинается %1$d загрузок</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d загрузка</item>
-    <item quantity="few">%d загрузки</item>
-    <item quantity="other">%d загрузок</item>
+    <item quantity="one">%1$d загрузка</item>
+    <item quantity="few">%1$d загрузки</item>
+    <item quantity="other">%1$d загрузок</item>
   </plurals>
   <string name="categories_not_found">Категории, соответствующие %1$s, не найдены</string>
   <string name="categories_skip_explanation">Добавьте категории, чтобы ваши изображения можно было легко найти на Викискладе.\nНачните вводить название для добавления категорий.</string>
@@ -214,8 +214,8 @@
   <string name="location_permission_rationale_nearby">Необходимо разрешение для отображения списка мест поблизости</string>
   <string name="get_directions">Показать на карте во внешней программе</string>
   <string name="read_article">ЧИТАТЬ СТАТЬЮ</string>
-  <string name="notifications_welcome">Добро пожаловать в Wikimedia Commons, %s! Рады вас здесь видеть :-)</string>
-  <string name="notifications_talk_page_message">%s оставил сообщение на вашей странице обсуждения</string>
+  <string name="notifications_welcome">Добро пожаловать в Wikimedia Commons, %1$s! Рады вас здесь видеть :-)</string>
+  <string name="notifications_talk_page_message">%1$s оставил сообщение на вашей странице обсуждения</string>
   <string name="notifications_thank_you_edit">Спасибо за правку</string>
-  <string name="notifications_mention">%s упомянул вас на %s.</string>
+  <string name="notifications_mention">%1$s упомянул вас на %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-sd/strings.xml b/app/src/main/res/values-sd/strings.xml
index 93cc55e57..a0fad94af 100644
--- a/app/src/main/res/values-sd/strings.xml
+++ b/app/src/main/res/values-sd/strings.xml
@@ -21,8 +21,8 @@
   <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">%d فائيل چاڙھيندي</item>
-    <item quantity="other">%d فائيلَ چاڙھيندي</item>
+    <item quantity="one">%1$d فائيل چاڙھيندي</item>
+    <item quantity="other">%1$d فائيلَ چاڙھيندي</item>
   </plurals>
   <string name="title_activity_contributions">منھنجا تازا چاڙھ</string>
   <string name="contribution_state_queued">قطار ۾</string>
@@ -54,16 +54,16 @@
   <string name="contributions_subtitle_zero">اڃان تائين ڪو به ڄاڙهه (اَپلوڊ) نه ٿيو آهي</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d چاڙھ</item>
-    <item quantity="other">%d چاڙھَ</item>
+    <item quantity="one">%1$d چاڙھ</item>
+    <item quantity="other">%1$d چاڙھَ</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">چاڙھ %d شروع ڪندي</item>
-    <item quantity="other">چاڙھَ %d شروع ڪندي</item>
+    <item quantity="one">چاڙھ %1$d شروع ڪندي</item>
+    <item quantity="other">چاڙھَ %d$1 شروع ڪندي</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d چاڙھ</item>
-    <item quantity="other">%d چاڙھَ</item>
+    <item quantity="one">%1$d چاڙھ</item>
+    <item quantity="other">%1$d چاڙھَ</item>
   </plurals>
   <string name="categories_not_found">%1$s سان ملندڙ ڪوبہ زمرو نہ لڌو</string>
   <string name="categories_skip_explanation">پنھنجي عڪسن ۾ زمرا وجھو تہ جيئن وڪيميڊيا العام تي وڌيڪ ڳولا لائق ٿي سگھن.\n\nزمرا وجھڻ لاءِ لکڻ شروع ڪريو.</string>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 7dddea647..79d9b0628 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -57,15 +57,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">තවමත් කිසිදු උඩුගත කිරීමක් නැත</item>
     <item quantity="one">එක් උඩුගත කිරීමක් ඇත</item>
-    <item quantity="other">උඩුගත කිරීම් %d ක් ඇත</item>
+    <item quantity="other">උඩුගත කිරීම් %1$d ක් ඇත</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">1 උඩුගත කිරීමක් ආරම්භ කරමින්</item>
-    <item quantity="other">උඩුගත කිරීම් %d ක් ආරම්භ කරමින්</item>
+    <item quantity="other">උඩුගත කිරීම් %1$d ක් ආරම්භ කරමින්</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">1 උඩුගත කිරීමක්</item>
-    <item quantity="other">උඩුගත කිරීම් %d ක්</item>
+    <item quantity="other">උඩුගත කිරීම් %1$d ක්</item>
   </plurals>
   <string name="categories_not_found">ප්‍රවර්ග සැසඳේන්නේ නැත %1$s හමුවිsය</string>
   <string name="categories_activity_title">ප්‍රවර්ග</string>
@@ -174,5 +174,5 @@
   <string name="nearby_location_not_available">ස්ථානය දී නොමැත</string>
   <string name="read_article">මෙමේ ලිපිය කියවන්න</string>
   <string name="notifications_welcome">විකිමීඩියා කොමන්ස් වෙත ඔබව සාදරයෙන් පිළිගනිමු! ඔබ මෙහි පැමිණීම ගැන අපි හද පත්ලෙන්ම සතුටු වෙමු.</string>
-  <string name="notifications_talk_page_message">ඔබගේ කතා පිටුවේ %s විසින් පණිවුඩයක් තබා ඇත</string>
+  <string name="notifications_talk_page_message">ඔබගේ කතා පිටුවේ %1$s විසින් පණිවුඩයක් තබා ඇත</string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index d42d3cadd..03d32467b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Nahrávanie %1$s zlyhalo</string>
   <string name="upload_failed_notification_subtitle">Kliknutím zobrazíte</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">nahráva sa %d súbor</item>
-    <item quantity="other">nahrávajú sa %d súbory</item>
+    <item quantity="one">nahráva sa %1$d súbor</item>
+    <item quantity="other">nahrávajú sa %1$d súbory</item>
   </plurals>
   <string name="title_activity_contributions">Moje nedávno nahrané</string>
   <string name="contribution_state_queued">Nahrávanie je v poradí</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 325256cbd..7fbb82260 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -21,8 +21,8 @@
   <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">%d датотека се отпрема</item>
-    <item quantity="other">%d датотеке се отпремају</item>
+    <item quantity="one">%1$d датотека се отпрема</item>
+    <item quantity="other">%1$d датотеке се отпремају</item>
   </plurals>
   <string name="title_activity_contributions">Моја скорашња отпремања</string>
   <string name="contribution_state_queued">На чекању</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Још увек нема отпремања</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d отпремање</item>
-    <item quantity="other">%d отпремања</item>
+    <item quantity="one">%1$d отпремање</item>
+    <item quantity="other">%1$d отпремања</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Започни %d отпремање</item>
-    <item quantity="other">Започни %d отпремања</item>
+    <item quantity="one">Започни %1$d отпремање</item>
+    <item quantity="other">Започни %1$d отпремања</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d отпремање</item>
-    <item quantity="other">%d отпремања</item>
+    <item quantity="one">%1$d отпремање</item>
+    <item quantity="other">%1$d отпремања</item>
   </plurals>
   <string name="categories_not_found">Нема категорија које одговарају %1$s</string>
   <string name="categories_skip_explanation">Додајте категорије на слике да бисте олакшали корисницима њихово проналажење на Остави.\n\nДа бисте додали категорију, почните са писањем њеног имена.</string>
diff --git a/app/src/main/res/values-su/strings.xml b/app/src/main/res/values-su/strings.xml
index 77003e209..209e5a65b 100644
--- a/app/src/main/res/values-su/strings.xml
+++ b/app/src/main/res/values-su/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Ngunjal %1$s gagal</string>
   <string name="upload_failed_notification_subtitle">Toél pikeun nempo</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">ngunjal %d berkas</item>
-    <item quantity="other">ngunjal %d berkas</item>
+    <item quantity="one">ngunjal %1$d berkas</item>
+    <item quantity="other">ngunjal %1$d berkas</item>
   </plurals>
   <string name="title_activity_contributions">Unjalan panungtung kuring</string>
   <string name="contribution_state_queued">Antrian</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Can aya nu diunjal</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d unjalan</item>
-    <item quantity="other">%d unjalan</item>
+    <item quantity="one">%1$d unjalan</item>
+    <item quantity="other">%1$d unjalan</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Ngamimitian saunjalan</item>
-    <item quantity="other">Ngamimitian %d unjalan</item>
+    <item quantity="other">Ngamimitian %1$d unjalan</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">saunjalan</item>
-    <item quantity="other">%d unjalan</item>
+    <item quantity="other">%1$d unjalan</item>
   </plurals>
   <string name="categories_not_found">Teu mendak kategori anu cocog jeung %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Tambahkeun kategori hambéh gambar anjeun beuki gampang katarana di Wikimédia Commons.\n\nMimitian ku ngetik kategori.\nToél ieu talatah (atawa toél deui) pikeun ngaliwatkeun ieu bagęan.</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 2b781a1c5..761460e78 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Uppladdning av %1$s misslyckades</string>
   <string name="upload_failed_notification_subtitle">Tryck för att visa</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fil laddas upp</item>
-    <item quantity="other">%d filer laddas upp</item>
+    <item quantity="one">%1$d fil laddas upp</item>
+    <item quantity="other">%1$d filer laddas upp</item>
   </plurals>
   <string name="title_activity_contributions">Mina senaste uppladdningar</string>
   <string name="contribution_state_queued">Köade</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Inga uppladdningar ännu</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d uppladdning</item>
-    <item quantity="other">%d uppladdningar</item>
+    <item quantity="one">%1$d uppladdning</item>
+    <item quantity="other">%1$d uppladdningar</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Startar %d uppladdning</item>
-    <item quantity="other">Startar %d uppladdningar</item>
+    <item quantity="one">Startar %1$d uppladdning</item>
+    <item quantity="other">Startar %1$d uppladdningar</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d uppladdning</item>
-    <item quantity="other">%d uppladdningar</item>
+    <item quantity="one">%1$d uppladdning</item>
+    <item quantity="other">%1$d uppladdningar</item>
   </plurals>
   <string name="categories_not_found">Inga kategorier som stämmer överens med %1$s hittades</string>
   <string name="categories_skip_explanation">Lägg till kategorier för att göra dina bilder enklare att hitta på Wikimedia Commons.\n\nBörja skriva för att lägga till kategorier.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Behörighet krävs för att visa en lista över platser i närheten</string>
   <string name="get_directions">FÅ VÄGBESKRIVNINGAR</string>
   <string name="read_article">LÄS ARTIKEL</string>
-  <string name="notifications_welcome">Välkommen till Wikimedia Commons, %s! Vi är glada att du är här.</string>
-  <string name="notifications_talk_page_message">%s lämnade ett meddelande på din diskussionssida</string>
+  <string name="notifications_welcome">Välkommen till Wikimedia Commons, %1$s! Vi är glada att du är här.</string>
+  <string name="notifications_talk_page_message">%1$s lämnade ett meddelande på din diskussionssida</string>
   <string name="notifications_thank_you_edit">Tack för att du gjorde en redigering</string>
-  <string name="notifications_mention">%s nämnde dig på %s.</string>
+  <string name="notifications_mention">%1$s nämnde dig på %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-tcy/strings.xml b/app/src/main/res/values-tcy/strings.xml
index 4ece0c348..6d8a8ee48 100644
--- a/app/src/main/res/values-tcy/strings.xml
+++ b/app/src/main/res/values-tcy/strings.xml
@@ -21,8 +21,8 @@
   <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">%d ಕಡತ ಅಪ್ಲೊಡ್ ಆವೊಂದುಂಡು</item>
-    <item quantity="other">%d ಕಡತೊಲು ಅಪ್ಲೋಡ್ ಆವೊಂದುಂಡು</item>
+    <item quantity="one">%1$d ಕಡತ ಅಪ್ಲೊಡ್ ಆವೊಂದುಂಡು</item>
+    <item quantity="other">%1$d ಕಡತೊಲು ಅಪ್ಲೋಡ್ ಆವೊಂದುಂಡು</item>
   </plurals>
   <string name="title_activity_contributions">ಎನ್ನ ದಿಂಜಯೀನಾ ವಿಚಾರೊಳು</string>
   <string name="contribution_state_queued">ದಿಂಜೊಂತುಂಡು</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index a82d02554..1075fa969 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -20,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>
-  <string name="uploads_pending_notification_indicator">กำลังอัปโหลดไฟล์ %d ไฟล์</string>
+  <string name="uploads_pending_notification_indicator">กำลังอัปโหลดไฟล์ %1$d ไฟล์</string>
   <string name="title_activity_contributions">การอัปโหลดล่าสุดของฉัน</string>
   <string name="contribution_state_queued">อยู่ในคิว</string>
   <string name="contribution_state_failed">ล้มเหลว</string>
@@ -51,11 +51,11 @@
   <string name="gps_disabled">GPS ถูกปิดใช้งานในอุปกรณ์ของคุณอยู่ คุณต้องการเปิดใช้งานหรือไม่?</string>
   <string name="enable_gps">เปิดใช้งาน GPS</string>
   <string name="contributions_subtitle_zero">ยังไม่มีการอัปโหลด</string>
-  <string name="contributions_subtitle">การอัปโหลด %d รายการ</string>
-  <string name="starting_multiple_uploads">กำลังเริ่มการอัปโหลด %d รายการ</string>
+  <string name="contributions_subtitle">การอัปโหลด %1$d รายการ</string>
+  <string name="starting_multiple_uploads">กำลังเริ่มการอัปโหลด %1$d รายการ</string>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">การอัปโหลด %d รายการ</item>
-    <item quantity="other">การอัปโหลด %d รายการ</item>
+    <item quantity="one">การอัปโหลด %1$d รายการ</item>
+    <item quantity="other">การอัปโหลด %1$d รายการ</item>
   </plurals>
   <string name="categories_not_found">ไม่พบหมวดหมู่ที่ตรงกับ %$1s</string>
   <string name="categories_skip_explanation" fuzzy="true">เพิ่มหมวดหมู่เพื่อทำให้รูปภาพของคุณค้นพบได้ง่ายขึ้นบน Wikimedia Commons\n\nเริ่มพิมพ์เพื่อเพิ่มหมวดหมู่\nแตะข้อความนี้ (หรือกดปุ่มย้อนกลับ) เพื่อข้ามขั้นตอนนี้</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e541f2f23..04205eddc 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">%1$s dosyasının yüklemesi başarısız oldu</string>
   <string name="upload_failed_notification_subtitle">Görüntülemek için dokunun</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d dosya karşıya yükleniyor</item>
-    <item quantity="other">%d dosya karşıya yükleniyor</item>
+    <item quantity="one">%1$d dosya karşıya yükleniyor</item>
+    <item quantity="other">%1$d dosya karşıya yükleniyor</item>
   </plurals>
   <string name="title_activity_contributions">Yakın Zamandaki Yüklemelerim</string>
   <string name="contribution_state_queued">Sırada</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Henüz yüklenmedi</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d yükleme</item>
-    <item quantity="other">%d yükleme</item>
+    <item quantity="one">%1$d yükleme</item>
+    <item quantity="other">%1$d yükleme</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d yüklenmeye başlanıyor</item>
-    <item quantity="other">%d yüklenmeye başlanıyor</item>
+    <item quantity="one">%1$d yüklenmeye başlanıyor</item>
+    <item quantity="other">%1$d yüklenmeye başlanıyor</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d yükleme</item>
-    <item quantity="other">%d yükleme</item>
+    <item quantity="one">%1$d yükleme</item>
+    <item quantity="other">%1$d yükleme</item>
   </plurals>
   <string name="categories_not_found">%1$s ile eşleşen bir kategori bulunamadı</string>
   <string name="categories_skip_explanation">Resimlerinizi Wikimedia Commons\'ta daha bulunabilir duruma getirmek için kategoriler ekleyin.\nKategori eklemek için yazmaya başlayın.</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 4c662cd3b..48f58ed37 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -21,10 +21,10 @@
   <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">Завантажується %d файл</item>
-    <item quantity="few">Завантажуються %d файли</item>
-    <item quantity="many">Завантажується %d файлів</item>
-    <item quantity="other">Завантажується %d файлів</item>
+    <item quantity="one">Завантажується %1$d файл</item>
+    <item quantity="few">Завантажуються %1$d файли</item>
+    <item quantity="many">Завантажується %1$d файлів</item>
+    <item quantity="other">Завантажується %1$d файлів</item>
   </plurals>
   <string name="title_activity_contributions">Мої останні завантаження</string>
   <string name="contribution_state_queued">У черзі</string>
@@ -58,22 +58,22 @@
   <string name="contributions_subtitle_zero">Ще нема завантажень</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d завантаження</item>
-    <item quantity="few">%d завантаження</item>
-    <item quantity="many">%d завантажень</item>
-    <item quantity="other">%d завантажень</item>
+    <item quantity="one">%1$d завантаження</item>
+    <item quantity="few">%1$d завантаження</item>
+    <item quantity="many">%1$d завантажень</item>
+    <item quantity="other">%1$d завантажень</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Починається %d завантаження</item>
-    <item quantity="few">Починаються %d завантаження</item>
-    <item quantity="many">Починаються %d завантажень</item>
-    <item quantity="other">Починаються %d завантажень</item>
+    <item quantity="one">Починається %1$d завантаження</item>
+    <item quantity="few">Починаються %1$d завантаження</item>
+    <item quantity="many">Починаються %1$d завантажень</item>
+    <item quantity="other">Починаються %1$d завантажень</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d завантаження</item>
-    <item quantity="few">%d завантаження</item>
-    <item quantity="many">%d завантажень</item>
-    <item quantity="other">%d завантажень</item>
+    <item quantity="one">%1$d завантаження</item>
+    <item quantity="few">%1$d завантаження</item>
+    <item quantity="many">%1$d завантажень</item>
+    <item quantity="other">%1$d завантажень</item>
   </plurals>
   <string name="categories_not_found">Категорій, відповідних %1$s, не знайдено</string>
   <string name="categories_skip_explanation">Додайте категорії, щоб Ваші зображення було легше знайти у Вікісховищі. \n\nПочніть вводити текст, щоб додати категорії.</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 01ad30d7d..1c066a70c 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -21,8 +21,8 @@
   <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">%d فائل اپلوڈ ہورہی ہے</item>
-    <item quantity="other">%d فائلیں اپلوڈ ہورہی ہے</item>
+    <item quantity="one">%1$d فائل اپلوڈ ہورہی ہے</item>
+    <item quantity="other">%1$d فائلیں اپلوڈ ہورہی ہے</item>
   </plurals>
   <string name="title_activity_contributions">میں حالیہ اپلوڈ</string>
   <string name="contribution_state_queued">قطار</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">ابھی تک کوئی اپلوڈ نہیں</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d اپلوڈ</item>
-    <item quantity="other">%d اپلوڈ</item>
+    <item quantity="one">%1$d اپلوڈ</item>
+    <item quantity="other">%1$d اپلوڈ</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">شروع %d اپلوڈ</item>
-    <item quantity="other">شروع %d اپلوڈ</item>
+    <item quantity="one">شروع %1$d اپلوڈ</item>
+    <item quantity="other">شروع %d$1 اپلوڈ</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d اپلوڈ</item>
-    <item quantity="other">%d اپلوڈ</item>
+    <item quantity="one">%1$d اپلوڈ</item>
+    <item quantity="other">%1$d اپلوڈ</item>
   </plurals>
   <string name="categories_not_found">%1$s سے کوئی زمرہ جات میل نہیں کھاتے</string>
   <string name="categories_skip_explanation">ویکیمیڈیا کامنز پر اپنی تصاویر کو قابل دریافت بنانے کے لیے زمرے شامل کریں۔\n\nزمرے شامل کرنے کے لیے لکھنا شروع کریں۔\n\nاس مرحلے کو نظر انداز کرنے کے لیے اس پیغام یا (یا پیچھے) پر ٹیپ کریں۔</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 2e884eb83..c5a147623 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -53,10 +53,10 @@
   <string name="contributions_subtitle_zero">Chưa có tập tin tải lên</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="other">%d tập tin tải lên</item>
+    <item quantity="other">%1$d tập tin tải lên</item>
   </plurals>
-  <string name="starting_multiple_uploads">Đang bắt đầu tải lên %d tập tin</string>
-  <string name="multiple_uploads_title">%d tập tin tải lên</string>
+  <string name="starting_multiple_uploads">Đang bắt đầu tải lên %1$d tập tin</string>
+  <string name="multiple_uploads_title">%1$d tập tin tải lên</string>
   <string name="categories_not_found">Không tìm thấy thể loại khớp với %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Xếp các hình ảnh vào thể loại để cho chúng dễ tìm kiếm hơn trên Wikimedia Commons.\n\nHãy bắt đầu nhập tên thể loại để tìm kiếm.\nChạm vào thông điệp này (hoặc bấm Quay lại) để bỏ qua bước này.</string>
   <string name="categories_activity_title">Thể loại</string>
diff --git a/app/src/main/res/values-xmf/strings.xml b/app/src/main/res/values-xmf/strings.xml
index e54a7395a..874be5a6e 100644
--- a/app/src/main/res/values-xmf/strings.xml
+++ b/app/src/main/res/values-xmf/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">%1$ ეხარგუაქ ვემიხუჯინუ</string>
   <string name="upload_failed_notification_subtitle">ოძირაფალო ქეგუწკანტეთ</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d ფაილი იხარგუ</item>
-    <item quantity="other">%d ფაილი იხარგუ</item>
+    <item quantity="one">%1$d ფაილი იხარგუ</item>
+    <item quantity="other">%1$d ფაილი იხარგუ</item>
   </plurals>
   <string name="title_activity_contributions">ჩქიმი ბოლო ეხარგუეფი</string>
   <string name="contribution_state_queued">რადი</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">ეხარგუეფი ვა რე</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d ეხარგუა</item>
-    <item quantity="other">%d ეხარგუა</item>
+    <item quantity="one">%1$d ეხარგუა</item>
+    <item quantity="other">%1$d ეხარგუა</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">იჭყაფუ %d ეხარგუა</item>
-    <item quantity="other">იჭყაფუ %d ეხარგუა</item>
+    <item quantity="one">იჭყაფუ %1$d ეხარგუა</item>
+    <item quantity="other">იჭყაფუ %1$d ეხარგუა</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d ეხარგუა</item>
-    <item quantity="other">%d ეხარგუა</item>
+    <item quantity="one">%1$d ეხარგუა</item>
+    <item quantity="other">%1$d ეხარგუა</item>
   </plurals>
   <string name="categories_activity_title">კატეგორია</string>
   <string name="title_activity_settings">პარამეტრეფი</string>
diff --git a/app/src/main/res/values-yi/strings.xml b/app/src/main/res/values-yi/strings.xml
index 0c0c3287b..27ea76605 100644
--- a/app/src/main/res/values-yi/strings.xml
+++ b/app/src/main/res/values-yi/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_failed_notification_subtitle">דרוקט צו באקוקן</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">1 טעקע לאדט אן</item>
-    <item quantity="other">%d טעקעס לאדן אן</item>
+    <item quantity="other">%1$d טעקעס לאדן אן</item>
   </plurals>
   <string name="title_activity_contributions">מײַנע ארויפלאדן</string>
   <string name="contribution_state_queued">אין ריי</string>
@@ -43,7 +43,7 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">נאך נישט קיין ארויפֿלאדן </item>
     <item quantity="one">1 ארויפֿלאד</item>
-    <item quantity="other">%d ארויפֿלאדן</item>
+    <item quantity="other">%1$d ארויפֿלאדן</item>
   </plurals>
   <string name="categories_activity_title">קאַטעגאריעס</string>
   <string name="preference_tracking">באניץ באריכטן</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2d5756fe8..379cc42ae 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -19,8 +19,8 @@
   <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">%d个文件上传中</item>
-    <item quantity="other">%d个文件上传中</item>
+    <item quantity="one">%1$d个文件上传中</item>
+    <item quantity="other">%1$d个文件上传中</item>
   </plurals>
   <string name="title_activity_contributions">我上传的内容</string>
   <string name="contribution_state_queued">队列</string>
@@ -47,17 +47,17 @@
   <string name="categories_search_text_hint">搜索分类</string>
   <string name="menu_save_categories">保存</string>
   <plurals name="contributions_subtitle">
-    <item quantity="one">%d次上传</item>
-    <item quantity="other">%d次上传</item>
+    <item quantity="one">%1$d次上传</item>
+    <item quantity="other">%1$d次上传</item>
     <item quantity="zero">没有上传</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">开始%d次上传</item>
-    <item quantity="other">开始%d次上传</item>
+    <item quantity="one">开始%1$d次上传</item>
+    <item quantity="other">开始%1$d次上传</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d次上传</item>
-    <item quantity="other">%d次上传</item>
+    <item quantity="one">%1$d次上传</item>
+    <item quantity="other">%1$d次上传</item>
   </plurals>
   <string name="categories_not_found">没有找到匹配%1$s的分类</string>
   <string name="categories_skip_explanation">为您的图片添加分类，让它们在维基共享上更容易被找到。
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 4ef5363a4..7f49f1574 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -21,8 +21,8 @@
   <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">正在上載 %d 個檔案</item>
-    <item quantity="other">正在上載 %d 個檔案</item>
+    <item quantity="one">正在上載 %1$d 個檔案</item>
+    <item quantity="other">正在上載 %1$d 個檔案</item>
   </plurals>
   <string name="title_activity_contributions">我的最近上傳</string>
   <string name="contribution_state_queued">已佇列</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">尚未上傳</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d 次上傳</item>
-    <item quantity="other">%d 次上傳</item>
+    <item quantity="one">%1$d 次上傳</item>
+    <item quantity="other">%1$d 次上傳</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">開始 %d 次上傳</item>
-    <item quantity="other">開始 %d 次上傳</item>
+    <item quantity="one">開始 %1$d 次上傳</item>
+    <item quantity="other">開始 %1$d 次上傳</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d 次上傳</item>
-    <item quantity="other">%d 次上傳</item>
+    <item quantity="one">%1$d 次上傳</item>
+    <item quantity="other">%1$d 次上傳</item>
   </plurals>
   <string name="categories_not_found">沒有發現與 %1$s 相符的分類</string>
   <string name="categories_skip_explanation">為您的圖片添加分類，使別人在維基共享資源更容易找到。\n\n開始輸入以添加分類。</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">需權限來顯示附近地點清單</string>
   <string name="get_directions">取得導向</string>
   <string name="read_article">讀取條目</string>
-  <string name="notifications_welcome">%s，歡迎來到維基共享資源！我們很高興您來到這裡。</string>
-  <string name="notifications_talk_page_message">%s 留了訊息在您的對話頁</string>
+  <string name="notifications_welcome">%1$s，歡迎來到維基共享資源！我們很高興您來到這裡。</string>
+  <string name="notifications_talk_page_message">%1$s 留了訊息在您的對話頁</string>
   <string name="notifications_thank_you_edit">感謝您所做的編輯</string>
-  <string name="notifications_mention">%s 在 %s 提到了您。</string>
+  <string name="notifications_mention">%1$s 在 %2$s 提到了您。</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 9b42cdbf0..32c99241b 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -21,8 +21,8 @@
   <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">%d个文件正在上传</item>
-    <item quantity="other">%d个文件正在上传</item>
+    <item quantity="one">%1$d个文件正在上传</item>
+    <item quantity="other">%1$d个文件正在上传</item>
   </plurals>
   <string name="title_activity_contributions">我的最近上传</string>
   <string name="contribution_state_queued">已入队列</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">尚无上传</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d次上传</item>
-    <item quantity="other">%d次上传</item>
+    <item quantity="one">%1$d次上传</item>
+    <item quantity="other">%1$d次上传</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">开始%d次上传</item>
-    <item quantity="other">开始%d次上传</item>
+    <item quantity="one">开始%1$d次上传</item>
+    <item quantity="other">开始%1$d次上传</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d次上传</item>
-    <item quantity="other">%d次上传</item>
+    <item quantity="one">%1$d次上传</item>
+    <item quantity="other">%1$d次上传</item>
   </plurals>
   <string name="categories_not_found">没有找到匹配%1$s的分类</string>
   <string name="categories_skip_explanation">添加分类使您的图像更容易在维基共享资源被找到。开始输入以添加分类。</string>
@@ -213,5 +213,5 @@
   <string name="notifications_welcome">欢迎来到维基共享资源，%s！我们很高兴您来这里。</string>
   <string name="notifications_talk_page_message">%s在您的讨论页上留下了一条消息</string>
   <string name="notifications_thank_you_edit">感谢您做出编辑</string>
-  <string name="notifications_mention">%s在%s提到了您。</string>
+  <string name="notifications_mention">%1$s在%2$s提到了您。</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d95d2042a..e41a423ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Uploading %1$s failed</string>
   <string name="upload_failed_notification_subtitle">Tap to view</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d file uploading</item>
-    <item quantity="other">%d files uploading</item>
+    <item quantity="one">%1$d file uploading</item>
+    <item quantity="other">%1$d files uploading</item>
   </plurals>
   <string name="title_activity_contributions">My Recent Uploads</string>
   <string name="contribution_state_queued">Queued</string>
@@ -57,16 +57,16 @@
   <plurals name="contributions_subtitle">
     <!--zero is not used in english. Category mentioned here for easy reference in future-->
     <item quantity="zero">@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d upload</item>
-    <item quantity="other">%d uploads</item>
+    <item quantity="one">%1$d upload</item>
+    <item quantity="other">%1$d uploads</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Starting %d upload</item>
-    <item quantity="other">Starting %d uploads</item>
+    <item quantity="one">Starting %1$d upload</item>
+    <item quantity="other">Starting %1$d uploads</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d upload</item>
-    <item quantity="other">%d uploads</item>
+    <item quantity="one">%1$d upload</item>
+    <item quantity="other">%1$d uploads</item>
   </plurals>
   <string name="categories_not_found">No categories matching %1$s found</string>
   <string name="categories_skip_explanation">Add categories to make your images more discoverable on Wikimedia Commons.\nStart typing to add categories.</string>
@@ -218,8 +218,8 @@
     <string name="get_directions">GET DIRECTIONS</string>
   <string name="read_article">READ ARTICLE</string>
 
-  <string name="notifications_welcome" formatted="false">Welcome to Wikimedia Commons, %s! We\'re glad you\'re here.</string>
-  <string name="notifications_talk_page_message" formatted="false">%s left a message on your talk page</string>
+  <string name="notifications_welcome" formatted="false">Welcome to Wikimedia Commons, %1$s! We\'re glad you\'re here.</string>
+  <string name="notifications_talk_page_message">%1$s left a message on your talk page</string>
   <string name="notifications_thank_you_edit">Thank you for making an edit</string>
-  <string name="notifications_mention" formatted="false">%s mentioned you on %s.</string>
+  <string name="notifications_mention">%1$s mentioned you on %2$s.</string>
 </resources>