From 6b14ecfdf9454af76d98eab3e897a033bcd112fc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 16 Aug 2023 16:26:21 +0100
Subject: [PATCH] Re-key all |zero-pluralised translations for Localazy
 compatibility (#11417)

* Re-key all |zero-pluralised translations for Localazy compatibility

* Add missing interpolation variable

* i18n

* Add test coverage

* Improve coverage
---
 src/components/structures/UploadBar.tsx       | 17 +++--
 .../dialogs/devtools/RoomNotifications.tsx    | 30 ++++++---
 .../views/dialogs/devtools/RoomState.tsx      |  7 ++-
 src/i18n/strings/bg.json                      |  2 +-
 src/i18n/strings/ca.json                      |  2 +-
 src/i18n/strings/cs.json                      |  7 +--
 src/i18n/strings/da.json                      |  1 -
 src/i18n/strings/de_DE.json                   |  9 ++-
 src/i18n/strings/el.json                      |  5 +-
 src/i18n/strings/en_EN.json                   |  9 ++-
 src/i18n/strings/en_US.json                   |  2 +-
 src/i18n/strings/eo.json                      |  5 +-
 src/i18n/strings/es.json                      |  7 +--
 src/i18n/strings/et.json                      |  9 ++-
 src/i18n/strings/eu.json                      |  2 +-
 src/i18n/strings/fa.json                      |  5 +-
 src/i18n/strings/fi.json                      |  5 +-
 src/i18n/strings/fr.json                      |  9 ++-
 src/i18n/strings/gl.json                      |  7 +--
 src/i18n/strings/he.json                      |  7 +--
 src/i18n/strings/hu.json                      |  9 ++-
 src/i18n/strings/id.json                      |  9 ++-
 src/i18n/strings/is.json                      |  7 +--
 src/i18n/strings/it.json                      |  9 ++-
 src/i18n/strings/ja.json                      |  7 +--
 src/i18n/strings/kab.json                     |  2 +-
 src/i18n/strings/ko.json                      |  2 +-
 src/i18n/strings/lo.json                      |  5 +-
 src/i18n/strings/lt.json                      |  2 +-
 src/i18n/strings/lv.json                      |  2 +-
 src/i18n/strings/nb_NO.json                   |  2 +-
 src/i18n/strings/nl.json                      |  7 +--
 src/i18n/strings/nn.json                      |  2 +-
 src/i18n/strings/pl.json                      |  9 ++-
 src/i18n/strings/pt.json                      |  2 +-
 src/i18n/strings/pt_BR.json                   |  5 +-
 src/i18n/strings/ru.json                      |  7 +--
 src/i18n/strings/sk.json                      |  9 ++-
 src/i18n/strings/sq.json                      |  9 ++-
 src/i18n/strings/sr.json                      |  2 +-
 src/i18n/strings/sv.json                      |  9 ++-
 src/i18n/strings/th.json                      |  2 +-
 src/i18n/strings/tr.json                      |  2 +-
 src/i18n/strings/uk.json                      |  9 ++-
 src/i18n/strings/vi.json                      |  7 +--
 src/i18n/strings/vls.json                     |  2 +-
 src/i18n/strings/zh_Hans.json                 |  7 +--
 src/i18n/strings/zh_Hant.json                 |  9 ++-
 src/utils/i18n-helpers.ts                     | 12 +++-
 test/components/structures/UploadBar-test.tsx | 52 ++++++++++++++++
 test/utils/i18n-helpers-test.ts               | 62 +++++++++++++++++++
 51 files changed, 270 insertions(+), 158 deletions(-)
 create mode 100644 test/components/structures/UploadBar-test.tsx
 create mode 100644 test/utils/i18n-helpers-test.ts

diff --git a/src/components/structures/UploadBar.tsx b/src/components/structures/UploadBar.tsx
index 9424b23b06..98e356be2c 100644
--- a/src/components/structures/UploadBar.tsx
+++ b/src/components/structures/UploadBar.tsx
@@ -107,11 +107,18 @@ export default class UploadBar extends React.PureComponent<IProps, IState> {
             return null;
         }
 
-        // MUST use var name 'count' for pluralization to kick in
-        const uploadText = _t("Uploading %(filename)s and %(count)s others", {
-            filename: this.state.currentFile,
-            count: this.state.countFiles - 1,
-        });
+        let uploadText: string;
+        if (this.state.countFiles > 1) {
+            // MUST use var name 'count' for pluralization to kick in
+            uploadText = _t("Uploading %(filename)s and %(count)s others", {
+                filename: this.state.currentFile,
+                count: this.state.countFiles - 1,
+            });
+        } else {
+            uploadText = _t("Uploading %(filename)s", {
+                filename: this.state.currentFile,
+            });
+        }
 
         const uploadSize = fileSize(this.state.currentTotal!);
         return (
diff --git a/src/components/views/dialogs/devtools/RoomNotifications.tsx b/src/components/views/dialogs/devtools/RoomNotifications.tsx
index cbb0f3c0a6..d7a2ad253d 100644
--- a/src/components/views/dialogs/devtools/RoomNotifications.tsx
+++ b/src/components/views/dialogs/devtools/RoomNotifications.tsx
@@ -76,16 +76,26 @@ export default function RoomNotifications({ onBack }: IDevtoolsProps): JSX.Eleme
                 <h2>{_t("Room status")}</h2>
                 <ul>
                     <li>
-                        {_t(
-                            "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>",
-                            {
-                                status: humanReadableNotificationColor(color),
-                                count,
-                            },
-                            {
-                                strong: (sub) => <strong>{sub}</strong>,
-                            },
-                        )}
+                        {count > 0
+                            ? _t(
+                                  "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>",
+                                  {
+                                      status: humanReadableNotificationColor(color),
+                                      count,
+                                  },
+                                  {
+                                      strong: (sub) => <strong>{sub}</strong>,
+                                  },
+                              )
+                            : _t(
+                                  "Room unread status: <strong>%(status)s</strong>",
+                                  {
+                                      status: humanReadableNotificationColor(color),
+                                  },
+                                  {
+                                      strong: (sub) => <strong>{sub}</strong>,
+                                  },
+                              )}
                     </li>
                     <li>
                         {_t(
diff --git a/src/components/views/dialogs/devtools/RoomState.tsx b/src/components/views/dialogs/devtools/RoomState.tsx
index e84799c513..9dbbf89fbc 100644
--- a/src/components/views/dialogs/devtools/RoomState.tsx
+++ b/src/components/views/dialogs/devtools/RoomState.tsx
@@ -95,6 +95,11 @@ const RoomStateHistory: React.FC<{
 const StateEventButton: React.FC<StateEventButtonProps> = ({ label, onClick }) => {
     const trimmed = label.trim();
 
+    let content = label;
+    if (!trimmed) {
+        content = label.length > 0 ? _t("<%(count)s spaces>", { count: label.length }) : _t("<empty string>");
+    }
+
     return (
         <button
             className={classNames("mx_DevTools_button", {
@@ -103,7 +108,7 @@ const StateEventButton: React.FC<StateEventButtonProps> = ({ label, onClick }) =
             })}
             onClick={onClick}
         >
-            {trimmed ? label : _t("<%(count)s spaces>", { count: label.length })}
+            {content}
         </button>
     );
 };
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 5eae502c0c..30c701601e 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -334,7 +334,7 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Беше направен опит да се зареди конкретна точка в хронологията на тази стая, но нямате разрешение да разгледате въпросното съобщение.",
     "Failed to load timeline position": "Неуспешно зареждане на позицията в хронологията",
     "Uploading %(filename)s and %(count)s others|other": "Качване на %(filename)s и %(count)s други",
-    "Uploading %(filename)s and %(count)s others|zero": "Качване на %(filename)s",
+    "Uploading %(filename)s": "Качване на %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Качване на %(filename)s и %(count)s друг",
     "Success": "Успешно",
     "<not supported>": "<не се поддържа>",
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 93a4295d40..b0cdde5be9 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -336,7 +336,7 @@
     "Failed to load timeline position": "No s'ha pogut carregar aquesta posició de la línia de temps",
     "Signed Out": "Sessió tancada",
     "Uploading %(filename)s and %(count)s others|other": "Pujant %(filename)s i %(count)s més",
-    "Uploading %(filename)s and %(count)s others|zero": "Pujant %(filename)s",
+    "Uploading %(filename)s": "Pujant %(filename)s",
     "Sign out": "Tanca la sessió",
     "Import E2E room keys": "Importar claus E2E de sala",
     "Cryptography": "Criptografia",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 73c90ab531..f58d93abf0 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -2697,7 +2697,6 @@
     "%(count)s votes|one": "%(count)s hlas",
     "%(count)s votes|other": "%(count)s hlasů",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s a %(count)s další",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s and %(count)s dalších",
     "Sorry, the poll you tried to create was not posted.": "Omlouváme se, ale hlasování, které jste se pokusili vytvořit, nebylo zveřejněno.",
     "Failed to post poll": "Nepodařilo se zveřejnit hlasování",
@@ -2910,7 +2909,7 @@
     "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)ssmazali %(count)s zpráv",
     "Maximise": "Maximalizovat",
     "Automatically send debug logs when key backup is not functioning": "Automaticky odeslat ladící protokoly, když zálohování klíčů nefunguje",
-    "<%(count)s spaces>|zero": "<prázdný řetězec>",
+    "<empty string>": "<prázdný řetězec>",
     "<%(count)s spaces>|one": "<mezera>",
     "<%(count)s spaces>|other": "<%(count)s mezer>",
     "Join %(roomAddress)s": "Vstoupit do %(roomAddress)s",
@@ -3191,7 +3190,7 @@
     "Map feedback": "Zpětná vazba k mapě",
     "Toggle attribution": "Přepnout atribut",
     "In %(spaceName)s and %(count)s other spaces.|one": "V %(spaceName)s a %(count)s dalším prostoru.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "V prostoru %(spaceName)s.",
+    "In %(spaceName)s.": "V prostoru %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "V %(spaceName)s a %(count)s ostatních prostorech.",
     "In spaces %(space1Name)s and %(space2Name)s.": "V prostorech %(space1Name)s a %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Příkaz pro vývojáře: Zruší aktuální odchozí relaci skupiny a nastaví nové relace Olm",
@@ -3608,7 +3607,7 @@
     "Show NSFW content": "Zobrazit NSFW obsah",
     "Room is <strong>encrypted ✅</strong>": "Místnost je <strong>šifrovaná ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Stav oznámení je <strong>%(notificationState)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Stav nepřečtení místnosti: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Stav nepřečtení místnosti: <strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Stav nepřečtení místnosti: <strong>%(status)s</strong>, počet: <strong>%(count)s</strong>",
     "Due to decryption errors, some votes may not be counted": "Kvůli chybám v dešifrování nemusí být některé hlasy započítány",
     "Identity server is <code>%(identityServerUrl)s</code>": "Server identit je <code>%(identityServerUrl)s</code>",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index c8bc97b7d1..21d8d6175f 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -477,7 +477,6 @@
     "Go Back": "Gå tilbage",
     "Are you sure you want to cancel entering passphrase?": "Er du sikker på, at du vil annullere indtastning af adgangssætning?",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s og %(count)s andre",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s og %(count)s andre",
     "Some invites couldn't be sent": "Nogle invitationer kunne ikke blive sendt",
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "Vi har sendt til de andre, men nedenstående mennesker kunne ikke blive inviteret til <RoomName/>",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index de2e457df9..de1f4b9715 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -245,7 +245,7 @@
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s hat das Raumbild zu <img/> geändert",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s hat das Raumbild von %(roomName)s geändert",
     "Add": "Hinzufügen",
-    "Uploading %(filename)s and %(count)s others|zero": "%(filename)s wird hochgeladen",
+    "Uploading %(filename)s": "%(filename)s wird hochgeladen",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
     "You must <a>register</a> to use this functionality": "Du musst dich <a>registrieren</a>, um diese Funktionalität nutzen zu können",
@@ -2703,7 +2703,6 @@
     "Themes": "Themen",
     "Moderation": "Moderation",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s und %(count)s anderer",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s und %(count)s andere",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "Teile Daten anonymisiert um uns zu helfen Probleme zu identifizieren. Nichts persönliches. Keine Dritten. <LearnMoreLink>Mehr dazu hier</LearnMoreLink>",
     "You previously consented to share anonymous usage data with us. We're updating how that works.": "Sie haben zuvor zugestimmt, anonymisierte Nutzungsdaten mit uns zu teilen. Wir aktualisieren, wie das funktioniert.",
@@ -2908,7 +2907,7 @@
     "Open thread": "Thread anzeigen",
     "Search Dialog": "Suchdialog",
     "Join %(roomAddress)s": "%(roomAddress)s betreten",
-    "<%(count)s spaces>|zero": "<Leere Zeichenkette>",
+    "<empty string>": "<Leere Zeichenkette>",
     "<%(count)s spaces>|one": "<Leerzeichen>",
     "<%(count)s spaces>|other": "<%(count)s Leerzeichen>",
     "Results are only revealed when you end the poll": "Die Ergebnisse werden erst sichtbar, sobald du die Umfrage beendest",
@@ -3229,7 +3228,7 @@
     "Find and invite your friends": "Finde deine Freunde und lade sie ein",
     "You made it!": "Geschafft!",
     "In %(spaceName)s and %(count)s other spaces.|one": "Im Space %(spaceName)s und %(count)s weiteren Spaces.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "Im Space %(spaceName)s.",
+    "In %(spaceName)s.": "Im Space %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "In %(spaceName)s und %(count)s weiteren Spaces.",
     "Download %(brand)s": "%(brand)s herunterladen",
     "Find and invite your community members": "Finde deine Community-Mitglieder und lade sie ein",
@@ -3611,7 +3610,7 @@
     "Room is <strong>not encrypted 🚨</strong>": "Raum ist <strong>nicht verschlüsselt 🚨</strong>",
     "Room is <strong>encrypted ✅</strong>": "Raum ist <strong>verschlüsselt ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Benachrichtigungsstand ist <strong>%(notificationState)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Ungelesen-Status im Raum: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Ungelesen-Status im Raum: <strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Ungelesen-Status im Raum: <strong>%(status)s</strong>, Anzahl: <strong>%(count)s</strong>",
     "Identity server is <code>%(identityServerUrl)s</code>": "Identitäts-Server ist <code>%(identityServerUrl)s</code>",
     "Homeserver is <code>%(homeserverUrl)s</code>": "Heim-Server ist <code>%(homeserverUrl)s</code>",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index e91549cd30..5725e9cd20 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -225,7 +225,7 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή να πέσατε σε ένα σφάλμα.",
     "Server unavailable, overloaded, or something else went wrong.": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή κάτι άλλο να πήγε στραβά.",
     "This room is not recognised.": "Αυτό το δωμάτιο δεν αναγνωρίζεται.",
-    "Uploading %(filename)s and %(count)s others|zero": "Γίνεται αποστολή του %(filename)s",
+    "Uploading %(filename)s": "Γίνεται αποστολή του %(filename)s",
     "Uploading %(filename)s and %(count)s others|other": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπων",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (δύναμη %(powerLevelNumber)s)",
     "Verification Pending": "Εκκρεμεί επιβεβαίωση",
@@ -698,7 +698,6 @@
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "Αδυναμία κατανόησης της δοθείσας ημερομηνίας (%(inputDate)s). Προσπαθήστε να χρησιμοποιήσετε την μορφή YYYY-MM-DD.",
     "Sends the given message as a spoiler": "Στέλνει το δοθέν μήνυμα ως spoiler",
     "Setting up keys": "Ρύθμιση κλειδιών",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "Some invites couldn't be sent": "Δεν ήταν δυνατή η αποστολή κάποιων προσκλήσεων",
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "Στάλθηκαν οι προσκλήσεις στους άλλους, αλλά δεν ήταν δυνατή η αποστολή πρόσκλησης στους παρακάτω στο <RoomName/>",
     "Custom (%(level)s)": "Προσαρμοσμένα (%(level)s)",
@@ -2978,7 +2977,7 @@
     "Server Versions": "Εκδόσεις διακομιστή",
     "Client Versions": "Εκδόσεις πελάτη",
     "Send custom state event": "Αποστολή προσαρμοσμένου συμβάντος κατάστασης",
-    "<%(count)s spaces>|zero": "<empty string>",
+    "<empty string>": "<empty string>",
     "Event Content": "Περιεχόμενο συμβάντος",
     "Event sent!": "Το συμβάν στάλθηκε!",
     "Failed to send event!": "Αποτυχία αποστολής συμβάντος!",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a39e72bb78..b20519ec89 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -724,11 +724,10 @@
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s and %(space2Name)s",
     "In spaces %(space1Name)s and %(space2Name)s.": "In spaces %(space1Name)s and %(space2Name)s.",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s and %(count)s others",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s and %(count)s other",
     "In %(spaceName)s and %(count)s other spaces.|other": "In %(spaceName)s and %(count)s other spaces.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "In space %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|one": "In %(spaceName)s and %(count)s other space.",
+    "In %(spaceName)s.": "In %(spaceName)s.",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Unexpected server error trying to leave the room": "Unexpected server error trying to leave the room",
     "Can't leave Server Notices room": "Can't leave Server Notices room",
@@ -3223,7 +3222,7 @@
     "User read up to (m.read.private;ignoreSynthetic): ": "User read up to (m.read.private;ignoreSynthetic): ",
     "Room status": "Room status",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Room unread status: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Room unread status: <strong>%(status)s</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Notification state is <strong>%(notificationState)s</strong>",
     "Room is <strong>encrypted ✅</strong>": "Room is <strong>encrypted ✅</strong>",
     "Room is <strong>not encrypted 🚨</strong>": "Room is <strong>not encrypted 🚨</strong>",
@@ -3239,7 +3238,7 @@
     "Thread Id: ": "Thread Id: ",
     "<%(count)s spaces>|other": "<%(count)s spaces>",
     "<%(count)s spaces>|one": "<space>",
-    "<%(count)s spaces>|zero": "<empty string>",
+    "<empty string>": "<empty string>",
     "See history": "See history",
     "Send custom state event": "Send custom state event",
     "Capabilities": "Capabilities",
@@ -3542,8 +3541,8 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
     "Failed to load timeline position": "Failed to load timeline position",
     "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
-    "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
+    "Uploading %(filename)s": "Uploading %(filename)s",
     "Got an account? <a>Sign in</a>": "Got an account? <a>Sign in</a>",
     "New here? <a>Create an account</a>": "New here? <a>Create an account</a>",
     "Switch to light mode": "Switch to light mode",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 107bc07e45..065ab00122 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -272,7 +272,7 @@
     "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
     "Start authentication": "Start authentication",
     "Unnamed Room": "Unnamed Room",
-    "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
+    "Uploading %(filename)s": "Uploading %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
     "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index ce7c35b62d..321b335c83 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -323,7 +323,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Provis enlegi certan parton de ĉi tiu historio, sed malsukcesis ĝin trovi.",
     "Failed to load timeline position": "Malsukcesis enlegi lokon en historio",
     "Uploading %(filename)s and %(count)s others|other": "Alŝutante dosieron %(filename)s kaj %(count)s aliajn",
-    "Uploading %(filename)s and %(count)s others|zero": "Alŝutante dosieron %(filename)s",
+    "Uploading %(filename)s": "Alŝutante dosieron %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Alŝutante dosieron %(filename)s kaj %(count)s alian",
     "Sign out": "Adiaŭi",
     "Success": "Sukceso",
@@ -2662,10 +2662,9 @@
     "User is already invited to the space": "Uzanto jam estas invitita al la aro",
     "You do not have permission to invite people to this space.": "Vi ne havas permeson inviti personojn al ĉi tiu aro.",
     "In %(spaceName)s and %(count)s other spaces.|one": "En %(spaceName)s kaj %(count)s alia aro.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "En aro %(spaceName)s.",
+    "In %(spaceName)s.": "En aro %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "En %(spaceName)s kaj %(count)s aliaj aroj.",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s kaj %(count)s alia",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s kaj %(count)s aliaj",
     "In spaces %(space1Name)s and %(space2Name)s.": "En aroj %(space1Name)s kaj %(space2Name)s.",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s kaj %(space2Name)s",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 877bb1a6ba..3c27c8a02d 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -202,7 +202,7 @@
     "Unban": "Quitar Veto",
     "Unable to enable Notifications": "No se han podido activar las notificaciones",
     "Unnamed Room": "Sala sin nombre",
-    "Uploading %(filename)s and %(count)s others|zero": "Subiendo %(filename)s",
+    "Uploading %(filename)s": "Subiendo %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Subiendo %(filename)s y otros %(count)s",
     "Uploading %(filename)s and %(count)s others|other": "Subiendo %(filename)s y otros %(count)s",
     "Upload avatar": "Adjuntar avatar",
@@ -2683,7 +2683,6 @@
     "sends rainfall": "envía un efecto de lluvia",
     "%(count)s votes|one": "%(count)s voto",
     "%(count)s votes|other": "%(count)s votos",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s y %(count)s más",
     "Messaging": "Mensajería",
     "Quick settings": "Ajustes rápidos",
@@ -2904,7 +2903,7 @@
     "Search Dialog": "Ventana de búsqueda",
     "Join %(roomAddress)s": "Unirte a %(roomAddress)s",
     "Export Cancelled": "Exportación cancelada",
-    "<%(count)s spaces>|zero": "<texto vacío>",
+    "<empty string>": "<texto vacío>",
     "<%(count)s spaces>|one": "<espacio>",
     "<%(count)s spaces>|other": "<%(count)s espacios>",
     "Results are only revealed when you end the poll": "Los resultados se mostrarán cuando cierres la encuesta",
@@ -3200,7 +3199,7 @@
     "Enter fullscreen": "Pantalla completa",
     "Map feedback": "Danos tu opinión sobre el mapa",
     "In %(spaceName)s and %(count)s other spaces.|one": "En %(spaceName)s y %(count)s espacio más.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "En el espacio %(spaceName)s.",
+    "In %(spaceName)s.": "En el espacio %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "En %(spaceName)s y otros %(count)s espacios",
     "In spaces %(space1Name)s and %(space2Name)s.": "En los espacios %(space1Name)s y %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Comando para desarrolladores: descarta la sesión de grupo actual saliente y crea nuevas sesiones de Olm",
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index b3ca32758b..53be63677b 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -642,7 +642,7 @@
     "Failed to load timeline position": "Asukoha laadimine ajajoonel ei õnnestunud",
     "Guest": "Külaline",
     "Uploading %(filename)s and %(count)s others|other": "Laadin üles %(filename)s ning %(count)s muud faili",
-    "Uploading %(filename)s and %(count)s others|zero": "Laadin üles %(filename)s",
+    "Uploading %(filename)s": "Laadin üles %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Laadin üles %(filename)s ning veel %(count)s faili",
     "The email address linked to your account must be entered.": "Sa pead sisestama oma kontoga seotud e-posti aadressi.",
     "A new password must be entered.": "Palun sisesta uus salasõna.",
@@ -2693,7 +2693,6 @@
     "Image size in the timeline": "Ajajoone piltide suurus",
     "%(senderName)s has updated the room layout": "%(senderName)s on uuendanud jututoa välimust",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s ja veel %(count)s kogukond",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s ja muud %(count)s kogukonda",
     "Based on %(count)s votes|one": "Aluseks on %(count)s hääl",
     "Based on %(count)s votes|other": "Aluseks on %(count)s häält",
@@ -3020,7 +3019,7 @@
     "%(brand)s was denied permission to fetch your location. Please allow location access in your browser settings.": "%(brand)s ei saanud asukohta tuvastada. Palun luba vastavad õigused brauseri seadistustes.",
     "%(brand)s is experimental on a mobile web browser. For a better experience and the latest features, use our free native app.": "%(brand)s toimib nutiseadme veebibrauseris kastseliselt. Parima kasutajakogemuse ja uusima funktsionaalsuse jaoks kasuta meie rakendust.",
     "Force complete": "Sunni lõpetama",
-    "<%(count)s spaces>|zero": "<tühi string>",
+    "<empty string>": "<tühi string>",
     "Call": "Helista",
     "%(errcode)s was returned while trying to access the room or space. If you think you're seeing this message in error, please <issueLink>submit a bug report</issueLink>.": "Astumisel jututuppa või liitumisel kogukonnaga tekkis viga %(errcode)s. Kui sa arvad, et sellise põhjusega viga ei tohiks tekkida, siis palun <issueLink>koosta veateade</issueLink>.",
     "Try again later, or ask a room or space admin to check if you have access.": "Proovi hiljem uuesti või küsi jututoa või kogukonna haldurilt, kas sul on ligipääs olemas.",
@@ -3189,7 +3188,7 @@
     "Exit fullscreen": "Lülita täisekraanivaade välja",
     "Enter fullscreen": "Lülita täisekraanivaade sisse",
     "In %(spaceName)s and %(count)s other spaces.|one": "Kogukonnas %(spaceName)s ja veel %(count)s's kogukonnas.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "Kogukonnas %(spaceName)s.",
+    "In %(spaceName)s.": "Kogukonnas %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "Kogukonnas %(spaceName)s ja %(count)s's muus kogukonnas.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Kogukondades %(space1Name)s ja %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Arendaja toiming: Lõpetab kehtiva väljuva rühmasessiooni ja seadistab uue Olm sessiooni",
@@ -3608,7 +3607,7 @@
     "Room directory": "Jututubade loend",
     "Show NSFW content": "Näita töökeskkonnas mittesobilikku sisu",
     "Notification state is <strong>%(notificationState)s</strong>": "Teavituste olek: <strong>%(notificationState)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Lugemata sõnumite olek jututoas: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Lugemata sõnumite olek jututoas: <strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Lugemata sõnumite olek jututoas: <strong>%(status)s</strong>, kokku: <strong>%(count)s</strong>",
     "Ended a poll": "Lõpetas küsitluse",
     "Identity server is <code>%(identityServerUrl)s</code>": "Isikutuvastusserveri aadress <code>%(identityServerUrl)s</code>",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 06fcdf692c..1909600fb6 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -188,7 +188,7 @@
     "Unable to enable Notifications": "Ezin izan dira jakinarazpenak gaitu",
     "Unmute": "Audioa aktibatu",
     "Unnamed Room": "Izen gabeko gela",
-    "Uploading %(filename)s and %(count)s others|zero": "%(filename)s igotzen",
+    "Uploading %(filename)s": "%(filename)s igotzen",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s eta beste %(count)s igotzen",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s eta beste %(count)s igotzen",
     "Upload avatar": "Igo abatarra",
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index 93a84e177b..fcefb1b070 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -856,7 +856,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "سعی شد یک نقطه‌ی زمانی خاص در پیام‌های این اتاق بارگیری و نمایش داده شود، اما پیداکردن آن میسر نیست.",
     "Failed to load timeline position": "بارگیری و نمایش پیام‌ها با مشکل مواجه شد",
     "Uploading %(filename)s and %(count)s others|other": "در حال بارگذاری %(filename)s و %(count)s مورد دیگر",
-    "Uploading %(filename)s and %(count)s others|zero": "در حال بارگذاری %(filename)s",
+    "Uploading %(filename)s": "در حال بارگذاری %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "در حال بارگذاری %(filename)s و %(count)s مورد دیگر",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "یادآوری: مرورگر شما پشتیبانی نمی شود ، بنابراین ممکن است تجربه شما غیرقابل پیش بینی باشد.",
     "Preparing to download logs": "در حال آماده سازی برای بارگیری گزارش ها",
@@ -2309,7 +2309,6 @@
     "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s دعوت %(displayName)s را پذیرفت",
     "We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.": "ما قادر به درک تاریخ داده شده %(inputDate)s نبودیم. از قالب YYYY-MM-DD استفاده کنید.",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s و %(count)s دیگر",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s و %(count)s دیگران",
     "Some invites couldn't be sent": "بعضی از دعوت ها ارسال نشد",
     "We sent the others, but the below people couldn't be invited to <RoomName/>": "ما برای باقی ارسال کردیم، ولی افراد زیر نمی توانند به <RoomName/> دعوت شوند",
@@ -2398,7 +2397,7 @@
     "You were disconnected from the call. (Error: %(message)s)": "شما از تماس قطع شدید.(خطا: %(message)s)",
     "Share anonymous data to help us identify issues. Nothing personal. No third parties. <LearnMoreLink>Learn More</LearnMoreLink>": "اطلاعات خود را به صورت ناشناس با ما به اشتراک بگذارید تا متوجه مشکلات موجود شویم. بدون استفاده شخصی توسط خود و یا شرکا<LearnMoreLink>یادگیری بیشتر</LearnMoreLink>",
     "%(creatorName)s created this room.": "%(creatorName)s این اتاق ساخته شده.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "در فضای %(spaceName)s.",
+    "In %(spaceName)s.": "در فضای %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "در %(spaceName)s و %(count)s دیگر فضاها.",
     "In spaces %(space1Name)s and %(space2Name)s.": "در فضای %(space1Name)s و %(space2Name)s.",
     "%(senderName)s withdrew %(targetName)s's invitation": "%(senderName)s رد کردن %(targetName)s's دعوت",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 7e44334b37..e7771c07b8 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -132,7 +132,7 @@
     "Unban": "Poista porttikielto",
     "Unmute": "Poista mykistys",
     "Unnamed Room": "Nimeämätön huone",
-    "Uploading %(filename)s and %(count)s others|zero": "Lähetetään %(filename)s",
+    "Uploading %(filename)s": "Lähetetään %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Lähetetään %(filename)s ja %(count)s muuta",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s vaihtoi huoneen nimeksi %(roomName)s.",
     "Enable automatic language detection for syntax highlighting": "Ota automaattinen kielentunnistus käyttöön syntaksikorostusta varten",
@@ -2410,7 +2410,6 @@
     "Experimental": "Kokeellinen",
     "Themes": "Teemat",
     "Other rooms": "Muut huoneet",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "You cannot place calls without a connection to the server.": "Et voi soittaa puheluja ilman yhteyttä palvelimeen.",
     "Connectivity to the server has been lost": "Yhteys palvelimeen on katkennut",
     "You cannot place calls in this browser.": "Et voi soittaa puheluja tässä selaimessa.",
@@ -3073,7 +3072,7 @@
     "Find my location": "Paikanna sijaintini",
     "Exit fullscreen": "Poistu koko näytön tilasta",
     "Enter fullscreen": "Siirry koko näytön tilaan",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "Avaruudessa %(spaceName)s.",
+    "In %(spaceName)s.": "Avaruudessa %(spaceName)s.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Avaruuksissa %(space1Name)s ja %(space2Name)s.",
     "Video call started in %(roomName)s. (not supported by this browser)": "Videopuhelu alkoi huoneessa %(roomName)s. (ei tuettu selaimesi toimesta)",
     "Video call started in %(roomName)s.": "Videopuhelu alkoi huoneessa %(roomName)s.",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c17d56d8b0..a2aafb4681 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -244,7 +244,7 @@
     "You have <a>disabled</a> URL previews by default.": "Vous avez <a>désactivé</a> les aperçus d’URL par défaut.",
     "You have <a>enabled</a> URL previews by default.": "Vous avez <a>activé</a> les aperçus d’URL par défaut.",
     "Add": "Ajouter",
-    "Uploading %(filename)s and %(count)s others|zero": "Envoi de %(filename)s",
+    "Uploading %(filename)s": "Envoi de %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Envoi de %(filename)s et %(count)s autre",
     "Uploading %(filename)s and %(count)s others|other": "Envoi de %(filename)s et %(count)s autres",
     "You must <a>register</a> to use this functionality": "Vous devez vous <a>inscrire</a> pour utiliser cette fonctionnalité",
@@ -2721,7 +2721,6 @@
     "Moderation": "Modération",
     "Messaging": "Messagerie",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s et %(count)s autre",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s et %(count)s autres",
     "Toggle space panel": "(Dés)activer le panneau des espaces",
     "Link to room": "Lien vers le salon",
@@ -2919,7 +2918,7 @@
     "Use <arrows/> to scroll": "Utilisez <arrows/> pour faire défiler",
     "Join %(roomAddress)s": "Rejoindre %(roomAddress)s",
     "Export Cancelled": "Export annulé",
-    "<%(count)s spaces>|zero": "<chaîne de caractères vide>",
+    "<empty string>": "<chaîne de caractères vide>",
     "<%(count)s spaces>|one": "<espace>",
     "<%(count)s spaces>|other": "<%(count)s espaces>",
     "Results are only revealed when you end the poll": "Les résultats ne sont révélés que lorsque vous terminez le sondage",
@@ -3191,7 +3190,7 @@
     "Map feedback": "Remarques sur la carte",
     "Toggle attribution": "Changer l’attribution",
     "In %(spaceName)s and %(count)s other spaces.|one": "Dans %(spaceName)s et %(count)s autre espace.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "Dans l’espace %(spaceName)s.",
+    "In %(spaceName)s.": "Dans l’espace %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "Dans %(spaceName)s et %(count)s autres espaces.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Dans les espaces %(space1Name)s et %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Commande développeur : oublier la session de groupe sortante actuelle et négocier une nouvelle session Olm",
@@ -3609,7 +3608,7 @@
     "Room is <strong>not encrypted 🚨</strong>": "Le salon <strong>n’est pas chiffré 🚨</strong>",
     "Room is <strong>encrypted ✅</strong>": "Le salon est <strong>chiffré ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "L’état des notifications est <strong>%(notificationState)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Statut non-lus du salon : <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Statut non-lus du salon : <strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Statut non-lus du salon : <strong>%(status)s</strong>, total : <strong>%(count)s</strong>",
     "Ended a poll": "Sondage terminé",
     "Due to decryption errors, some votes may not be counted": "À cause d’erreurs de déchiffrement, certains votes pourraient ne pas avoir été pris en compte",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index f358c86e4f..bc9510a8e0 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -326,7 +326,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Intentouse cargar un punto específico do historial desta sala, pero non se puido atopar.",
     "Failed to load timeline position": "Fallo ao cargar posición da liña temporal",
     "Uploading %(filename)s and %(count)s others|other": "Subindo %(filename)s e %(count)s máis",
-    "Uploading %(filename)s and %(count)s others|zero": "Subindo %(filename)s",
+    "Uploading %(filename)s": "Subindo %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Subindo %(filename)s e %(count)s máis",
     "Sign out": "Saír",
     "Failed to change password. Is your password correct?": "Fallo ao cambiar o contrasinal. É correcto o contrasinal?",
@@ -2697,7 +2697,6 @@
     "%(count)s votes|one": "%(count)s voto",
     "%(count)s votes|other": "%(count)s votos",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s e %(count)s outro",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s e outros %(count)s",
     "Sorry, the poll you tried to create was not posted.": "A enquisa que ías publicar non se puido publicar.",
     "Failed to post poll": "Non se puido publicar a enquisa",
@@ -2900,7 +2899,7 @@
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Grazas por probar a beta, entra en detalles canto queiras para así axudarnos a mellorala.",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s e %(space2Name)s",
     "Maximise": "Maximizar",
-    "<%(count)s spaces>|zero": "<cadea baleira>",
+    "<empty string>": "<cadea baleira>",
     "<%(count)s spaces>|one": "<spazo>",
     "<%(count)s spaces>|other": "<%(count)s espazos>",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s enviou unha mensaxe oculta",
@@ -3191,7 +3190,7 @@
     "Map feedback": "Opinión sobre Mapa",
     "Toggle attribution": "Cambiar atribución",
     "In %(spaceName)s and %(count)s other spaces.|one": "No %(spaceName)s e %(count)s outro espazo.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "No espazo %(spaceName)s.",
+    "In %(spaceName)s.": "No espazo %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "No espazo %(spaceName)s e %(count)s outros espazos.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Nos espazos %(space1Name)s e %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Comando de desenvolvemento: descarta a actual sesión en grupo e crea novas sesións Olm",
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index a6fe030b7d..86eda97ec9 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -2028,7 +2028,7 @@
     "New here? <a>Create an account</a>": "חדש פה? <a> צור חשבון </a>",
     "Got an account? <a>Sign in</a>": "יש לך חשבון? <a> היכנס </a>",
     "Uploading %(filename)s and %(count)s others|one": "מעלה %(filename)s ו-%(count)s אחרים",
-    "Uploading %(filename)s and %(count)s others|zero": "מעלה %(filename)s",
+    "Uploading %(filename)s": "מעלה %(filename)s",
     "Uploading %(filename)s and %(count)s others|other": "מעלה %(filename)s ו-%(count)s אחרים",
     "Failed to load timeline position": "טעינת מיקום ציר הזמן נכשלה",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "ניסה לטעון נקודה מסוימת בציר הזמן של החדר הזה, אך לא הצליח למצוא אותה.",
@@ -2293,7 +2293,7 @@
     "Failed to load.": "נכשל בטעינה.",
     "Capabilities": "יכולות",
     "Send custom state event": "שלח אירוע מצב מותאם אישית",
-    "<%(count)s spaces>|zero": "<מחרוזת ריקה>",
+    "<empty string>": "<מחרוזת ריקה>",
     "<%(count)s spaces>|one": "<רווח>",
     "Friends and family": "חברים ומשפחה",
     "Android": "אנדרויד",
@@ -2567,7 +2567,7 @@
     "User is already invited to the space": "המשתמש כבר מוזמן למרחב העבודה",
     "You do not have permission to invite people to this space.": "אין לכם הרשאה להזמין משתתפים אחרים למרחב עבודה זה.",
     "In %(spaceName)s and %(count)s other spaces.|one": "ב%(spaceName)sו%(count)s מרחבי עבודה אחרים.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "במרחבי עבודה%(spaceName)s.",
+    "In %(spaceName)s.": "במרחבי עבודה%(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "%(spaceName)sו%(count)s מרחבי עבודה אחרים.",
     "In spaces %(space1Name)s and %(space2Name)s.": "במרחבי עבודה %(space1Name)sו%(space2Name)s.",
     "Search %(spaceName)s": "חיפוש %(spaceName)s",
@@ -2575,7 +2575,6 @@
     "Sends the given message with a space themed effect": "שולח את ההודעה הנתונה עם אפקט בנושא חלל",
     "Invite to %(spaceName)s": "הזמן אל %(spaceName)s",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)sו%(count)sאחרים",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)sו%(count)s אחרים",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)sו%(space2Name)s",
     "To leave the beta, visit your settings.": "כדי לעזוב את התכונה הניסיונית, כנסו להגדרות.",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d2ad519d8c..267a2b99e1 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -177,7 +177,7 @@
     "Unable to enable Notifications": "Az értesítések engedélyezése sikertelen",
     "Unmute": "Némítás visszavonása",
     "Unnamed Room": "Névtelen szoba",
-    "Uploading %(filename)s and %(count)s others|zero": "%(filename)s feltöltése",
+    "Uploading %(filename)s": "%(filename)s feltöltése",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s és még %(count)s db másik feltöltése",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s és még %(count)s db másik feltöltése",
     "Upload avatar": "Profilkép feltöltése",
@@ -2697,7 +2697,6 @@
     "%(count)s votes|one": "%(count)s szavazat",
     "%(count)s votes|other": "%(count)s szavazat",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s és még %(count)s másik",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s és még %(count)s másik",
     "Sorry, the poll you tried to create was not posted.": "Sajnos a szavazás amit készített nem lett elküldve.",
     "Failed to post poll": "A szavazást nem sikerült beküldeni",
@@ -2910,7 +2909,7 @@
     "Maximise": "Teljes méret",
     "Automatically send debug logs when key backup is not functioning": "Hibakeresési naplók automatikus küldése, ha a kulcsmentés nem működik",
     "Thank you for trying the beta, please go into as much detail as you can so we can improve it.": "Köszönjük, hogy kipróbálja a béta programunkat, hogy fejleszthessünk, adjon olyan részletes visszajelzést, amennyire csak lehet.",
-    "<%(count)s spaces>|zero": "<üres karakterek>",
+    "<empty string>": "<üres karakterek>",
     "<%(count)s spaces>|other": "<%(count)s szóköz>",
     "<%(count)s spaces>|one": "<szóköz>",
     "Edit poll": "Szavazás szerkesztése",
@@ -3200,7 +3199,7 @@
     "Map feedback": "Visszajelzés a térképről",
     "Toggle attribution": "Forrásmegjelölés be/ki",
     "In %(spaceName)s and %(count)s other spaces.|one": "Itt: %(spaceName)s és %(count)s másik térben.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "Ebben a térben: %(spaceName)s.",
+    "In %(spaceName)s.": "Ebben a térben: %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "Itt: %(spaceName)s és %(count)s másik térben.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Ezekben a terekben: %(space1Name)s és %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Fejlesztői parancs: Eldobja a jelenlegi kimenő csoport kapcsolatot és új Olm munkamenetet hoz létre",
@@ -3606,7 +3605,7 @@
     "Room is <strong>not encrypted 🚨</strong>": "A szoba <strong>nincs titkosítva 🚨</strong>",
     "Room is <strong>encrypted ✅</strong>": "A szoba <strong>titkosított ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Értesítés állapot: <strong>%(notificationState)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Szoba olvasatlan állapota: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Szoba olvasatlan állapota: <strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Szoba olvasatlan állapota: <strong>%(status)s</strong>, darabszám: <strong>%(count)s</strong>",
     "Ended a poll": "Lezárta a szavazást",
     "Due to decryption errors, some votes may not be counted": "Visszafejtési hibák miatt néhány szavazat nem kerül beszámításra",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index d567aef518..4cfdbe0b7f 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -900,7 +900,7 @@
     "was banned %(count)s times|one": "dicekal",
     "Popout widget": "Widget popout",
     "Muted Users": "Pengguna yang Dibisukan",
-    "Uploading %(filename)s and %(count)s others|zero": "Mengunggah %(filename)s",
+    "Uploading %(filename)s": "Mengunggah %(filename)s",
     "Delete Widget": "Hapus Widget",
     "were banned %(count)s times|one": "dicekal",
     "was invited %(count)s times|one": "diundang",
@@ -2640,7 +2640,6 @@
     "%(count)s votes|one": "%(count)s suara",
     "%(count)s votes|other": "%(count)s suara",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s dan %(count)s lainnya",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s dan %(count)s lainnya",
     "Jump to room search": "Pergi ke pencarian ruangan",
     "Search (must be enabled)": "Cari (harus diaktifkan)",
@@ -2910,7 +2909,7 @@
     "%(oneUser)ssent %(count)s hidden messages|other": "%(oneUser)s sent %(count)s hidden messages",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)s mengirim sebuah pesan tersembunyi",
     "Automatically send debug logs when key backup is not functioning": "Kirim catatan pengawakutu secara otomatis ketika pencadangan kunci tidak berfungsi",
-    "<%(count)s spaces>|zero": "<string kosong>",
+    "<empty string>": "<string kosong>",
     "<%(count)s spaces>|one": "<space>",
     "<%(count)s spaces>|other": "<%(count)s space>",
     "Edit poll": "Edit pungutan suara",
@@ -3191,7 +3190,7 @@
     "Map feedback": "Masukan peta",
     "Toggle attribution": "Alih atribusi",
     "In %(spaceName)s and %(count)s other spaces.|one": "Dalam %(spaceName)s dan %(count)s space lainnya.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "Dalam space %(spaceName)s.",
+    "In %(spaceName)s.": "Dalam space %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "Dalam %(spaceName)s dan %(count)s space lainnya.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Dalam space %(space1Name)s dan %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Perintah pengembang: Membuang sesi grup keluar saat ini dan menyiapkan sesi Olm baru",
@@ -3603,7 +3602,7 @@
     "Secure Backup successful": "Pencadangan Aman berhasil",
     "Your keys are now being backed up from this device.": "Kunci Anda sekarang dicadangkan dari perangkat ini.",
     "Loading polls": "Memuat pemungutan suara",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Keadaan belum dibaca ruangan: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Keadaan belum dibaca ruangan: <strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Keadaan belum dibaca ruangan: <strong>%(status)s</strong>, jumlah: <strong>%(count)s</strong>",
     "Ended a poll": "Mengakhiri sebuah pemungutan suara",
     "Due to decryption errors, some votes may not be counted": "Karena kesalahan pendekripsian, beberapa suara tidak dihitung",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index c3e3443118..4d3cc90d4e 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -272,7 +272,7 @@
     "Failed to reject invite": "Mistókst að hafna boði",
     "Failed to load timeline position": "Mistókst að hlaða inn staðsetningu á tímalínu",
     "Uploading %(filename)s and %(count)s others|other": "Sendi inn %(filename)s og %(count)s til viðbótar",
-    "Uploading %(filename)s and %(count)s others|zero": "Sendi inn %(filename)s",
+    "Uploading %(filename)s": "Sendi inn %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Sendi inn %(filename)s og %(count)s til viðbótar",
     "Unable to remove contact information": "Ekki tókst að fjarlægja upplýsingar um tengilið",
     "<not supported>": "<ekki stutt>",
@@ -835,7 +835,6 @@
     "Sets the room name": "Stillir heiti spjallrásar",
     "Effects": "Brellur",
     "Setting up keys": "Set upp dulritunarlykla",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s og %(count)s til viðbótar",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s og %(space2Name)s",
     "Custom (%(level)s)": "Sérsniðið (%(level)s)",
@@ -982,7 +981,7 @@
     "Setting:": "Stilling:",
     "Edit setting": "Breyta stillingu",
     "Value": "Gildi",
-    "<%(count)s spaces>|zero": "<auður strengur>",
+    "<empty string>": "<auður strengur>",
     "<%(count)s spaces>|one": "<svæði>",
     "<%(count)s spaces>|other": "<%(count)s svæði>",
     "Public space": "Opinbert svæði",
@@ -3017,7 +3016,7 @@
     "Reset bearing to north": "Frumstilla stefnu á norður",
     "Toggle attribution": "Víxla tilvísun af/á",
     "In %(spaceName)s and %(count)s other spaces.|one": "Á %(spaceName)s og %(count)s svæði til viðbótar.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "Á svæðinu %(spaceName)s.",
+    "In %(spaceName)s.": "Á svæðinu %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "Á %(spaceName)s og %(count)s svæðum til viðbótar.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Á svæðunum %(space1Name)s og %(space2Name)s.",
     "You're the only admin of this space. Leaving it will mean no one has control over it.": "Þú ert eini stjórnandi þessa svæðis. Ef þú yfirgefur það verður enginn annar sem er með stjórn yfir því.",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index c1361929d7..87b6f20c91 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -337,7 +337,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Si è tentato di caricare un punto specifico nella cronologia della stanza, ma non è stato trovato.",
     "Failed to load timeline position": "Caricamento posizione cronologica fallito",
     "Uploading %(filename)s and %(count)s others|other": "Invio di %(filename)s e altri %(count)s",
-    "Uploading %(filename)s and %(count)s others|zero": "Invio di %(filename)s",
+    "Uploading %(filename)s": "Invio di %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Invio di %(filename)s e altri %(count)s",
     "Sign out": "Disconnetti",
     "Success": "Successo",
@@ -2697,7 +2697,6 @@
     "%(count)s votes|one": "%(count)s voto",
     "%(count)s votes|other": "%(count)s voti",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s e altri %(count)s",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s e altri %(count)s",
     "Sorry, the poll you tried to create was not posted.": "Spiacenti, il sondaggio che hai provato a creare non è stato inviato.",
     "Failed to post poll": "Invio del sondaggio fallito",
@@ -2910,7 +2909,7 @@
     "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)shanno rimosso %(count)s messaggi",
     "Maximise": "Espandi",
     "Automatically send debug logs when key backup is not functioning": "Invia automaticamente log di debug quando il backup delle chiavi non funziona",
-    "<%(count)s spaces>|zero": "<stringa vuota>",
+    "<empty string>": "<stringa vuota>",
     "<%(count)s spaces>|one": "<spazio>",
     "<%(count)s spaces>|other": "<%(count)s spazi>",
     "Join %(roomAddress)s": "Entra in %(roomAddress)s",
@@ -3192,7 +3191,7 @@
     "Map feedback": "Feedback mappa",
     "Toggle attribution": "Attiva/disattiva attribuzione",
     "In %(spaceName)s and %(count)s other spaces.|one": "In %(spaceName)s e in %(count)s altro spazio.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "Nello spazio %(spaceName)s.",
+    "In %(spaceName)s.": "Nello spazio %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "In %(spaceName)s e in altri %(count)s spazi.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Negli spazi %(space1Name)s e %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Comando sviluppatore: scarta l'attuale sessione di gruppo in uscita e imposta nuove sessioni Olm",
@@ -3606,7 +3605,7 @@
     "Room is <strong>not encrypted 🚨</strong>": "La stanza <strong>non è crittografata 🚨</strong>",
     "Room is <strong>encrypted ✅</strong>": "La stanza è <strong>crittografata ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Lo stato di notifica è <strong>%(notificationState)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Stato \"non letto\" nella stanza: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Stato \"non letto\" nella stanza: <strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Stato \"non letto\" nella stanza: <strong>%(status)s</strong>, conteggio: <strong>%(count)s</strong>",
     "Ended a poll": "Terminato un sondaggio",
     "Due to decryption errors, some votes may not be counted": "A causa di errori di decifrazione, alcuni voti potrebbero non venire contati",
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 85e4952409..7b383b18af 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -467,7 +467,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "このルームのタイムラインの特定の地点を読み込もうとしましたが、見つけられませんでした。",
     "Failed to load timeline position": "タイムラインの位置を読み込めませんでした",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)sと他%(count)s件をアップロードしています",
-    "Uploading %(filename)s and %(count)s others|zero": "%(filename)sをアップロードしています",
+    "Uploading %(filename)s": "%(filename)sをアップロードしています",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)sと他%(count)s件をアップロードしています",
     "Success": "成功",
     "Unable to remove contact information": "連絡先の情報を削除できません",
