Fix plurals in translations

Weblate doesn't understand counterpart's multi-level format for
plurals and helpfully mangles them to be dot-separated keys when it
saves the translation file. Store the source files with pipe
separators and convert to counterpart format at build time.

src/i18n/strings/de_DE.json

@@ -552,8 +552,8 @@
     "Failed to forget room %(errCode)s": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s",
     "Failed to join the room": "Fehler beim Betreten des Raumes",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Eine Textnachricht wurde an +%(msisdn)s gesendet. Bitte den darin enthaltenen Verifizierungscode eingeben",
-    "and %(count)s others....other": "und %(count)s weitere...",
+    "and %(count)s others...|other": "und %(count)s weitere...",
-    "and %(count)s others....one": "und ein(e) weitere(r)...",
+    "and %(count)s others...|one": "und ein(e) weitere(r)...",
     "Are you sure?": "Bist du sicher?",
     "Attachment": "Anhang",
     "Ban": "Verbannen",
@@ -877,15 +877,15 @@
     "Start new chat": "Neuen Chat starten",
     "Disable markdown formatting": "Markdown-Formatierung deaktivieren",
     "Add": "Hinzufügen",
-    "%(count)s new messages.one": "%(count)s neue Nachricht",
+    "%(count)s new messages|one": "%(count)s neue Nachricht",
-    "%(count)s new messages.other": "%(count)s neue Nachrichten",
+    "%(count)s new messages|other": "%(count)s neue Nachrichten",
     "Error: Problem communicating with the given homeserver.": "Fehler: Problem bei der Kommunikation mit dem angegebenen Home-Server.",
     "Failed to fetch avatar URL": "Abrufen der Avatar-URL fehlgeschlagen",
     "The phone number entered looks invalid": "Die eingegebene Telefonnummer scheint ungültig zu sein",
     "This room is private or inaccessible to guests. You may be able to join if you register.": "Dieser Raum ist privat oder für Gäste nicht betretbar. Du kannst evtl. beitreten wenn du dich registrierst.",
-    "Uploading %(filename)s and %(count)s others.zero": "%(filename)s wird hochgeladen",
+    "Uploading %(filename)s and %(count)s others|zero": "%(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|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",
+    "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",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Alle erneut senden</a> oder <a>alle verwerfen</a>. Du kannst auch einzelne Nachrichten erneut senden oder verwerfen.",
     "Create new room": "Neuen Raum erstellen",
@@ -961,8 +961,8 @@
     "You have been kicked from %(roomName)s by %(userName)s.": "Du wurdest von %(userName)s aus dem Raum \"%(roomName)s\" gekickt.",
     "You may wish to login with a different account, or add this email to this account.": "Du möchtest dich eventuell mit einem anderen Konto anmelden oder alternativ diese E-Mail-Adresse diesem Konto hinzufügen.",
     "Your home server does not support device management.": "Dein Heimserver unterstützt kein Geräte-Management.",
-    "(~%(count)s results).one": "(~%(count)s Ergebnis)",
+    "(~%(count)s results)|one": "(~%(count)s Ergebnis)",
-    "(~%(count)s results).other": "(~%(count)s Ergebnis)",
+    "(~%(count)s results)|other": "(~%(count)s Ergebnis)",
     "Device Name": "Geräte-Name",
     "(could not connect media)": "(Medienverbindung konnte nicht hergestellt werden)",
     "(no answer)": "(keine Antwort)",

src/i18n/strings/el.json

@@ -175,10 +175,8 @@
     "an address": "μία διεύθηνση",
     "%(items)s and %(remaining)s others": "%(items)s και %(remaining)s ακόμα",
     "%(items)s and one other": "%(items)s και ένας ακόμα",