@@ -1976,7 +1976,6 @@
     "Command error: Unable to handle slash command.": "コマンドエラー：スラッシュコマンドは使えません。",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)sと他%(count)s個",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)sと他%(count)s個",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)sと%(space2Name)s",
     "%(date)s at %(time)s": "%(date)s %(time)s",
     "<b>Please note upgrading will make a new version of the room</b>. All current messages will stay in this archived room.": "<b>アップグレードすると、このルームの新しいバージョンが作成されます。</b>今ある全てのメッセージは、アーカイブしたルームに残ります。",
@@ -2277,7 +2276,7 @@
     "Feedback sent! Thanks, we appreciate it!": "フィードバックを送信しました！ありがとうございました！",
     "This is a beta feature": "この機能はベータ版です",
     "Maximise": "最大化",
-    "<%(count)s spaces>|zero": "<空の文字列>",
+    "<empty string>": "<空の文字列>",
     "Can't edit poll": "アンケートは編集できません",
     "Poll type": "アンケートの種類",
     "Open poll": "投票の際に結果を公開",
@@ -3521,7 +3520,7 @@
     "The widget will verify your user ID, but won't be able to perform actions for you:": "ウィジェットはあなたのユーザーIDを認証しますが、操作を行うことはできません：",
     "Sliding Sync mode": "スライド式同期モード",
     "Use rich text instead of Markdown in the message composer.": "メッセージ入力欄でマークダウンの代わりにリッチテキストを使用。",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "スペース %(spaceName)s内。",
+    "In %(spaceName)s.": "スペース %(spaceName)s内。",
     "In %(spaceName)s and %(count)s other spaces.|other": "スペース %(spaceName)s と他%(count)s個のスペース内。",
     "In spaces %(space1Name)s and %(space2Name)s.": "スペース %(space1Name)sと%(space2Name)s内。",
     "The above, but in <Room /> as well": "上記、ただし<Room />でも同様",
diff --git a/src/i18n/strings/kab.json b/src/i18n/strings/kab.json
index 7cc7ef22fc..ebef804197 100644
--- a/src/i18n/strings/kab.json
+++ b/src/i18n/strings/kab.json
@@ -1336,7 +1336,7 @@
     "Search failed": "Ur iddi ara unadi",
     "No more results": "Ulac ugar n yigmaḍ",
     "Uploading %(filename)s and %(count)s others|other": "Asali n %(filename)s d %(count)s wiyaḍ-nniḍen",
-    "Uploading %(filename)s and %(count)s others|zero": "Asali n %(filename)s",
+    "Uploading %(filename)s": "Asali n %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Asali n %(filename)s d %(count)s wayeḍ-nniḍen",
     "User menu": "Umuɣ n useqdac",
     "Could not load user profile": "Yegguma ad d-yali umaɣnu n useqdac",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index aecbb85ec9..b41259219e 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -181,7 +181,7 @@
     "Unable to enable Notifications": "알림을 사용할 수 없음",
     "Unmute": "음소거 끄기",
     "Unnamed Room": "이름 없는 방",