-    "and %(count)s others...": {
+    "and %(count)s others...|one": "και ένας ακόμα...",
-        "other": "και %(count)s άλλοι...",
+    "and %(count)s others...|other": "και %(count)s άλλοι...",
-        "one": "και ένας ακόμα..."
-    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s και %(lastPerson)s γράφουν",
     "%(names)s and one other are typing": "%(names)s και ένας ακόμα γράφουν",
     "%(names)s and %(count)s others are typing": "%(names)s και %(count)s άλλοι γράφουν",
@@ -405,8 +403,8 @@
     "click to reveal": "κάντε κλικ για εμφάνιση",
     "Click to unmute video": "Κάντε κλικ για άρση σίγασης του βίντεο",
     "Click to unmute audio": "Κάντε κλικ για άρση σίγασης του ήχου",
-    "%(count)s new messages.one": "%(count)s νέο μήνυμα",
+    "%(count)s new messages|one": "%(count)s νέο μήνυμα",
-    "%(count)s new messages.other": "%(count)s νέα μηνύματα",
+    "%(count)s new messages|other": "%(count)s νέα μηνύματα",
     "Custom": "Προσαρμοσμένο",
     "Decline": "Απόρριψη",
     "Disable Notifications": "Απενεργοποίηση ειδοποιήσεων",
@@ -569,8 +567,8 @@
     "Encrypt room": "Κρυπτογράφηση δωματίου",
     "Room": "Δωμάτιο",
     "Auto-complete": "Αυτόματη συμπλήρωση",
-    "(~%(count)s results).one": "(~%(count)s αποτέλεσμα)",
+    "(~%(count)s results)|one": "(~%(count)s αποτέλεσμα)",
-    "(~%(count)s results).other": "(~%(count)s αποτελέσματα)",
+    "(~%(count)s results)|other": "(~%(count)s αποτελέσματα)",
     "Active call": "Ενεργή κλήση",
     "strike": "επιγράμμιση",
     "bullet": "κουκκίδα",
@@ -719,8 +717,8 @@
     "to start a chat with someone": "για να ξεκινήσετε μια συνομιλία με κάποιον",
     "Unable to capture screen": "Αδυναμία σύλληψης οθόνης",
     "Unknown (user, device) pair:": "Άγνωστο ζεύγος (χρήστη, συσκευής):",
-    "Uploading %(filename)s and %(count)s others.zero": "Γίνεται αποστολή του %(filename)s",
+    "Uploading %(filename)s and %(count)s others|zero": "Γίνεται αποστολή του %(filename)s",
-    "Uploading %(filename)s and %(count)s others.other": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπων",
+    "Uploading %(filename)s and %(count)s others|other": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπων",
     "uploaded a file": "ανέβασε ένα αρχείο",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (δύναμη %(powerLevelNumber)s)",
     "Verification Pending": "Εκκρεμεί επιβεβαίωση",
@@ -820,7 +818,7 @@
     "to tag direct chat": "για να οριστεί ετικέτα σε απευθείας συνομιλία",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "Ο %(senderName)s ενεργοποίησε την από άκρο σε άκρο κρυπτογράφηση (algorithm %(algorithm)s).",
     "Undecryptable": "Μη αποκρυπτογραφημένο",
-    "Uploading %(filename)s and %(count)s others.one": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπα",
+    "Uploading %(filename)s and %(count)s others|one": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπα",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Θα θέλατε να <acceptText>δεχθείτε</acceptText> ή να <declineText>απορρίψετε</declineText> την πρόσκληση;",
     "You already have existing direct chats with this user:": "Έχετε ήδη απευθείας συνομιλίες με τον χρήστη:",
     "You are trying to access %(roomName)s.": "Προσπαθείτε να έχετε πρόσβαση στο %(roomName)s.",

src/i18n/strings/en_EN.json

@@ -158,10 +158,8 @@
     "%(items)s and %(remaining)s others": "%(items)s and %(remaining)s others",
     "%(items)s and one other": "%(items)s and one other",
     "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
-    "and %(count)s others...": {
+    "and %(count)s others...|other": "and %(count)s others...",
-        "other": "and %(count)s others...",
+    "and %(count)s others...|one": "and one other...",
-        "one": "and one other..."
-    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
     "%(names)s and one other are typing": "%(names)s and one other are typing",
     "%(names)s and %(count)s others are typing": "%(names)s and %(count)s others are typing",
@@ -224,10 +222,8 @@
     "Confirm your new password": "Confirm your new password",
     "Continue": "Continue",
     "Could not connect to the integration server": "Could not connect to the integration server",
-    "%(count)s new messages": {
+    "%(count)s new messages|one": "%(count)s new message",
-        "one": "%(count)s new message",
+    "%(count)s new messages|other": "%(count)s new messages",
-        "other": "%(count)s new messages"
-    },
     "Create a new chat or reuse an existing one": "Create a new chat or reuse an existing one",
     "Create an account": "Create an account",
     "Create Room": "Create Room",
@@ -627,11 +623,9 @@
     "Unrecognised command:": "Unrecognised command:",
     "Unrecognised room alias:": "Unrecognised room alias:",
     "Unverified": "Unverified",
-    "Uploading %(filename)s and %(count)s others": {
+    "Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
-        "zero": "Uploading %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
-        "one": "Uploading %(filename)s and %(count)s other",
+    "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
-        "other": "Uploading %(filename)s and %(count)s others"
-    },
     "uploaded a file": "uploaded a file",
     "Upload avatar": "Upload avatar",
     "Upload Failed": "Upload Failed",
@@ -749,10 +743,8 @@
     "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
     "Auto-complete": "Auto-complete",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
-    "(~%(count)s results)": {
+    "(~%(count)s results)|one": "(~%(count)s result)",
-        "one": "(~%(count)s result)",
+    "(~%(count)s results)|other": "(~%(count)s results)",
-        "other": "(~%(count)s results)"
-    },
     "Cancel": "Cancel",
     "or": "or",
     "Active call": "Active call",

src/i18n/strings/en_US.json

@@ -154,8 +154,8 @@
     "%(items)s and %(remaining)s others": "%(items)s and %(remaining)s others",
     "%(items)s and one other": "%(items)s and one other",
     "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
-    "and %(count)s others....other": "and %(count)s others...",
+    "and %(count)s others...|other": "and %(count)s others...",
-    "and %(count)s others....one": "and one other...",
+    "and %(count)s others...|one": "and one other...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
     "%(names)s and one other are typing": "%(names)s and one other are typing",
     "%(names)s and %(count)s others are typing": "%(names)s and %(count)s others are typing",
@@ -841,8 +841,8 @@
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
     "<a>Click here</a> to join the discussion!": "<a>Click here</a> to join the discussion!",
     "Close": "Close",
-    "%(count)s new messages.one": "%(count)s new message",
+    "%(count)s new messages|one": "%(count)s new message",
-    "%(count)s new messages.other": "%(count)s new messages",
+    "%(count)s new messages|other": "%(count)s new messages",
     "Custom": "Custom",
     "Decline": "Decline",
     "Disable markdown formatting": "Disable markdown formatting",
@@ -893,9 +893,9 @@
     "unknown caller": "unknown caller",
     "Unnamed Room": "Unnamed Room",
     "Unverified": "Unverified",
-    "Uploading %(filename)s and %(count)s others.zero": "Uploading %(filename)s",
+    "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 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",
+    "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
     "Upload new:": "Upload new:",
     "%(user)s is a": "%(user)s is a",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
@@ -909,8 +909,8 @@
     "You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
     "Your home server does not support device management.": "Your home server does not support device management.",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
-    "(~%(count)s results).one": "(~%(count)s result)",
+    "(~%(count)s results)|one": "(~%(count)s result)",
-    "(~%(count)s results).other": "(~%(count)s results)",
+    "(~%(count)s results)|other": "(~%(count)s results)",
     "New Password": "New Password",
     "Device Name": "Device Name",
     "Start chatting": "Start chatting",

src/i18n/strings/es.json

@@ -140,8 +140,8 @@
     "%(items)s and %(remaining)s others": "%(items)s y %(remaining)s otros",
     "%(items)s and one other": "%(items)s y otro",
     "%(items)s and %(lastItem)s": "%(items)s y %(lastItem)s",
-    "and %(count)s others....other": "y %(count)s otros...",
+    "and %(count)s others...|other": "y %(count)s otros...",
-    "and %(count)s others....one": "y otro...",
+    "and %(count)s others...|one": "y otro...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s y %(lastPerson)s están escribiendo",
     "%(names)s and one other are typing": "%(names)s y otro están escribiendo",
     "%(names)s and %(count)s others are typing": "%(names)s y %(count)s otros están escribiendo",
@@ -341,8 +341,8 @@
     "Anyone": "Cualquiera",
     "<a>Click here</a> to join the discussion!": "¡<a>Pulse aquí</a> para unirse a la conversación!",
     "Close": "Cerrar",
-    "%(count)s new messages.one": "%(count)s mensaje nuevo",
+    "%(count)s new messages|one": "%(count)s mensaje nuevo",
-    "%(count)s new messages.other": "%(count)s mensajes nuevos",
+    "%(count)s new messages|other": "%(count)s mensajes nuevos",
     "Create a new chat or reuse an existing one": "Cree una nueva conversación o reutilice una existente",
     "Custom": "Personalizado",
     "Custom level": "Nivel personalizado",
@@ -688,9 +688,9 @@
     "unknown": "desconocido",
     "Unnamed Room": "Sala sin nombre",
     "Unverified": "Sin verificar",
-    "Uploading %(filename)s and %(count)s others.zero": "Subiendo %(filename)s",
+    "Uploading %(filename)s and %(count)s others|zero": "Subiendo %(filename)s",
-    "Uploading %(filename)s and %(count)s others.one": "Subiendo %(filename)s y %(count)s otros",
+    "Uploading %(filename)s and %(count)s others|one": "Subiendo %(filename)s y %(count)s otros",
-    "Uploading %(filename)s and %(count)s others.other": "Subiendo %(filename)s y %(count)s otros",
+    "Uploading %(filename)s and %(count)s others|other": "Subiendo %(filename)s y %(count)s otros",
     "Upload avatar": "Subir avatar",
     "Upload Failed": "Error al subir",
     "Upload Files": "Subir archivos",

src/i18n/strings/eu.json

@@ -337,8 +337,8 @@
     "Confirm password": "Berretsi pasahitza",
     "Conference calls are not supported in this client": "Bezero honek ez ditu konferentzia deiak onartzen",
     "Could not connect to the integration server": "Ezin izan da integrazio zerbitzarira konektatu",
-    "%(count)s new messages.one": "mezu berri %(count)s",
+    "%(count)s new messages|one": "mezu berri %(count)s",
-    "%(count)s new messages.other": "%(count)s mezu berri",
+    "%(count)s new messages|other": "%(count)s mezu berri",
     "Create a new chat or reuse an existing one": "Sortu txat berria edo berrerabili aurreko bat",
     "Create an account": "Sortu kontua",
     "Create Room": "Sortu gela",
@@ -647,9 +647,9 @@
     "Unrecognised command:": "Agindu ezezaguna:",
     "Unrecognised room alias:": "Gelaren ezizen ezezaguna:",
     "Unverified": "Egiaztatu gabea",
-    "Uploading %(filename)s and %(count)s others.zero": "%(filename)s igotzen",
+    "Uploading %(filename)s and %(count)s others|zero": "%(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|one": "%(filename)s eta beste %(count)s igotzen",
-    "Uploading %(filename)s and %(count)s others.other": "%(filename)s eta beste %(count)s igotzen",
+    "Uploading %(filename)s and %(count)s others|other": "%(filename)s eta beste %(count)s igotzen",
     "uploaded a file": "fitxategi bat igo du",
     "Upload avatar": "Igo abatarra",
     "Upload Failed": "Igoerak huts egin du",
@@ -754,8 +754,8 @@
     "Sent messages will be stored until your connection has returned.": "Bidalitako mezuak zure konexioa berreskuratu arte gordeko dira.",
     "Auto-complete": "Osatze automatikoa",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Birbidali guztiak</a> edo <a>baztertu guztiak</a> orain. Mezuak banaka aukeratu ditzakezu ere birbidali ala baztertzeko.",
-    "(~%(count)s results).one": "(~%(count)s emaitza)",
+    "(~%(count)s results)|one": "(~%(count)s emaitza)",
-    "(~%(count)s results).other": "(~%(count)s emaitza)",
+    "(~%(count)s results)|other": "(~%(count)s emaitza)",
     "bold": "lodia",
     "italic": "etzana",
     "strike": "marratua",
@@ -916,8 +916,8 @@
     "Disable Peer-to-Peer for 1:1 calls": "Desgaitu P2P biren arteko deietan",
     "Add a widget": "Gehitu trepeta bat",
     "Allow": "Baimendu",
-    "and %(count)s others....other": "eta beste %(count)s...",
+    "and %(count)s others...|other": "eta beste %(count)s...",
-    "and %(count)s others....one": "eta beste bat...",
+    "and %(count)s others...|one": "eta beste bat...",
     "Cannot add any more widgets": "Ezin dira trepeta gehiago gehitu",
     "Changes colour scheme of current room": "Gela honen kolore eskema aldatzen du",
     "Delete widget": "Ezabatu trepeta",

src/i18n/strings/fr.json

@@ -191,8 +191,8 @@
     "%(names)s and %(lastPerson)s are typing": "%(names)s et %(lastPerson)s sont en train d'écrire",
     "%(names)s and one other are typing": "%(names)s et un autre sont en train d'écrire",
     "%(names)s and %(count)s others are typing": "%(names)s et %(count)s d'autres sont en train d'écrire",
-    "and %(count)s others....other": "et %(count)s autres...",
+    "and %(count)s others...|other": "et %(count)s autres...",
-    "and %(count)s others....one": "et un autre...",
+    "and %(count)s others...|one": "et un autre...",
     "An email has been sent to": "Un e-mail a été envoyé à",
     "A new password must be entered.": "Un nouveau mot de passe doit être entré.",
     "Anyone who knows the room's link, apart from guests": "Tout ceux qui connaissent le lien du salon, à part les visiteurs",
@@ -822,16 +822,16 @@
     "You have entered an invalid contact. Try using their Matrix ID or email address.": "Vous avez entré un contact invalide. Essayez d’utiliser leur identifiant Matrix ou leur adresse email.",
     "Hide removed messages": "Cacher les messages supprimés",
     "Add": "Ajouter",
-    "%(count)s new messages.one": "%(count)s nouveau message",
+    "%(count)s new messages|one": "%(count)s nouveau message",
-    "%(count)s new messages.other": "%(count)s nouveaux messages",
+    "%(count)s new messages|other": "%(count)s nouveaux messages",
     "Disable markdown formatting": "Désactiver le formattage markdown",
     "Error: Problem communicating with the given homeserver.": "Erreur : problème de communication avec le homeserver.",
     "Failed to fetch avatar URL": "Échec lors de la récupération de l’URL de l’avatar",
     "The phone number entered looks invalid": "Le numéro de téléphone entré semble être invalide",
     "This room is private or inaccessible to guests. You may be able to join if you register.": "Ce salon est privé ou interdits aux visiteurs. Vous pourrez peut-être le joindre si vous vous enregistrez.",
-    "Uploading %(filename)s and %(count)s others.zero": "Téléchargement de %(filename)s",
+    "Uploading %(filename)s and %(count)s others|zero": "Téléchargement de %(filename)s",
-    "Uploading %(filename)s and %(count)s others.one": "Téléchargement de %(filename)s et %(count)s autre",
+    "Uploading %(filename)s and %(count)s others|one": "Téléchargement de %(filename)s et %(count)s autre",
-    "Uploading %(filename)s and %(count)s others.other": "Téléchargement de %(filename)s et %(count)s autres",
+    "Uploading %(filename)s and %(count)s others|other": "Téléchargement 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é",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Tout renvoyer</a> ou <a>tout annuler</a> maintenant. Vous pouvez aussi sélectionner des messages individuels à envoyer ou annuler.",
     "Create new room": "Créer un nouveau salon",
@@ -895,8 +895,8 @@
     "You have been kicked from %(roomName)s by %(userName)s.": "Vous avez été expulsé de %(roomName)s by %(userName)s.",
     "You may wish to login with a different account, or add this email to this account.": "Vous souhaiteriez peut-être vous identifier avec un autre compte, ou ajouter cette e-mail à votre compte.",
     "Your home server does not support device management.": "Votre homeserver ne supporte pas la gestion d'appareils.",
-    "(~%(count)s results).one": "(~%(count)s résultat)",
+    "(~%(count)s results)|one": "(~%(count)s résultat)",
-    "(~%(count)s results).other": "(~%(count)s résultats)",
+    "(~%(count)s results)|other": "(~%(count)s résultats)",
     "Device Name": "Nom de l'appareil",
     "Encrypted by a verified device": "Chiffré par un appareil vérifié",
     "Encrypted by an unverified device": "Chiffré par un appareil non vérifié",

src/i18n/strings/hu.json

@@ -190,8 +190,8 @@
     "%(items)s and %(remaining)s others": "%(items)s és még: %(remaining)s",
     "%(items)s and one other": "%(items)s és még egy",
     "%(items)s and %(lastItem)s": "%(items)s és %(lastItem)s",
-    "and %(count)s others....other": "és még: %(count)s ...",
+    "and %(count)s others...|other": "és még: %(count)s ...",
-    "and %(count)s others....one": "és még egy...",
+    "and %(count)s others...|one": "és még egy...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s és %(lastPerson)s írnak",
     "%(names)s and one other are typing": "%(names)s és még valaki ír",
     "%(names)s and %(count)s others are typing": "%(names)s és %(count)s ember ír",
@@ -250,8 +250,8 @@
     "Confirm password": "Jelszó megerősítése",
     "Confirm your new password": "Új jelszó megerősítése",
     "Could not connect to the integration server": "Az integrációs szerverhez nem lehet kapcsolódni",
-    "%(count)s new messages.one": "%(count)s új üzenet",
+    "%(count)s new messages|one": "%(count)s új üzenet",
-    "%(count)s new messages.other": "%(count)s új üzenet",
+    "%(count)s new messages|other": "%(count)s új üzenet",
     "Create a new chat or reuse an existing one": "Új csevegés indítása vagy egy meglévő használata",
     "Create an account": "Fiók készítése",
     "Create Room": "Szoba készítése",
@@ -610,9 +610,9 @@
     "Unrecognised command:": "Ismeretlen parancs:",
     "Unrecognised room alias:": "Ismeretlen szoba becenév:",
     "Unverified": "Nem ellenőrzött",
-    "Uploading %(filename)s and %(count)s others.zero": "%(filename)s feltöltése",
+    "Uploading %(filename)s and %(count)s others|zero": "%(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|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",
+    "Uploading %(filename)s and %(count)s others|other": "%(filename)s és még %(count)s db másik feltöltése",
     "uploaded a file": "fájl feltöltése",
     "Upload avatar": "Avatar kép feltöltése",
     "Upload Failed": "Feltöltés sikertelen",
@@ -729,8 +729,8 @@
     "Sent messages will be stored until your connection has returned.": "Az elküldött üzenetek addig lesznek tárolva amíg a kapcsolatod újra elérhető lesz.",
     "Auto-complete": "Automatikus kiegészítés",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "Most <a>újraküldöd mind</a> vagy <a>eldobod mind</a>. Újraküldésre vagy eldobásra egyenként is kiválaszthatod az üzeneteket.",
-    "(~%(count)s results).one": "(~%(count)s db eredmény)",
+    "(~%(count)s results)|one": "(~%(count)s db eredmény)",
-    "(~%(count)s results).other": "(~%(count)s db eredmény)",
+    "(~%(count)s results)|other": "(~%(count)s db eredmény)",
     "or": "vagy",
     "Active call": "Folyamatban lévő hívás",
     "bold": "félkövér",

src/i18n/strings/ja.json

@@ -44,8 +44,8 @@
     "Only people who have been invited": "この部屋に招待された人のみ参加可能",
     "Hide removed messages": "削除された発言の印を表示しない",
     "Always show message timestamps": "発言時刻を常に表示",
-    "%(count)s new messages.one": "新しい発言 %(count)s",
+    "%(count)s new messages|one": "新しい発言 %(count)s",
-    "%(count)s new messages.other": "新しい発言 %(count)s",
+    "%(count)s new messages|other": "新しい発言 %(count)s",
     "Don't send typing notifications": "文字入力中であることを公表しない",
     "Filter room members": "参加者検索",
     "Send a message (unencrypted)": "ここに送信文を入力 (暗号化なし)",

src/i18n/strings/ko.json

@@ -225,10 +225,8 @@
     "%(items)s and %(remaining)s others": "%(items)s과 %(remaining)s",
     "%(items)s and one other": "%(items)s과 다른 하나",
     "%(items)s and %(lastItem)s": "%(items)s과 %(lastItem)s",
-    "and %(count)s others...": {
+    "and %(count)s others...|one": "그리고 다른 하나...",
-        "other": "그리고 %(count)s...",
+    "and %(count)s others...|other": "그리고 %(count)s...",
-        "one": "그리고 다른 하나..."
-    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s님과 %(lastPerson)s님이 입력중",
     "%(names)s and one other are typing": "%(names)s님과 다른 분이 입력중",
     "%(names)s and %(count)s others are typing": "%(names)s님과 %(count)s 분들이 입력중",
@@ -267,8 +265,8 @@
     "Conference calls are not supported in encrypted rooms": "암호화한 방에서는 전화 회의를 할 수 없어요",
     "Conference calls are not supported in this client": "이 클라이언트에서는 전화 회의를 할 수 없어요",
     "Could not connect to the integration server": "통합 서버에 연결할 수 없어요",
-    "%(count)s new messages.one": "%(count)s 새 메시지",
+    "%(count)s new messages|one": "%(count)s 새 메시지",
-    "%(count)s new messages.other": "%(count)s 새 메시지",
+    "%(count)s new messages|other": "%(count)s 새 메시지",
     "Create a new chat or reuse an existing one": "새 이야기를 시작하거나 기존에 하던 이야기를 이어하세요",
     "Cryptography": "암호화",
     "Current password": "현재 비밀번호",
@@ -617,9 +615,9 @@
     "Unrecognised command:": "인식 할 수 없는 명령:",
     "Unrecognised room alias:": "인식할 수 없는 방 가명:",
     "Unverified": "인증하지 않음",
-    "Uploading %(filename)s and %(count)s others.zero": "%(filename)s 올리는 중",
+    "Uploading %(filename)s and %(count)s others|zero": "%(filename)s 올리는 중",
-    "Uploading %(filename)s and %(count)s others.one": "%(filename)s 외 %(count)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 올리는 중",
+    "Uploading %(filename)s and %(count)s others|other": "%(filename)s 외 %(count)s 올리는 중",
     "uploaded a file": "파일을 올렸어요",
     "Upload avatar": "아바타 올리기",
     "Upload Failed": "파일을 올리지 못했어요",
@@ -736,8 +734,8 @@
     "Sent messages will be stored until your connection has returned.": "보내신 메시지는 다시 연결될 때까지 저장할 거에요.",
     "Auto-complete": "자동 완성",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>전부 다시 보내거나</a> <a>취소하세요</a>. 다시 보내거나 취소할 메시지를 하나씩 고르실 수도 있어요.",
-    "(~%(count)s results).one": "(~%(count)s 결과)",
+    "(~%(count)s results)|one": "(~%(count)s 결과)",
-    "(~%(count)s results).other": "(~%(count)s 결과)",
+    "(~%(count)s results)|other": "(~%(count)s 결과)",
     "or": "혹은",
     "Active call": "전화 중",
     "bold": "굵은 획",

src/i18n/strings/lv.json

@@ -218,8 +218,8 @@
     "Confirm your new password": "Apstiprini jauno paroli",
     "Continue": "Turpināt",
     "Could not connect to the integration server": "Neizdevās savienoties ar integrācijas serveri",
-    "%(count)s new messages.one": "jaunu ziņu skaits: %(count)s",
+    "%(count)s new messages|one": "jaunu ziņu skaits: %(count)s",
-    "%(count)s new messages.other": "%(count)s jaunas ziņas",
+    "%(count)s new messages|other": "%(count)s jaunas ziņas",
     "Create a new chat or reuse an existing one": "Izveidot jaunu čatu vai izmantot eksistējošu",
     "Create an account": "Reģistrēt kontu",
     "Create Room": "Izveidot istabu",
@@ -494,9 +494,9 @@
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ieslēdza ierīce-ierīce šifrēšanu (algorithm %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atcēla pieejas ierobežojumu (atbanoja) %(targetName)s.",
     "Unknown room %(roomId)s": "Nezināma istaba %(roomId)s",
-    "Uploading %(filename)s and %(count)s others.zero": "Tiek augšuplādēts %(filename)s",
+    "Uploading %(filename)s and %(count)s others|zero": "Tiek augšuplādēts %(filename)s",
-    "Uploading %(filename)s and %(count)s others.one": "Tiek augšuplādēts %(filename)s un %(count)s citi",
+    "Uploading %(filename)s and %(count)s others|one": "Tiek augšuplādēts %(filename)s un %(count)s citi",
-    "Uploading %(filename)s and %(count)s others.other": "Tiek augšuplādēts %(filename)s un %(count)s citi",
+    "Uploading %(filename)s and %(count)s others|other": "Tiek augšuplādēts %(filename)s un %(count)s citi",
     "%(user)s is a": "%(user)s ir",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Neatbilstošs lietotājvārds: %(errMessage)s",
@@ -512,8 +512,8 @@
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Parole ir par īsu  (jābūt vismaz %(MIN_PASSWORD_LENGTH)s zīmēm).",
     "An error occurred: %(error_string)s": "Notikusi kļūda: %(error_string)s",
-    "(~%(count)s results).one": "(~%(count)s rezultāts)",
+    "(~%(count)s results)|one": "(~%(count)s rezultāts)",
-    "(~%(count)s results).other": "(~%(count)s rezultāti)",
+    "(~%(count)s results)|other": "(~%(count)s rezultāti)",
     "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)s pievienojās %(repeats)s reizes",
     "%(oneUser)sjoined %(repeats)s times": "%(oneUser)s pievienojās %(repeats)s reizes",
     "%(severalUsers)sjoined": "%(severalUsers)s pievienojās",
@@ -916,8 +916,8 @@
     "Encryption key request": "Šifrēšanas atslēgas pieprasījums",
     "Add a widget": "Pievienot Widžetu",
     "Allow": "Atļaut",
-    "and %(count)s others....other": "un vēl %(count)s citi...",
+    "and %(count)s others...|other": "un vēl %(count)s citi...",
-    "and %(count)s others....one": "un vēl viens cits...",
+    "and %(count)s others...|one": "un vēl viens cits...",
     "Cannot add any more widgets": "Nav iespējams pievienot vairāk vidžetu",
     "Changes colour scheme of current room": "Nomaina pašreizējās istabas krāsu paleti",
     "Delete widget": "Dzēst widžetu",

src/i18n/strings/nl.json

@@ -141,8 +141,8 @@
     "%(items)s and %(remaining)s others": "%(items)s en %(remaining)s andere",
     "%(items)s and one other": "%(items)s en één andere",
     "%(items)s and %(lastItem)s": "%(items)s en %(lastItem)s",
-    "and %(count)s others....other": "en %(count)s andere...",
+    "and %(count)s others...|other": "en %(count)s andere...",
-    "and %(count)s others....one": "en één andere...",
+    "and %(count)s others...|one": "en één andere...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s en %(lastPerson)s zijn aan het typen",
     "%(names)s and one other are typing": "%(names)s en één andere zijn aan het typen",
     "%(names)s and %(count)s others are typing": "%(names)s en %(count)s andere zijn aan het typen",
@@ -222,7 +222,7 @@
     "Are you sure you want to upload the following files?": "Weet u zeker dat u de volgende bestanden wil uploaden?",
     "<a>Click here</a> to join the discussion!": "<a>Klik hier</a> om mee te doen aan de discussie!",
     "Close": "Sluiten",
-    "%(count)s new messages.one": "%(count)s nieuw bericht",
+    "%(count)s new messages|one": "%(count)s nieuw bericht",
     "Create new room": "Een nieuwe kamer maken",
     "Custom Server Options": "Aangepaste serverinstellingen",
     "Dismiss": "Afwijzen",
@@ -329,7 +329,7 @@
     "Set a Display Name": "Weergavenaam instellen",
     "Upload an avatar:": "Een avatar uploaden:",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Geen verbinding met de thuisserver - controleer je verbinding. Controleer het <a>SSL-certificaat van de thuisserver</a> en browser-extensies die verzoeken kunnen blokkeren.",
-    "%(count)s new messages.other": "%(count)s nieuwe berichten",
+    "%(count)s new messages|other": "%(count)s nieuwe berichten",
     "Create an account": "Open een account",
     "Cryptography": "Cryptografie",
     "Current password": "Huidig wachtwoord",
@@ -644,9 +644,9 @@
     "Unrecognised command:": "Onbekende commando:",
     "Unrecognised room alias:": "Onbekende ruimte alias:",
     "Unverified": "Niet geverifieerd",
-    "Uploading %(filename)s and %(count)s others.zero": "Aan het uploaden %(filename)s",
+    "Uploading %(filename)s and %(count)s others|zero": "Aan het uploaden %(filename)s",
-    "Uploading %(filename)s and %(count)s others.one": "%(filename)s en %(count)s andere aan het uploaden",
+    "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s andere aan het uploaden",
-    "Uploading %(filename)s and %(count)s others.other": "%(filename)s en %(count)s anderen aan het uploaden",
+    "Uploading %(filename)s and %(count)s others|other": "%(filename)s en %(count)s anderen aan het uploaden",
     "uploaded a file": "Bestand geüpload",
     "Upload avatar": "Avatar uploaden",
     "Upload Failed": "Uploaden Mislukt",
@@ -737,8 +737,8 @@
     "Sent messages will be stored until your connection has returned.": "Verstuurde berichten zullen opgeslagen worden tot je connectie weer terug is.",
     "Auto-complete": "Automatisch aanvullen",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Verstuur alle</a> of <a>annuleer alle</a> nu. Je kan ook individuele berichten selecteren om te versturen of te annuleren.",
-    "(~%(count)s results).one": "(~%(count)s resultaat)",
+    "(~%(count)s results)|one": "(~%(count)s resultaat)",
-    "(~%(count)s results).other": "(~%(count)s resultaten)",
+    "(~%(count)s results)|other": "(~%(count)s resultaten)",
     "or": "of",
     "Active call": "Actief gesprek",
     "bold": "vetgedrukt",

src/i18n/strings/pt.json

@@ -556,8 +556,8 @@
     "%(items)s and %(remaining)s others": "%(items)s e %(remaining)s outros",
     "%(items)s and one other": "%(items)s e um outro",
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
-    "and %(count)s others....other": "e %(count)s outros...",
+    "and %(count)s others...|other": "e %(count)s outros...",
-    "and %(count)s others....one": "e um outro...",
+    "and %(count)s others...|one": "e um outro...",
     "Are you sure?": "Você tem certeza?",
     "Attachment": "Anexo",
     "Autoplay GIFs and videos": "Reproduzir automaticamente GIFs e videos",
@@ -877,7 +877,7 @@
     "Disable markdown formatting": "Desabilitar formatação MarkDown",
     "No display name": "Sem nome público de usuária(o)",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Este será seu nome de conta no Servidor de Base <span></span>, ou então você pode escolher um <a>servidor diferente</a>.",
-    "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|one": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "Hide removed messages": "Ocultar mensagens removidas",
     "You may wish to login with a different account, or add this email to this account.": "Você pode querer fazer login com uma conta diferente, ou adicionar este e-mail a esta conta.",
     "Welcome page": "Página de boas-vindas",
@@ -887,7 +887,7 @@
     "And %(count)s more...": "E mais %(count)s...",
     "Start chatting": "Iniciar a conversa",
     "Public Chat": "Conversa pública",
-    "Uploading %(filename)s and %(count)s others.zero": "Enviando o arquivo %(filename)s",
+    "Uploading %(filename)s and %(count)s others|zero": "Enviando o arquivo %(filename)s",
     "Room contains unknown devices": "Esta sala contém dispositivos desconhecidos",
     "Admin tools": "Ferramentas de administração",
     "You have been kicked from %(roomName)s by %(userName)s.": "Você foi removido(a) da sala %(roomName)s por %(userName)s.",
@@ -918,14 +918,14 @@
     "Enable Notifications": "Habilitar notificações",
     "Username not available": "Nome de usuária(o) indisponível",
     "Encrypted by a verified device": "Criptografado por um dispositivo verificado",
-    "(~%(count)s results).other": "(~%(count)s resultados)",
+    "(~%(count)s results)|other": "(~%(count)s resultados)",
     "unknown caller": "a pessoa que está chamando é desconhecida",
     "Start authentication": "Iniciar autenticação",
-    "(~%(count)s results).one": "(~%(count)s resultado)",
+    "(~%(count)s results)|one": "(~%(count)s resultado)",
     "New Password": "Nova senha",
     "Username invalid: %(errMessage)s": "Nome de usuária(o) inválido: %(errMessage)s",
     "Disable Notifications": "Desabilitar notificações",
-    "%(count)s new messages.one": "%(count)s nova mensagem",
+    "%(count)s new messages|one": "%(count)s nova mensagem",
     "Device Name": "Nome do dispositivo",
     "Incoming voice call from %(name)s": "Chamada de voz de %(name)s recebida",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Se você já tem uma conta Matrix, pode também fazer <a>login</a>.",
@@ -934,11 +934,11 @@
     "Set": "Definir",
     "Unencrypted message": "Mensagem não criptografada",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Participar por <voiceText>voz</voiceText> ou por <videoText>vídeo</videoText>.",
-    "Uploading %(filename)s and %(count)s others.other": "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",
     "Username available": "Nome de usuária(o) disponível",
     "Close": "Fechar",
     "Level:": "Nível:",
-    "%(count)s new messages.other": "%(count)s novas mensagens",
+    "%(count)s new messages|other": "%(count)s novas mensagens",
     "Unverified": "Não verificado",
     "<a>Click here</a> to join the discussion!": "<a>Clique aqui</a> para participar da conversa!",
     "Decline": "Recusar",

src/i18n/strings/pt_BR.json

@@ -557,10 +557,8 @@
     "%(items)s and %(remaining)s others": "%(items)s e %(remaining)s outros",
     "%(items)s and one other": "%(items)s e um outro",
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
-    "and %(count)s others...": {
+    "and %(count)s others...|one": "e um outro...",
-        "other": "e %(count)s outros...",
+    "and %(count)s others...|other": "e %(count)s outros...",
-        "one": "e um outro..."
-    },
     "Are you sure?": "Você tem certeza?",
     "Attachment": "Anexo",
     "Autoplay GIFs and videos": "Reproduzir automaticamente GIFs e videos",
@@ -874,16 +872,16 @@
     "You have entered an invalid contact. Try using their Matrix ID or email address.": "Você inseriu um contato inválido. Tente usar o ID Matrix ou endereço de e-mail da pessoa que está buscando.",
     "Hide removed messages": "Ocultar mensagens removidas",
     "Add": "Adicionar",
-    "%(count)s new messages.one": "%(count)s nova mensagem",
+    "%(count)s new messages|one": "%(count)s nova mensagem",
-    "%(count)s new messages.other": "%(count)s novas mensagens",
+    "%(count)s new messages|other": "%(count)s novas mensagens",
     "Disable markdown formatting": "Desabilitar formatação MarkDown",
     "Error: Problem communicating with the given homeserver.": "Erro: problema de comunicação com o Servidor de Base fornecido.",
     "Failed to fetch avatar URL": "Falha ao obter a URL da imagem de perfil",
     "Home": "Início",
     "The phone number entered looks invalid": "O número de telefone inserido parece ser inválido",
-    "Uploading %(filename)s and %(count)s others.zero": "Enviando o arquivo %(filename)s",
+    "Uploading %(filename)s and %(count)s others|zero": "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|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",
+    "Uploading %(filename)s and %(count)s others|other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "Username invalid: %(errMessage)s": "Nome de usuária(o) inválido: %(errMessage)s",
     "Searching known users": "Buscando pessoas conhecidas",
     "You must <a>register</a> to use this functionality": "Você deve <a>se registrar</a> para poder usar esta funcionalidade",
@@ -958,8 +956,8 @@
     "You have been kicked from %(roomName)s by %(userName)s.": "Você foi removido(a) da sala %(roomName)s por %(userName)s.",
     "You may wish to login with a different account, or add this email to this account.": "Você pode querer fazer login com uma conta diferente, ou adicionar este e-mail a esta conta.",
     "Your home server does not support device management.": "O seu Servidor de Base não suporta o gerenciamento de dispositivos.",
-    "(~%(count)s results).one": "(~%(count)s resultado)",
+    "(~%(count)s results)|one": "(~%(count)s resultado)",
-    "(~%(count)s results).other": "(~%(count)s resultados)",
+    "(~%(count)s results)|other": "(~%(count)s resultados)",
     "Device Name": "Nome do dispositivo",
     "(could not connect media)": "(não foi possível conectar-se à mídia)",
     "(no answer)": "(sem resposta)",

src/i18n/strings/ru.json

@@ -448,8 +448,8 @@
     "sx": "Суту",
     "zh-hk": "Китайский (Гонконг)",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Текстовое сообщение было отправлено на +%(msisdn)s. Введите проверочный код, который оно содержит",
-    "and %(count)s others....other": "и %(count)s других...",
+    "and %(count)s others...|other": "и %(count)s других...",
-    "and %(count)s others....one": "и ещё один...",
+    "and %(count)s others...|one": "и ещё один...",
     "Are you sure?": "Вы уверены?",
     "Autoplay GIFs and videos": "Автовоспроизведение GIF и видео",
     "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Невозможно соединиться с домашним сервером - проверьте своё соединение и убедитесь, что <a>SSL-сертификат вашего домашнего сервера</a> включён в доверяемые.",
@@ -863,14 +863,14 @@
     "Start chat": "Начать чат",
     "Welcome page": "Страница приветствия",
     "Add": "Добавить",
-    "%(count)s new messages.one": "%(count)s новое сообщение",
+    "%(count)s new messages|one": "%(count)s новое сообщение",
-    "%(count)s new messages.other": "%(count)s новых сообщений",
+    "%(count)s new messages|other": "%(count)s новых сообщений",
     "Error: Problem communicating with the given homeserver.": "Ошибка: проблема связи с данным сервером.",
     "Failed to fetch avatar URL": "Не удалось извлечь URL-адрес аватара",
     "The phone number entered looks invalid": "Введенный номер телефона недействителен",
-    "Uploading %(filename)s and %(count)s others.zero": "Отправка %(filename)s",
+    "Uploading %(filename)s and %(count)s others|zero": "Отправка %(filename)s",
-    "Uploading %(filename)s and %(count)s others.one": "Отправка %(filename)s и %(count)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 других",
+    "Uploading %(filename)s and %(count)s others|other": "Отправка %(filename)s и %(count)s других",
     "Username invalid: %(errMessage)s": "Неверное имя пользователя: %(errMessage)s",
     "Searching known users": "Поиск известных пользователей",
     "You must <a>register</a> to use this functionality": "Вы должны <a>зарегистрироваться</a>, чтобы использовать эту функцию",
@@ -918,7 +918,7 @@
     "Set": "Установить",
     "Start authentication": "Начать проверку подлинности",
     "This room": "В этой комнате",
-    "(~%(count)s results).other": "(~%(count)s результаты)",
+    "(~%(count)s results)|other": "(~%(count)s результаты)",
     "Device Name": "Имя устройства",
     "Custom": "Пользовательские",
     "Decline": "Отклонить",
@@ -941,7 +941,7 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (уровень доступа %(powerLevelNumber)s)",
     "Verified": "Проверено",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Вы хотели бы <acceptText>подтвердить</acceptText> или <declineText>отклонить</declineText> это приглашение?",
-    "(~%(count)s results).one": "(~%(count)s результат)",
+    "(~%(count)s results)|one": "(~%(count)s результат)",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не удается подключиться к домашнему серверу - проверьте подключение, убедитесь, что ваш <a>SSL-сертификат домашнего сервера</a> является доверенным и что расширение браузера не блокирует запросы.",
     "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s заблокировал вас в %(roomName)s.",
     "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s выгнал вас из %(roomName)s.",

src/i18n/strings/sv.json

@@ -150,8 +150,8 @@
     "%(items)s and %(remaining)s others": "%(items)s och %(remaining)s andra",
     "%(items)s and one other": "%(items)s och en annan",
     "%(items)s and %(lastItem)s": "%(items)s och %(lastItem)s",
-    "and %(count)s others....other": "och %(count)s andra...",
+    "and %(count)s others...|other": "och %(count)s andra...",
-    "and %(count)s others....one": "och en annan...",
+    "and %(count)s others...|one": "och en annan...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s och %(lastPerson)s skriver",
     "%(names)s and one other are typing": "%(names)s och en annan skriver",
     "%(names)s and %(count)s others are typing": "%(names)s och %(count)s andra skriver",
@@ -303,8 +303,8 @@
     "changing room on a RoomView is not supported": "det går inte att byta rum i en RoomView",
     "<a>Click here</a> to join the discussion!": "<a>Klicka här</a> för att gå med i diskussionen!",
     "Close": "Stäng",
-    "%(count)s new messages.one": "%(count)s nytt meddelande",
+    "%(count)s new messages|one": "%(count)s nytt meddelande",
-    "%(count)s new messages.other": "%(count)s nya meddelanden",
+    "%(count)s new messages|other": "%(count)s nya meddelanden",
     "Create a new chat or reuse an existing one": "Skapa en ny chatt eller använd en existerande",
     "Custom": "Egen",
     "Decline": "Avvisa",

src/i18n/strings/te.json

@@ -214,8 +214,8 @@
     "Confirm your new password": "మీ క్రొత్త పాస్వర్డ్ను నిర్ధారించండి",
     "Continue": "కొనసాగించు",
     "Could not connect to the integration server": "ఇంటిగ్రేషన్ సర్వర్కు కనెక్ట్ చేయడం సాధ్యం కాలేదు",
-    "%(count)s new messages.one": "%(count)s కొత్త సందేశం",
+    "%(count)s new messages|one": "%(count)s కొత్త సందేశం",
-    "%(count)s new messages.other": "%(count)s కొత్త సందేశాలు",
+    "%(count)s new messages|other": "%(count)s కొత్త సందేశాలు",
     "Create a new chat or reuse an existing one": "క్రొత్త చాట్ ను సృష్టించుకోండి లేదా ఇప్పటికే ఉన్న ఒకదాన్ని తిరిగి ఉపయోగించండి",
     "Create an account": "ఒక ఎకౌంటు ను సృష్టించండి",
     "Create Room": "రూమ్ ని సృష్టించండి",

src/i18n/strings/th.json

@@ -98,10 +98,8 @@
     "%(items)s and %(remaining)s others": "%(items)s และอีก %(remaining)s ผู้ใช้",
     "%(items)s and one other": "%(items)s และอีกหนึ่งผู้ใช้",
     "%(items)s and %(lastItem)s": "%(items)s และ %(lastItem)s",
-    "and %(count)s others...": {
+    "and %(count)s others...|one": "และอีกหนึ่งผู้ใช้...",
-        "other": "และอีก %(count)s ผู้ใช้...",
+    "and %(count)s others...|other": "และอีก %(count)s ผู้ใช้...",
-        "one": "และอีกหนึ่งผู้ใช้..."
-    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s และ %(lastPerson)s กำลังพิมพ์",
     "%(names)s and one other are typing": "%(names)s และอีกหนึ่งคนกำลังพิมพ์",
     "%(names)s and %(count)s others are typing": "%(names)s และอีก %(count)s คนกำลังพิมพ์",
@@ -330,8 +328,8 @@
     "Start chat": "เริ่มแชท",
     "Welcome page": "หน้าต้อนรับ",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์บ้านผ่านทาง HTTP ได้เนื่องจาก URL ที่อยู่บนเบราว์เซอร์เป็น HTTPS กรุณาใช้ HTTPS หรือ<a>เปิดใช้งานสคริปต์ที่ไม่ปลอดภัย</a>.",
-    "%(count)s new messages.one": "มี %(count)s ข้อความใหม่",
+    "%(count)s new messages|one": "มี %(count)s ข้อความใหม่",
-    "%(count)s new messages.other": "มี %(count)s ข้อความใหม่",
+    "%(count)s new messages|other": "มี %(count)s ข้อความใหม่",
     "Disable inline URL previews by default": "ตั้งค่าเริ่มต้นให้ไม่แสดงตัวอย่าง URL ในแชท",
     "Disable markdown formatting": "ปิดใช้งานการจัดรูปแบบ markdown",
     "End-to-end encryption information": "ข้อมูลการเข้ารหัสจากปลายทางถึงปลายทาง",
@@ -368,9 +366,9 @@
     "unknown": "ไม่รู้จัก",
     "Unrecognised command:": "คำสั่งที่ไม่รู้จัก:",
     "Unrecognised room alias:": "นามแฝงห้องที่ไม่รู้จัก:",
-    "Uploading %(filename)s and %(count)s others.zero": "กำลังอัปโหลด %(filename)s",
+    "Uploading %(filename)s and %(count)s others|zero": "กำลังอัปโหลด %(filename)s",
-    "Uploading %(filename)s and %(count)s others.one": "กำลังอัปโหลด %(filename)s และอีก %(count)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 ไฟล์",
+    "Uploading %(filename)s and %(count)s others|other": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
     "uploaded a file": "อัปโหลดไฟล์",
     "Upload Failed": "การอัปโหลดล้มเหลว",
     "Upload Files": "อัปโหลดไฟล์",
@@ -598,8 +596,8 @@
     "This room": "ห้องนี้",
     "Unnamed Room": "ห้องที่ยังไม่ได้ตั้งชื่อ",
     "%(user)s is a": "%(user)s เป็น",
-    "(~%(count)s results).one": "(~%(count)s ผลลัพท์)",
+    "(~%(count)s results)|one": "(~%(count)s ผลลัพท์)",
-    "(~%(count)s results).other": "(~%(count)s ผลลัพท์)",
+    "(~%(count)s results)|other": "(~%(count)s ผลลัพท์)",
     "Admin tools": "เครื่องมือผู้ดูแล",
     "And %(count)s more...": "เพิ่มอีก %(count)s ชิ้น...",
     "Missing Media Permissions, click here to request.": "ไม่มีสิทธิ์เข้าถึงสื่อ, คลิกที่นี่เพื่อขอสิทธิ์",

src/i18n/strings/tr.json

@@ -156,10 +156,8 @@
     "%(items)s and %(remaining)s others": "%(items)s ve %(remaining)s diğerleri",
     "%(items)s and one other": "%(items)s ve bir başkası",
     "%(items)s and %(lastItem)s": "%(items)s ve %(lastItem)s",
-    "and %(count)s others...": {
+    "and %(count)s others...|one": "ve bir diğeri...",
-        "other": "ve %(count)s diğerleri...",
+    "and %(count)s others...|other": "ve %(count)s diğerleri...",
-        "one": "ve bir diğeri..."
-    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s ve %(lastPerson)s yazıyorlar",
     "%(names)s and one other are typing": "%(names)s ve birisi yazıyor",
     "%(names)s and %(count)s others are typing": "%(names)s ve %(count)s diğeri yazıyor",
@@ -220,8 +218,8 @@
     "Confirm your new password": "Yeni Şifrenizi Onaylayın",
     "Continue": "Devam Et",
     "Could not connect to the integration server": "Bütünleştirme (Integration) Sunucusuna bağlanamadı",
-    "%(count)s new messages.one": "%(count)s yeni mesaj",
+    "%(count)s new messages|one": "%(count)s yeni mesaj",
-    "%(count)s new messages.other": "%(count)s yeni mesajlar",
+    "%(count)s new messages|other": "%(count)s yeni mesajlar",
     "Create a new chat or reuse an existing one": "Yeni sohbet oluştur veya mevcut sohbetinizi tekrar kullanın",
     "Create an account": "Hesap Oluştur",
     "Create Room": "Oda Oluştur",
@@ -600,9 +598,9 @@
     "Unrecognised command:": "Tanınmayan komut :",
     "Unrecognised room alias:": "Tanınmayan oda isimleri :",
     "Unverified": "Doğrulanmamış",
-    "Uploading %(filename)s and %(count)s others.zero": "%(filename)s yükleniyor",
+    "Uploading %(filename)s and %(count)s others|zero": "%(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|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",
+    "Uploading %(filename)s and %(count)s others|other": "%(filename)s ve %(count)s kadarları yükleniyor",
     "uploaded a file": "bir dosya yüklendi",
     "Upload avatar": "Avatar yükle",
     "Upload Failed": "Yükleme Başarısız",
@@ -719,8 +717,8 @@
     "Sent messages will be stored until your connection has returned.": "Gönderilen iletiler bağlantınız geri gelene kadar saklanacak.",
     "Auto-complete": "Otomatik tamamlama",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a> Hepsini yeniden gönderin </a> veya <a> Hepsini iptal edin </a> şimdi . Ayrıca yeniden göndermek veya iptal etmek için özel iletiler seçebilirsin.",
-    "(~%(count)s results).one": "(~%(count)s sonuç)",
+    "(~%(count)s results)|one": "(~%(count)s sonuç)",
-    "(~%(count)s results).other": "(~%(count)s sonuçlar)",
+    "(~%(count)s results)|other": "(~%(count)s sonuçlar)",
     "Cancel": "İptal Et",
     "or": "veya",
     "Active call": "Aktif çağrı",

src/i18n/strings/uk.json

@@ -192,10 +192,8 @@
     "%(items)s and %(remaining)s others": "%(items)s та інші %(remaining)s",
     "%(items)s and one other": "%(items)s і ще один інший",
     "%(items)s and %(lastItem)s": "%(items)s та %(lastItem)s",
-    "and %(count)s others...": {
+    "and %(count)s others...|one": "і інше...",
-        "other": "та %(count)s інші...",
+    "and %(count)s others...|other": "та %(count)s інші...",
-        "one": "і інше..."
-    },
     "%(names)s and %(lastPerson)s are typing": "%(names)s та %(lastPerson)s пишуть",
     "%(names)s and one other are typing": "%(names)s та інші пишуть",
     "%(names)s and %(count)s others are typing": "%(names)s та %(count)s інших пишуть",

src/i18n/strings/zh_Hans.json

@@ -239,8 +239,8 @@
     "%(items)s and %(remaining)s others": "%(items)s 和其它 %(remaining)s 个人",
     "%(items)s and one other": "%(items)s 和另一个人",
     "%(items)s and %(lastItem)s": "%(items)s 和 %(lastItem)s",
-    "and %(count)s others....other": "和其它 %(count)s 个...",
+    "and %(count)s others...|other": "和其它 %(count)s 个...",
-    "and %(count)s others....one": "和其它一个...",
+    "and %(count)s others...|one": "和其它一个...",
     "%(names)s and one other are typing": "%(names)s 和另一个人正在打字",
     "anyone": "任何人",
     "Anyone": "任何人",
@@ -282,8 +282,8 @@
     "Conference calling is in development and may not be reliable.": "视频会议功能还在开发状态，可能不稳定。",
     "Conference calls are not supported in encrypted rooms": "加密聊天室不支持视频会议",
     "Conference calls are not supported in this client": "此客户端不支持视频会议",
-    "%(count)s new messages.one": "%(count)s 条新消息",
+    "%(count)s new messages|one": "%(count)s 条新消息",
-    "%(count)s new messages.other": "%(count)s 新消息",
+    "%(count)s new messages|other": "%(count)s 新消息",
     "Create a new chat or reuse an existing one": "创建新聊天或使用已有的聊天",
     "Custom": "自定义",
     "Custom level": "自定义级别",

src/i18n/strings/zh_Hant.json

@@ -463,8 +463,8 @@
     "Conference calls are not supported in encrypted rooms": "不支援在加密房間的會議通話",
     "Conference calls are not supported in this client": "這個客戶端不支援會議通話",
     "Could not connect to the integration server": "無法連線到整合的伺服器",
-    "%(count)s new messages.one": "%(count)s 個訊息",
+    "%(count)s new messages|one": "%(count)s 個訊息",
-    "%(count)s new messages.other": "%(count)s 個訊息",
+    "%(count)s new messages|other": "%(count)s 個訊息",
     "Create a new chat or reuse an existing one": "建立新聊天或重新使用既有的",
     "Curve25519 identity key": "Curve25519 辨識金鑰",
     "Custom": "自訂",
@@ -661,9 +661,9 @@
     "Unrecognised command:": "無法識別的命令：",
     "Unrecognised room alias:": "無法室別的房間別名：",
     "Unverified": "未驗證",
-    "Uploading %(filename)s and %(count)s others.zero": "正在上傳 %(filename)s",
+    "Uploading %(filename)s and %(count)s others|zero": "正在上傳 %(filename)s",
-    "Uploading %(filename)s and %(count)s others.one": "正在上傳 %(filename)s 與另外 %(count)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 個",
+    "Uploading %(filename)s and %(count)s others|other": "正在上傳 %(filename)s 與另外 %(count)s 個",
     "uploaded a file": "已上傳檔案",
     "Upload avatar": "上傳大頭貼",
     "Upload Failed": "上傳失敗",
@@ -772,8 +772,8 @@
     "Sent messages will be stored until your connection has returned.": "傳送的訊息會在您的連線恢復前先儲存起來。",
     "Auto-complete": "自動完成",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "現在<a>重新傳送全部</a>或是<a>取消全部</a>。您也可以單獨選擇訊息來重新傳送或取消。",
-    "(~%(count)s results).one": "（~%(count)s 結果）",
+    "(~%(count)s results)|one": "（~%(count)s 結果）",
-    "(~%(count)s results).other": "（~%(count)s 結果）",
+    "(~%(count)s results)|other": "（~%(count)s 結果）",
     "or": "或",
     "Active call": "活躍的通話",
     "bold": "粗體",
@@ -923,8 +923,8 @@
     "Encryption key request": "加密金鑰請求",
     "Add a widget": "新增小工具",
     "Allow": "允許",
-    "and %(count)s others....other": "與其他 %(count)s 個……",
+    "and %(count)s others...|other": "與其他 %(count)s 個……",
-    "and %(count)s others....one": "與其他 1 個……",
+    "and %(count)s others...|one": "與其他 1 個……",
     "Cannot add any more widgets": "無法新增更多的小工具",
     "Changes colour scheme of current room": "變更目前聊天室的配色方案",
     "Delete widget": "刪除小工具",