-    "Uploading %(filename)s and %(count)s others|zero": "%(filename)s을(를) 올리는 중",
+    "Uploading %(filename)s": "%(filename)s을(를) 올리는 중",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s 외 %(count)s개를 올리는 중",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s 외 %(count)s개를 올리는 중",
     "Upload avatar": "아바타 업로드",
diff --git a/src/i18n/strings/lo.json b/src/i18n/strings/lo.json
index fc3cc754be..181c6e4a02 100644
--- a/src/i18n/strings/lo.json
+++ b/src/i18n/strings/lo.json
@@ -925,7 +925,7 @@
     "New here? <a>Create an account</a>": "ມາໃໝ່ບໍ? <a>ສ້າງບັນຊີ</a>",
     "Got an account? <a>Sign in</a>": "ມີບັນຊີບໍ? <a>ເຂົ້າສູ່ລະບົບ</a>",
     "Uploading %(filename)s and %(count)s others|one": "ກຳລັງອັບໂຫລດ %(filename)s ແລະ %(count)s ອື່ນໆ",
-    "Uploading %(filename)s and %(count)s others|zero": "ກຳລັງອັບໂຫລດ %(filename)s",
+    "Uploading %(filename)s": "ກຳລັງອັບໂຫລດ %(filename)s",
     "Uploading %(filename)s and %(count)s others|other": "ກຳລັງອັບໂຫລດ %(filename)s ແລະ %(count)s ອື່ນໆ",
     "Failed to load timeline position": "ໂຫຼດຕໍາແໜ່ງທາມລາຍບໍ່ສຳເລັດ",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "ພະຍາຍາມໂຫຼດຈຸດສະເພາະໃນທາມລາຍຂອງຫ້ອງນີ້, ແຕ່ບໍ່ສາມາດຊອກຫາມັນໄດ້.",
@@ -2420,7 +2420,6 @@
     "Unexpected server error trying to leave the room": "ເກີດຄວາມຜິດພາດທີ່ບໍ່ຄາດຄິດຂອງເຊີບເວີ ໃນຄະນະທີ່ພະຍາຍາມອອກຈາກຫ້ອງ",
     "%(name)s (%(userId)s)": "%(name)s(%(userId)s)",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s ແລະ %(count)s ອື່ນໆ",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s ແລະ %(count)s ອື່ນໆ",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s ແລະ %(space2Name)s",
     "%(num)s days from now": "%(num)s ມື້ຕໍ່ຈາກນີ້",
@@ -3036,7 +3035,7 @@
     "Thank you!": "ຂອບໃຈ!",
     "Report Content": "ລາຍງານເນື້ອຫາ",
     "Please pick a nature and describe what makes this message abusive.": "ກະລຸນາເລືອກລັກສະນະ ແລະ ການອະທິບາຍຂອງຂໍ້ຄວາມໃດໜຶ່ງທີ່ສຸພາບ.",
-    "<%(count)s spaces>|zero": "<Empty string>",
+    "<empty string>": "<Empty string>",
     "<%(count)s spaces>|one": "<space>",
     "<%(count)s spaces>|other": "<%(count)s spaces>",
     "Link to room": "ເຊື່ອມຕໍ່ທີ່ຫ້ອງ",
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 2ebe6ba499..a0a587aa74 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -202,7 +202,7 @@
     "Room": "Kambarys",
     "Failed to reject invite": "Nepavyko atmesti pakvietimo",
     "Uploading %(filename)s and %(count)s others|other": "Įkeliamas %(filename)s ir dar %(count)s failai",
-    "Uploading %(filename)s and %(count)s others|zero": "Įkeliamas %(filename)s",
+    "Uploading %(filename)s": "Įkeliamas %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Įkeliamas %(filename)s ir dar %(count)s failas",
     "Success": "Pavyko",
     "Unable to remove contact information": "Nepavyko pašalinti kontaktinės informacijos",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 1a9666386a..015e8e776d 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -138,7 +138,7 @@
     "%(roomName)s is not accessible at this time.": "%(roomName)s šobrīd nav pieejama.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s nosūtīja attēlu.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s nosūtīja uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
-    "Uploading %(filename)s and %(count)s others|zero": "Tiek augšupielādēts %(filename)s",
+    "Uploading %(filename)s": "Tiek augšupielādēts %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Tiek augšupielādēts %(filename)s un %(count)s citi",
     "Uploading %(filename)s and %(count)s others|other": "Tiek augšupielādēts %(filename)s un %(count)s citi",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (tiesību līmenis %(powerLevelNumber)s)",
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index da0e5eb703..5b29682abf 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -854,7 +854,7 @@
     "Welcome to %(appName)s": "Velkommen til %(appName)s",
     "Send a Direct Message": "Send en direktemelding",
     "Connectivity to the server has been lost.": "Tilkoblingen til tjeneren er nede.",
-    "Uploading %(filename)s and %(count)s others|zero": "Laster opp %(filename)s",
+    "Uploading %(filename)s": "Laster opp %(filename)s",
     "Could not load user profile": "Klarte ikke å laste inn brukerprofilen",
     "A new password must be entered.": "Et nytt passord må bli skrevet inn.",
     "New passwords must match each other.": "De nye passordene må samsvare med hverandre.",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 10b7529d85..d98bf16bcf 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -200,7 +200,7 @@
     "Unable to enable Notifications": "Kan meldingen niet inschakelen",
     "Unmute": "Niet dempen",
     "Unnamed Room": "Naamloze Kamer",
-    "Uploading %(filename)s and %(count)s others|zero": "%(filename)s wordt geüpload",
+    "Uploading %(filename)s": "%(filename)s wordt geüpload",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s ander worden geüpload",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s en %(count)s andere worden geüpload",
     "Upload avatar": "Afbeelding uploaden",
@@ -2692,7 +2692,6 @@
     "sends rainfall": "stuurt neerslag",
     "%(senderName)s has updated the room layout": "%(senderName)s heeft de kamerindeling bijgewerkt",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s en %(count)s andere",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s en %(count)s andere",
     "We'll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Wij maken een veiligheidssleutel voor je aan die je ergens veilig kunt opbergen, zoals in een wachtwoordmanager of een kluis.",
     "Regain access to your account and recover encryption keys stored in this session. Without them, you won't be able to read all of your secure messages in any session.": "Ontvang toegang tot je account en herstel de tijdens deze sessie opgeslagen versleutelingssleutels, zonder deze sleutels zijn sommige van je versleutelde berichten in je sessies onleesbaar.",
@@ -2897,7 +2896,7 @@
     "This is a beta feature": "Dit is een bètafunctie",
     "Use <arrows/> to scroll": "Gebruik <arrows/> om te scrollen",
     "Feedback sent! Thanks, we appreciate it!": "Reactie verzonden! Bedankt, we waarderen het!",
-    "<%(count)s spaces>|zero": "<empty string>",
+    "<empty string>": "<empty string>",
     "<%(count)s spaces>|one": "<space>",
     "<%(count)s spaces>|other": "<%(count)s spaces>",
     "%(oneUser)ssent %(count)s hidden messages|one": "%(oneUser)sverzond een verborgen bericht",
@@ -3200,7 +3199,7 @@
     "Map feedback": "Kaart feedback",
     "Toggle attribution": "Attributie in-/uitschakelen",
     "In %(spaceName)s and %(count)s other spaces.|one": "In %(spaceName)s en %(count)s andere space.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "In space %(spaceName)s.",
+    "In %(spaceName)s.": "In space %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "In %(spaceName)s en %(count)s andere spaces.",
     "In spaces %(space1Name)s and %(space2Name)s.": "In spaces %(space1Name)s en %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Opdracht voor ontwikkelaars: verwijdert de huidige uitgaande groepssessie en stelt nieuwe Olm-sessies in",
diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index ba4295f914..a7a63a3ebb 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -418,7 +418,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Prøvde å lasta eit bestemt punkt i rommet sin historikk, men klarde ikkje å finna det.",
     "Failed to load timeline position": "Innlasting av punkt i historikken feila.",
     "Uploading %(filename)s and %(count)s others|other": "Lastar opp %(filename)s og %(count)s andre",
-    "Uploading %(filename)s and %(count)s others|zero": "Lastar opp %(filename)s",
+    "Uploading %(filename)s": "Lastar opp %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Lastar opp %(filename)s og %(count)s andre",
     "Success": "Suksess",
     "Unable to remove contact information": "Klarte ikkje å fjerna kontaktinfo",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index cf493188a6..dcc92206be 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -216,7 +216,7 @@
     "Unable to enable Notifications": "Nie można włączyć powiadomień",
     "Unmute": "Wyłącz wyciszenie",
     "Unnamed Room": "Pokój bez nazwy",
-    "Uploading %(filename)s and %(count)s others|zero": "Przesyłanie %(filename)s",
+    "Uploading %(filename)s": "Przesyłanie %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Przesyłanie %(filename)s oraz %(count)s innych",
     "Uploading %(filename)s and %(count)s others|other": "Przesyłanie %(filename)s oraz %(count)s innych",
     "Upload avatar": "Prześlij awatar",
@@ -1742,7 +1742,6 @@
     "Command error: Unable to find rendering type (%(renderingType)s)": "Błąd polecenia: Nie można znaleźć renderowania typu (%(renderingType)s)",
     "Command error: Unable to handle slash command.": "Błąd polecenia: Nie można obsłużyć polecenia z ukośnikiem.",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s i %(count)s pozostała",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s i %(count)s pozostałych",
     "You cannot place calls without a connection to the server.": "Nie możesz wykonywać rozmów bez połączenia z serwerem.",
     "Connectivity to the server has been lost": "Połączenie z serwerem zostało przerwane",
@@ -1981,7 +1980,7 @@
     "User is already invited to the space": "Użytkownik jest już zaproszony do tej przestrzeni",
     "You do not have permission to invite people to this space.": "Nie masz uprawnień, by zapraszać ludzi do tej przestrzeni.",
     "In %(spaceName)s and %(count)s other spaces.|one": "W %(spaceName)s i %(count)s innej przestrzeni.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "W przestrzeni %(spaceName)s.",
+    "In %(spaceName)s.": "W przestrzeni %(spaceName)s.",
     "In spaces %(space1Name)s and %(space2Name)s.": "W przestrzeniach %(space1Name)s i %(space2Name)s.",
     "Jump to the given date in the timeline": "Przeskocz do podanej daty w linii czasu",
     "Failed to invite users to %(roomName)s": "Nie udało się zaprosić użytkowników do %(roomName)s",
@@ -3483,7 +3482,7 @@
     "Failed to load.": "Nie udało się wczytać.",
     "Capabilities": "Możliwości",
     "Send custom state event": "Wyślij własne wydarzenie stanu",
-    "<%(count)s spaces>|zero": "<empty string>",
+    "<empty string>": "<empty string>",
     "<%(count)s spaces>|one": "<space>",
     "<%(count)s spaces>|other": "<%(count)s spacji>",
     "Thread Id: ": "ID wątku: ",
@@ -3501,7 +3500,7 @@
     "Room is <strong>not encrypted 🚨</strong>": "Pokój nie jest <strong>szyfrowany 🚨</strong>",
     "Room is <strong>encrypted ✅</strong>": "Pokój jest <strong>szyfrowany ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Status powiadomień <strong>%(notificationState)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Status nieprzeczytanych wiadomości pokoju: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Status nieprzeczytanych wiadomości pokoju: <strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Status nieprzeczytanych wiadomości pokoju: <strong>%(status)s</strong>, ilość: <strong>%(count)s</strong>",
     "Room status": "Status pokoju",
     "Failed to send event!": "Nie udało się wysłać wydarzenia!",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 9f0292303d..3523b19a9b 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -247,7 +247,7 @@
     "No display name": "Sem nome público de usuária(o)",
     "Uploading %(filename)s and %(count)s others|one": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "You must <a>register</a> to use this functionality": "Você deve <a>se registrar</a> para poder usar esta funcionalidade",
-    "Uploading %(filename)s and %(count)s others|zero": "Enviando o arquivo %(filename)s",
+    "Uploading %(filename)s": "Enviando o arquivo %(filename)s",
     "Admin Tools": "Ferramentas de Administração",
     "%(roomName)s does not exist.": "%(roomName)s não existe.",
     "(~%(count)s results)|other": "(~%(count)s resultados)",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index fc6a7cad44..047610f204 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -245,7 +245,7 @@
     "You have <a>enabled</a> URL previews by default.": "Você <a>ativou</a> pré-visualizações de links por padrão.",
     "Add": "Adicionar",
     "Home": "Home",
-    "Uploading %(filename)s and %(count)s others|zero": "Enviando o arquivo %(filename)s",
+    "Uploading %(filename)s": "Enviando o arquivo %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "Uploading %(filename)s and %(count)s others|other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "You must <a>register</a> to use this functionality": "Você deve <a>se registrar</a> para usar este recurso",
@@ -2412,7 +2412,6 @@
     "Use a more compact 'Modern' layout": "Usar um layout \"moderno\" mais compacto",
     "%(senderDisplayName)s changed the room avatar.": "%(senderDisplayName)s mudou a foto da sala.",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s e %(count)s outro",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s e %(count)s outros",
     "%(date)s at %(time)s": "%(date)s às %(time)s",
     "Experimental": "Experimental",
@@ -2694,7 +2693,7 @@
     "User is already invited to the space": "O usuário já foi convidado para o espaço",
     "You do not have permission to invite people to this space.": "Você não tem permissão para convidar pessoas para este espaço.",
     "In %(spaceName)s and %(count)s other spaces.|one": "Em %(spaceName)s e %(count)s outro espaço.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "No espaço %(spaceName)s.",
+    "In %(spaceName)s.": "No espaço %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "Em %(spaceName)s e %(count)s outros espaços.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Nos espaços %(space1Name)s e %(space2Name)s.",
     "Empty room (was %(oldName)s)": "Sala vazia (era %(oldName)s)",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 393094100a..4f53f13bcc 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -246,7 +246,7 @@
     "Create new room": "Создать комнату",
     "Start chat": "Отправить личное сообщение",
     "Add": "Добавить",
-    "Uploading %(filename)s and %(count)s others|zero": "Отправка %(filename)s",
+    "Uploading %(filename)s": "Отправка %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Отправка %(filename)s и %(count)s другой",
     "Uploading %(filename)s and %(count)s others|other": "Отправка %(filename)s и %(count)s других",
     "You must <a>register</a> to use this functionality": "Вы должны <a>зарегистрироваться</a>, чтобы использовать эту функцию",
@@ -2886,7 +2886,6 @@
     "Command error: Unable to handle slash command.": "Ошибка команды: невозможно обработать команду slash.",
     "Command error: Unable to find rendering type (%(renderingType)s)": "Ошибка команды: невозможно найти тип рендеринга (%(renderingType)s)",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s и %(count)s другой",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s и %(count)s других",
     "You cannot place calls without a connection to the server.": "Вы не можете совершать вызовы без подключения к серверу.",
     "Connectivity to the server has been lost": "Соединение с сервером потеряно",
@@ -2904,7 +2903,7 @@
     "Join %(roomAddress)s": "Присоединиться к %(roomAddress)s",
     "Feedback sent! Thanks, we appreciate it!": "Отзыв отправлен! Спасибо, мы ценим это!",
     "Export Cancelled": "Экспорт отменён",
-    "<%(count)s spaces>|zero": "<пустая строка>",
+    "<empty string>": "<пустая строка>",
     "<%(count)s spaces>|one": "<пространство>",
     "<%(count)s spaces>|other": "<%(count)s пространств>",
     "Results are only revealed when you end the poll": "Результаты отображаются только после завершения опроса",
@@ -3193,7 +3192,7 @@
     "Location not available": "Местоположение недоступно",
     "Find my location": "Найти моё местоположение",
     "Map feedback": "Карта отзывов",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "В пространстве %(spaceName)s.",
+    "In %(spaceName)s.": "В пространстве %(spaceName)s.",
     "Stop and close": "Остановить и закрыть",
     "Who will you chat to the most?": "С кем вы будете общаться чаще всего?",
     "Saved Items": "Сохранённые объекты",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 2df13a1eac..1397d2bc90 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -295,7 +295,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Pokus o načítanie konkrétneho bodu na časovej osi tejto miestnosti, ale nepodarilo sa ho nájsť.",
     "Failed to load timeline position": "Nepodarilo sa načítať pozíciu na časovej osi",
     "Uploading %(filename)s and %(count)s others|other": "Nahrávanie %(filename)s a %(count)s ďalších súborov",
-    "Uploading %(filename)s and %(count)s others|zero": "Nahrávanie %(filename)s",
+    "Uploading %(filename)s": "Nahrávanie %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Nahrávanie %(filename)s a %(count)s ďalší súbor",
     "Always show message timestamps": "Vždy zobrazovať časovú značku správ",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pri zobrazovaní časových značiek používať 12 hodinový formát (napr. 2:30pm)",
@@ -1472,7 +1472,6 @@
     "%(senderName)s banned %(targetName)s: %(reason)s": "%(senderName)s zakázal používateľa %(targetName)s: %(reason)s",
     "%(targetName)s accepted an invitation": "%(targetName)s prijal/a pozvanie",
     "Effects": "Efekty",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "You cannot place calls in this browser.": "V tomto prehliadači nie je možné uskutočňovať hovory.",
     "Calls are unsupported": "Volania nie sú podporované",
     "You're already in a call with this person.": "S touto osobou už hovor prebieha.",
@@ -2791,7 +2790,7 @@
     "Move left": "Presun doľava",
     "The export was cancelled successfully": "Export bol úspešne zrušený",
     "Size can only be a number between %(min)s MB and %(max)s MB": "Veľkosť môže byť len medzi %(min)s MB a %(max)s MB",
-    "<%(count)s spaces>|zero": "<prázdny reťazec>",
+    "<empty string>": "<prázdny reťazec>",
     "<%(count)s spaces>|one": "<priestor>",
     "<%(count)s spaces>|other": "<%(count)s priestorov>",
     "Fetched %(count)s events in %(seconds)ss|one": "Načítaná %(count)s udalosť za %(seconds)ss",
@@ -3191,7 +3190,7 @@
     "Map feedback": "Spätná väzba k mape",
     "Toggle attribution": "Prepínanie atribútu",
     "In %(spaceName)s and %(count)s other spaces.|one": "V %(spaceName)s a v %(count)s ďalšom priestore.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "V priestore %(spaceName)s.",
+    "In %(spaceName)s.": "V priestore %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "V %(spaceName)s a %(count)s ďalších priestoroch.",
     "In spaces %(space1Name)s and %(space2Name)s.": "V priestoroch %(space1Name)s a %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Príkaz pre vývojárov: Zruší aktuálnu reláciu odchádzajúcej skupiny a vytvorí nové relácie Olm",
@@ -3606,7 +3605,7 @@
     "Room is <strong>not encrypted 🚨</strong>": "Miestnosť <strong>nie je šifrovaná 🚨</strong>",
     "Room is <strong>encrypted ✅</strong>": "Miestnosť je <strong>šifrovaná ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Stav oznámenia je <strong>%(notificationState)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Stav neprečítaných v miestnosti: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Stav neprečítaných v miestnosti: <strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Stav neprečítaných v miestnosti: <strong>%(status)s</strong>, počet: <strong>%(count)s</strong>",
     "Ended a poll": "Ukončil anketu",
     "Due to decryption errors, some votes may not be counted": "Z dôvodu chýb v dešifrovaní sa niektoré hlasy nemusia započítať",
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 7eca5053a6..c06d28f763 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -268,7 +268,7 @@
     "No more results": "Jo më tepër përfundime",
     "Room": "Dhomë",
     "Uploading %(filename)s and %(count)s others|other": "Po ngarkohet %(filename)s dhe %(count)s të tjera",
-    "Uploading %(filename)s and %(count)s others|zero": "Po ngarkohet %(filename)s",
+    "Uploading %(filename)s": "Po ngarkohet %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Po ngarkohet %(filename)s dhe %(count)s tjetër",
     "Sign out": "Dilni",
     "Success": "Sukses",
@@ -2692,7 +2692,6 @@
     "Large": "E madhe",
     "Image size in the timeline": "Madhësi figure në rrjedhën kohore",
     "%(senderName)s has updated the room layout": "%(senderName)s ka përditësuar skemën e dhomës",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s dhe %(count)s tjetër",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s dhe %(count)s të tjerë",
     "Sorry, the poll you tried to create was not posted.": "Na ndjeni, anketimi që provuat të krijoni s’u postua dot.",
@@ -2905,7 +2904,7 @@
     "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s hoqi një mesazh",
     "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s hoqi %(count)s mesazhe",
     "Maximise": "Maksimizoje",
-    "<%(count)s spaces>|zero": "<varg i zbrazët>",
+    "<empty string>": "<varg i zbrazët>",
     "<%(count)s spaces>|one": "<hapësirë>",
     "<%(count)s spaces>|other": "<%(count)s hapësira>",
     "Automatically send debug logs when key backup is not functioning": "Dërgo automatikisht regjistra diagnostikimi, kur kopjeruajtja e kyçeve nuk funksionon",
@@ -3194,7 +3193,7 @@
     "Exit fullscreen": "Dil nga mënyra “Sa krejt ekrani”",
     "Enter fullscreen": "Kalo në mënyrën “Sa krejt ekrani”",
     "In %(spaceName)s and %(count)s other spaces.|one": "Në %(spaceName)s dhe %(count)s hapësirë tjetër.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "Në hapësirën %(spaceName)s.",
+    "In %(spaceName)s.": "Në hapësirën %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "Në %(spaceName)s dhe %(count)s hapësira të tjera.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Në hapësirat %(space1Name)s dhe %(space2Name)s.",
     "Completing set up of your new device": "Po plotësohet ujdisja e pajisjes tuaj të re",
@@ -3591,7 +3590,7 @@
     "Room is <strong>not encrypted 🚨</strong>": "Dhoma është <strong>e pafshehtëzuar 🚨</strong>",
     "Room is <strong>encrypted ✅</strong>": "Dhoma është <strong>e fshehtëzuar ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Gjendje njoftimi është <strong>%(notificationState)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Gjendje e palexuar në dhomë: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Gjendje e palexuar në dhomë: <strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Gjendje të palexuara në dhomë: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>",
     "Loading polls": "Po ngarkohen pyetësorë",
     "Enable '%(manageIntegrations)s' in Settings to do this.": "Që të bëni këtë, aktivizoni '%(manageIntegrations)s' te Rregullimet.",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 1a370279ef..88d8d2ae15 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -333,7 +333,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Покушао сам да учитам одређену тачку у временској линији ове собе али нисам могао да је нађем.",
     "Failed to load timeline position": "Нисам могао да учитам позицију у временској линији",
     "Uploading %(filename)s and %(count)s others|other": "Отпремам датотеку %(filename)s и још %(count)s других",
-    "Uploading %(filename)s and %(count)s others|zero": "Отпремам датотеку %(filename)s",
+    "Uploading %(filename)s": "Отпремам датотеку %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Отпремам датотеку %(filename)s и %(count)s других датотека",
     "Sign out": "Одјави ме",
     "Failed to change password. Is your password correct?": "Нисам успео да променим лозинку. Да ли је ваша лозинка тачна?",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 2c78c5a6a4..0169c79d0e 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -316,7 +316,7 @@
     "Code": "Kod",
     "This server does not support authentication with a phone number.": "Denna server stöder inte autentisering via telefonnummer.",
     "Uploading %(filename)s and %(count)s others|other": "Laddar upp %(filename)s och %(count)s till",
-    "Uploading %(filename)s and %(count)s others|zero": "Laddar upp %(filename)s",
+    "Uploading %(filename)s": "Laddar upp %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Laddar upp %(filename)s och %(count)s till",
     "This doesn't appear to be a valid email address": "Det här verkar inte vara en giltig e-postadress",
     "Verification Pending": "Avvaktar verifiering",
@@ -2667,7 +2667,6 @@
     "Own your conversations.": "Äg dina konversationer.",
     "%(senderName)s has updated the room layout": "%(senderName)s har uppdaterat rummets arrangemang",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s och %(count)s till",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s och %(count)s till",
     "Other rooms": "Andra rum",
     "You cannot place calls in this browser.": "Du kan inte ringa samtal i den här webbläsaren.",
@@ -2909,7 +2908,7 @@
     "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)stog bort ett meddelande",
     "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)stog bort %(count)s meddelanden",
     "Automatically send debug logs when key backup is not functioning": "Skicka automatiskt felsökningsloggar när nyckelsäkerhetskopiering inte funkar",
-    "<%(count)s spaces>|zero": "<tom sträng>",
+    "<empty string>": "<tom sträng>",
     "<%(count)s spaces>|one": "<mellanslag>",
     "<%(count)s spaces>|other": "<%(count)s mellanslag>",
     "Join %(roomAddress)s": "Gå med i %(roomAddress)s",
@@ -3181,7 +3180,7 @@
     "A new way to chat over voice and video in %(brand)s.": "Ett nytt sätt att chatta över röst och video i %(brand)s.",
     "Video rooms": "Videorum",
     "In %(spaceName)s and %(count)s other spaces.|one": "I %(spaceName)s och %(count)s annat utrymme.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "I utrymmet %(spaceName)s.",
+    "In %(spaceName)s.": "I utrymmet %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "I %(spaceName)s och %(count)s andra utrymmen.",
     "In spaces %(space1Name)s and %(space2Name)s.": "I utrymmena %(space1Name)s och %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Utvecklarkommando: Slänger den nuvarande utgående gruppsessionen och sätter upp nya Olm-sessioner",
@@ -3677,7 +3676,7 @@
     "Can't find the old version of this room (room ID: %(roomId)s), and we have not been provided with 'via_servers' to look for it.": "Kan inte hitta den gamla versionen av det här rummet (rums-ID: %(roomId)s), och vi har inte fått ”via_servers” för att leta efter det.",
     "Error details": "Feldetaljer",
     "Desktop app logo": "Skrivbordsappslogga",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Rummets oläst-status: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Rummets oläst-status: <strong>%(status)s</strong>",
     "Your device ID": "Ditt enhets-ID",
     "Message in %(room)s": "Meddelande i rum %(room)s",
     "Try using %(server)s": "Pröva att använda %(server)s",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index aa9ae32a05..9c2439d679 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -139,7 +139,7 @@
     "Unable to verify email address.": "ไม่สามารถยืนยันที่อยู่อีเมล",
     "Unban": "ปลดแบน",
     "Unable to enable Notifications": "ไม่สามารถเปิดใช้งานการแจ้งเตือน",
-    "Uploading %(filename)s and %(count)s others|zero": "กำลังอัปโหลด %(filename)s",
+    "Uploading %(filename)s": "กำลังอัปโหลด %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
     "Uploading %(filename)s and %(count)s others|other": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
     "Upload Failed": "การอัปโหลดล้มเหลว",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 406a4385a6..c307778929 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -173,7 +173,7 @@
     "unknown error code": "bilinmeyen hata kodu",
     "Unmute": "Sesi aç",
     "Unnamed Room": "İsimsiz Oda",
-    "Uploading %(filename)s and %(count)s others|zero": "%(filename)s yükleniyor",
+    "Uploading %(filename)s": "%(filename)s yükleniyor",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s ve %(count)s kadarı yükleniyor",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s ve %(count)s kadarları yükleniyor",
     "Upload avatar": "Avatar yükle",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 385a2372f0..a4486837ef 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -2000,7 +2000,6 @@
     "Rename": "Перейменувати",
     "The server is offline.": "Сервер вимкнено.",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s і %(count)s інших",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s і %(count)s інших",
     "Connectivity to the server has been lost": "Втрачено зʼєднання з сервером",
     "Calls are unsupported": "Виклики не підтримуються",
@@ -2582,7 +2581,7 @@
     "The email address linked to your account must be entered.": "Введіть е-пошту, прив'язану до вашого облікового запису.",
     "Really reset verification keys?": "Точно скинути ключі звірки?",
     "Uploading %(filename)s and %(count)s others|one": "Вивантаження %(filename)s і ще %(count)s",
-    "Uploading %(filename)s and %(count)s others|zero": "Вивантаження %(filename)s",
+    "Uploading %(filename)s": "Вивантаження %(filename)s",
     "Uploading %(filename)s and %(count)s others|other": "Вивантаження %(filename)s і ще %(count)s",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Зауважте, ви входите на сервер %(hs)s, не на matrix.org.",
     "Enter your Security Phrase a second time to confirm it.": "Введіть свою фразу безпеки ще раз для підтвердження.",
@@ -2910,7 +2909,7 @@
     "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)sвидаляють повідомлення",
     "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)sвидаляють %(count)s повідомлень",
     "Automatically send debug logs when key backup is not functioning": "Автоматично надсилати журнали зневадження при збоях резервного копіювання ключів",
-    "<%(count)s spaces>|zero": "<порожній рядок>",
+    "<empty string>": "<порожній рядок>",
     "<%(count)s spaces>|one": "<простір>",
     "<%(count)s spaces>|other": "<%(count)s просторів>",
     "Edit poll": "Редагувати опитування",
@@ -3191,7 +3190,7 @@
     "Map feedback": "Карта відгуку",
     "Toggle attribution": "Перемкнути атрибуцію",
     "In %(spaceName)s and %(count)s other spaces.|one": "У %(spaceName)s та %(count)s іншому просторі.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "У просторі %(spaceName)s.",
+    "In %(spaceName)s.": "У просторі %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "У %(spaceName)s та %(count)s інших пристроях.",
     "In spaces %(space1Name)s and %(space2Name)s.": "У просторах %(space1Name)s і %(space2Name)s.",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "Команда розробника: відкликає поточний сеанс вихідної групи та встановлює нові сеанси Olm",
@@ -3606,7 +3605,7 @@
     "Room is <strong>not encrypted 🚨</strong>": "Кімната <strong>не зашифрована 🚨</strong>",
     "Room is <strong>encrypted ✅</strong>": "Кімната <strong>зашифрована ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "Стан сповіщень <strong>%(notificationState)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "Стан непрочитаного в кімнаті: <strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "Стан непрочитаного в кімнаті: <strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "Стан непрочитаного в кімнаті: <strong>%(status)s</strong>, кількість: <strong>%(count)s</strong>",
     "Ended a poll": "Завершує опитування",
     "Due to decryption errors, some votes may not be counted": "Через помилки розшифрування деякі голоси можуть бути не враховані",
diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json
index 2d4acad0c1..03262caa5e 100644
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -2602,7 +2602,7 @@
     "Really reset verification keys?": "Thực sự đặt lại các khóa xác minh?",
     "Clear": "Xoá",
     "Uploading %(filename)s and %(count)s others|one": "Đang tải lên %(filename)s và %(count)s tập tin khác",
-    "Uploading %(filename)s and %(count)s others|zero": "Đang tải lên %(filename)s",
+    "Uploading %(filename)s": "Đang tải lên %(filename)s",
     "Uploading %(filename)s and %(count)s others|other": "Đang tải lên %(filename)s và %(count)s tập tin khác",
     "Show all threads": "Hiển thị tất cả chủ đề",
     "Keep discussions organised with threads": "Giữ các cuộc thảo luận được tổ chức với các chủ đề này",
@@ -2736,7 +2736,6 @@
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Khóa đăng nhập bạn cung cấp khớp với khóa đăng nhập bạn nhận từ thiết bị %(deviceId)s của %(userId)s. Thiết bị được đánh dấu là đã được xác minh.",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Sử dụng máy chủ định danh để mời qua thư điện tử. Bấm Tiếp tục để sử dụng máy chủ định danh mặc định (%(defaultIdentityServerName)s) hoặc quản lý trong Cài đặt.",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s và %(count)s khác",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s và %(count)s khác",
     "You cannot place calls without a connection to the server.": "Bạn không thể gọi khi không có kết nối tới máy chủ.",
     "Connectivity to the server has been lost": "Mất kết nối đến máy chủ",
@@ -2855,7 +2854,7 @@
     "User is already invited to the space": "Người dùng đã được mời vào space",
     "You do not have permission to invite people to this space.": "Bạn không có quyền để mời mọi người vào space này.",
     "In %(spaceName)s and %(count)s other spaces.|one": "Trong %(spaceName)s và %(count)s space khác.",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "Trong space %(spaceName)s.",
+    "In %(spaceName)s.": "Trong space %(spaceName)s.",
     "In %(spaceName)s and %(count)s other spaces.|other": "Trong %(spaceName)s và %(count)s space khác.",
     "In spaces %(space1Name)s and %(space2Name)s.": "Trong các space %(space1Name)s và %(space2Name)s.",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s và %(space2Name)s",
@@ -3338,7 +3337,7 @@
     "Start DM anyway and never warn me again": "Cứ tạo phòng nhắn tin riêng và đừng cảnh báo tôi nữa",
     "Your server lacks native support, you must specify a proxy": "Máy chủ của bạn không hỗ trợ, bạn cần chỉ định máy chủ ủy nhiệm (proxy)",
     "Some results may be hidden": "Một số kết quả có thể bị ẩn",
-    "<%(count)s spaces>|zero": "<chuỗi rỗng>",
+    "<empty string>": "<chuỗi rỗng>",
     "Waiting for partner to confirm…": "Đang đợi bên kia xác nhận…",
     "Enable '%(manageIntegrations)s' in Settings to do this.": "Bật '%(manageIntegrations)s' trong cài đặt để thực hiện.",
     "Answered elsewhere": "Trả lời ở nơi khác",
diff --git a/src/i18n/strings/vls.json b/src/i18n/strings/vls.json
index dfeb3aa8b1..de3076d5b0 100644
--- a/src/i18n/strings/vls.json
+++ b/src/i18n/strings/vls.json
@@ -806,7 +806,7 @@
     "Failed to load timeline position": "Loadn van tydslynpositie is mislukt",
     "Guest": "Gast",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s en %(count)s andere wordn ipgeloadn",
-    "Uploading %(filename)s and %(count)s others|zero": "%(filename)s wordt ipgeloadn",
+    "Uploading %(filename)s": "%(filename)s wordt ipgeloadn",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s ander wordn ipgeloadn",
     "Could not load user profile": "Kostege ’t gebruukersprofiel nie loadn",
     "The email address linked to your account must be entered.": "’t E-mailadresse da me joun account verboundn is moet ingegeevn wordn.",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 8f768267da..3aeb4b69b4 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -378,7 +378,7 @@
     "Old cryptography data detected": "检测到旧的加密数据",
     "Data from an older version of %(brand)s has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "已检测到旧版%(brand)s的数据，这将导致端到端加密在旧版本中发生故障。在此版本中，使用旧版本交换的端到端加密消息可能无法解密。这也可能导致与此版本交换的消息失败。如果你遇到问题，请登出并重新登录。要保留历史消息，请先导出并在重新登录后导入你的密钥。",
     "Uploading %(filename)s and %(count)s others|other": "正在上传 %(filename)s 与其他 %(count)s 个文件",
-    "Uploading %(filename)s and %(count)s others|zero": "正在上传 %(filename)s",
+    "Uploading %(filename)s": "正在上传 %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "正在上传 %(filename)s 与其他 %(count)s 个文件",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "请注意，你正在登录 %(hs)s，而非 matrix.org。",
     "Opens the Developer Tools dialog": "打开开发者工具窗口",
@@ -2693,7 +2693,6 @@
     "Image size in the timeline": "时间线中的图像大小",
     "%(senderName)s has updated the room layout": "%(senderName)s 更新了房间布局",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s 和其他 %(count)s 个空间",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s 和其他 %(count)s 个空间",
     "Based on %(count)s votes|one": "基于 %(count)s 票",
     "Based on %(count)s votes|other": "基于 %(count)s 票",
@@ -2811,7 +2810,7 @@
     "User is already invited to the space": "用户已被邀请至空间",
     "You do not have permission to invite people to this space.": "你无权邀请他人加入此空间。",
     "In %(spaceName)s and %(count)s other spaces.|one": "在 %(spaceName)s 和其他 %(count)s 个空间。",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "在 %(spaceName)s 空间。",
+    "In %(spaceName)s.": "在 %(spaceName)s 空间。",
     "In %(spaceName)s and %(count)s other spaces.|other": "在 %(spaceName)s 和其他 %(count)s 个空间。",
     "In spaces %(space1Name)s and %(space2Name)s.": "在 %(space1Name)s 和 %(space2Name)s 空间。",
     "%(space1Name)s and %(space2Name)s": "%(space1Name)s 与 %(space2Name)s",
@@ -3089,7 +3088,7 @@
     "Client Versions": "客户端版本",
     "Failed to load.": "载入失败。",
     "Send custom state event": "发送自定义状态事件",
-    "<%(count)s spaces>|zero": "<空字符串>",
+    "<empty string>": "<空字符串>",
     "<%(count)s spaces>|one": "<空间>",
     "<%(count)s spaces>|other": "<%(count)s个空间>",
     "Failed to send event!": "发送事件失败！",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index f5153420c9..f2fddcde05 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -191,7 +191,7 @@
     "Unban": "解除封鎖",
     "Unmute": "解除靜音",
     "Unnamed Room": "未命名的聊天室",
-    "Uploading %(filename)s and %(count)s others|zero": "正在上傳 %(filename)s",
+    "Uploading %(filename)s": "正在上傳 %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "正在上傳 %(filename)s 與另 %(count)s 個檔案",
     "Uploading %(filename)s and %(count)s others|other": "正在上傳 %(filename)s 與另 %(count)s 個檔案",
     "Upload avatar": "上傳大頭照",
@@ -2697,7 +2697,6 @@
     "%(count)s votes|one": "%(count)s 個投票",
     "%(count)s votes|other": "%(count)s 個投票",
     "%(spaceName)s and %(count)s others|one": "%(spaceName)s 與 %(count)s 個其他的",
-    "%(spaceName)s and %(count)s others|zero": "%(spaceName)s",
     "%(spaceName)s and %(count)s others|other": "%(spaceName)s 與 %(count)s 個其他的",
     "Sorry, the poll you tried to create was not posted.": "抱歉，您嘗試建立的投票並未發佈。",
     "Failed to post poll": "張貼投票失敗",
@@ -2910,7 +2909,7 @@
     "%(severalUsers)sremoved a message %(count)s times|one": "%(severalUsers)s 移除了 1 個訊息",
     "%(severalUsers)sremoved a message %(count)s times|other": "%(severalUsers)s 移除了 %(count)s 個訊息",
     "Automatically send debug logs when key backup is not functioning": "金鑰備份無法運作時，自動傳送除錯紀錄檔",
-    "<%(count)s spaces>|zero": "<空字串>",
+    "<empty string>": "<空字串>",
     "<%(count)s spaces>|one": "<空間>",
     "<%(count)s spaces>|other": "<%(count)s 個空間>",
     "Join %(roomAddress)s": "加入 %(roomAddress)s",
@@ -3191,7 +3190,7 @@
     "Map feedback": "地圖回饋",
     "Toggle attribution": "切換屬性",
     "In %(spaceName)s and %(count)s other spaces.|one": "在 %(spaceName)s 與 %(count)s 個其他空間。",
-    "In %(spaceName)s and %(count)s other spaces.|zero": "在空間 %(spaceName)s。",
+    "In %(spaceName)s.": "在空間 %(spaceName)s。",
     "In %(spaceName)s and %(count)s other spaces.|other": "在 %(spaceName)s 與 %(count)s 個其他空間。",
     "In spaces %(space1Name)s and %(space2Name)s.": "在聊天空間 %(space1Name)s 與 %(space2Name)s。",
     "Developer command: Discards the current outbound group session and sets up new Olm sessions": "開發者指令：丟棄目前外傳的群組工作階段，並設定新的 Olm 工作階段",
@@ -3606,7 +3605,7 @@
     "Room is <strong>not encrypted 🚨</strong>": "聊天室<strong>未加密 🚨</strong>",
     "Room is <strong>encrypted ✅</strong>": "聊天室<strong>已加密 ✅</strong>",
     "Notification state is <strong>%(notificationState)s</strong>": "通知狀態為 <strong>%(notificationState)s</strong>",
-    "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|zero": "聊天室未讀狀態：<strong>%(status)s</strong>",
+    "Room unread status: <strong>%(status)s</strong>": "聊天室未讀狀態：<strong>%(status)s</strong>",
     "Room unread status: <strong>%(status)s</strong>, count: <strong>%(count)s</strong>|other": "聊天室未讀狀態：<strong>%(status)s</strong>，數量：<strong>%(count)s</strong>",
     "Ended a poll": "投票已結束",
     "Due to decryption errors, some votes may not be counted": "因為解密錯誤，不會計算部份投票",
diff --git a/src/utils/i18n-helpers.ts b/src/utils/i18n-helpers.ts
index 1e43741aa9..815f0b4d18 100644
--- a/src/utils/i18n-helpers.ts
+++ b/src/utils/i18n-helpers.ts
@@ -43,11 +43,17 @@ export function roomContextDetails(room: Room): RoomContextDetails | null {
             ariaLabel: _t("In spaces %(space1Name)s and %(space2Name)s.", { space1Name, space2Name }),
         };
     } else if (parent) {
-        const spaceName = room.client.getRoom(parent)?.name;
+        const spaceName = room.client.getRoom(parent)?.name ?? "";
         const count = otherParents.length;
+        if (count > 0) {
+            return {
+                details: _t("%(spaceName)s and %(count)s others", { spaceName, count }),
+                ariaLabel: _t("In %(spaceName)s and %(count)s other spaces.", { spaceName, count }),
+            };
+        }
         return {
-            details: _t("%(spaceName)s and %(count)s others", { spaceName, count }),
-            ariaLabel: _t("In %(spaceName)s and %(count)s other spaces.", { spaceName, count }),
+            details: spaceName,
+            ariaLabel: _t("In %(spaceName)s.", { spaceName }),
         };
     }
 
diff --git a/test/components/structures/UploadBar-test.tsx b/test/components/structures/UploadBar-test.tsx
new file mode 100644
index 0000000000..b5ba146667
--- /dev/null
+++ b/test/components/structures/UploadBar-test.tsx
@@ -0,0 +1,52 @@
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import { render } from "@testing-library/react";
+import { jest } from "@jest/globals";
+import { Room } from "matrix-js-sdk/src/matrix";
+
+import { stubClient } from "../../test-utils";
+import ContentMessages from "../../../src/ContentMessages";
+import { RoomUpload } from "../../../src/models/RoomUpload";
+import UploadBar from "../../../src/components/structures/UploadBar";
+
+describe("UploadBar", () => {
+    const client = stubClient();
+    const room = new Room("!room;server", client, client.getSafeUserId());
+
+    it("should pluralise 5 files correctly", () => {
+        jest.spyOn(ContentMessages.sharedInstance(), "getCurrentUploads").mockReturnValue([
+            new RoomUpload(room.roomId, "file1.jpg", undefined, 420),
+            new RoomUpload(room.roomId, "file2"),
+            new RoomUpload(room.roomId, "file3"),
+            new RoomUpload(room.roomId, "file4"),
+            new RoomUpload(room.roomId, "file5"),
+        ]);
+
+        const { getByText } = render(<UploadBar room={room} />);
+        expect(getByText("Uploading file1.jpg and 4 others (420 B)")).toBeInTheDocument();
+    });
+
+    it("should render a single upload correctly", () => {
+        jest.spyOn(ContentMessages.sharedInstance(), "getCurrentUploads").mockReturnValue([
+            new RoomUpload(room.roomId, "file1.zip", undefined, 420000000),
+        ]);
+
+        const { getByText } = render(<UploadBar room={room} />);
+        expect(getByText("Uploading file1.zip (400.54 MB)")).toBeInTheDocument();
+    });
+});
diff --git a/test/utils/i18n-helpers-test.ts b/test/utils/i18n-helpers-test.ts
new file mode 100644
index 0000000000..3e120588d2
--- /dev/null
+++ b/test/utils/i18n-helpers-test.ts
@@ -0,0 +1,62 @@
+/*
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Room } from "matrix-js-sdk/src/matrix";
+import { mocked } from "jest-mock";
+
+import SpaceStore from "../../src/stores/spaces/SpaceStore";
+import { stubClient } from "../test-utils";
+import { roomContextDetails } from "../../src/utils/i18n-helpers";
+import DMRoomMap from "../../src/utils/DMRoomMap";
+
+describe("roomContextDetails", () => {
+    const client = stubClient();
+    DMRoomMap.makeShared(client);
+
+    const room = new Room("!room:server", client, client.getSafeUserId());
+    const parent1 = new Room("!parent1:server", client, client.getSafeUserId());
+    parent1.name = "Alpha";
+    const parent2 = new Room("!parent2:server", client, client.getSafeUserId());
+    parent2.name = "Beta";
+    const parent3 = new Room("!parent3:server", client, client.getSafeUserId());
+    parent3.name = "Charlie";
+    mocked(client.getRoom).mockImplementation((roomId) => {
+        return [parent1, parent2, parent3].find((r) => r.roomId === roomId) ?? null;
+    });
+
+    it("should return 1-parent variant", () => {
+        jest.spyOn(SpaceStore.instance, "getKnownParents").mockReturnValue(new Set([parent1.roomId]));
+        const res = roomContextDetails(room);
+        expect(res!.details).toMatchInlineSnapshot(`"Alpha"`);
+        expect(res!.ariaLabel).toMatchInlineSnapshot(`"In Alpha."`);
+    });
+
+    it("should return 2-parent variant", () => {
+        jest.spyOn(SpaceStore.instance, "getKnownParents").mockReturnValue(new Set([parent2.roomId, parent3.roomId]));
+        const res = roomContextDetails(room);
+        expect(res!.details).toMatchInlineSnapshot(`"Beta and Charlie"`);
+        expect(res!.ariaLabel).toMatchInlineSnapshot(`"In spaces Beta and Charlie."`);
+    });
+
+    it("should return n-parent variant", () => {
+        jest.spyOn(SpaceStore.instance, "getKnownParents").mockReturnValue(
+            new Set([parent1.roomId, parent2.roomId, parent3.roomId]),
+        );
+        const res = roomContextDetails(room);
+        expect(res!.details).toMatchInlineSnapshot(`"Alpha and 1 other"`);
+        expect(res!.ariaLabel).toMatchInlineSnapshot(`"In Alpha and 1 other space."`);
+    });
+});