Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit d9138e5

Browse files
authored
Merge pull request #1358 from matrix-org/dbkr/fix_weblate_plurals
Fix plurals in translations
2 parents 05ac085 + de2940f commit d9138e5

22 files changed

+165
-185
lines changed

src/i18n/strings/de_DE.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -552,8 +552,8 @@
552552
"Failed to forget room %(errCode)s": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s",
553553
"Failed to join the room": "Fehler beim Betreten des Raumes",
554554
"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",
555-
"and %(count)s others....other": "und %(count)s weitere...",
556-
"and %(count)s others....one": "und ein(e) weitere(r)...",
555+
"and %(count)s others...|other": "und %(count)s weitere...",
556+
"and %(count)s others...|one": "und ein(e) weitere(r)...",
557557
"Are you sure?": "Bist du sicher?",
558558
"Attachment": "Anhang",
559559
"Ban": "Verbannen",
@@ -877,15 +877,15 @@
877877
"Start new chat": "Neuen Chat starten",
878878
"Disable markdown formatting": "Markdown-Formatierung deaktivieren",
879879
"Add": "Hinzufügen",
880-
"%(count)s new messages.one": "%(count)s neue Nachricht",
881-
"%(count)s new messages.other": "%(count)s neue Nachrichten",
880+
"%(count)s new messages|one": "%(count)s neue Nachricht",
881+
"%(count)s new messages|other": "%(count)s neue Nachrichten",
882882
"Error: Problem communicating with the given homeserver.": "Fehler: Problem bei der Kommunikation mit dem angegebenen Home-Server.",
883883
"Failed to fetch avatar URL": "Abrufen der Avatar-URL fehlgeschlagen",
884884
"The phone number entered looks invalid": "Die eingegebene Telefonnummer scheint ungültig zu sein",
885885
"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.",
886-
"Uploading %(filename)s and %(count)s others.zero": "%(filename)s wird hochgeladen",
887-
"Uploading %(filename)s and %(count)s others.one": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
888-
"Uploading %(filename)s and %(count)s others.other": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
886+
"Uploading %(filename)s and %(count)s others|zero": "%(filename)s wird hochgeladen",
887+
"Uploading %(filename)s and %(count)s others|one": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
888+
"Uploading %(filename)s and %(count)s others|other": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
889889
"You must <a>register</a> to use this functionality": "Du musst dich <a>registrieren</a>, um diese Funktionalität nutzen zu können",
890890
"<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.",
891891
"Create new room": "Neuen Raum erstellen",
@@ -961,8 +961,8 @@
961961
"You have been kicked from %(roomName)s by %(userName)s.": "Du wurdest von %(userName)s aus dem Raum \"%(roomName)s\" gekickt.",
962962
"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.",
963963
"Your home server does not support device management.": "Dein Heimserver unterstützt kein Geräte-Management.",
964-
"(~%(count)s results).one": "(~%(count)s Ergebnis)",
965-
"(~%(count)s results).other": "(~%(count)s Ergebnis)",
964+
"(~%(count)s results)|one": "(~%(count)s Ergebnis)",
965+
"(~%(count)s results)|other": "(~%(count)s Ergebnis)",
966966
"Device Name": "Geräte-Name",
967967
"(could not connect media)": "(Medienverbindung konnte nicht hergestellt werden)",
968968
"(no answer)": "(keine Antwort)",

src/i18n/strings/el.json

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,8 @@
175175
"an address": "μία διεύθηνση",
176176
"%(items)s and %(remaining)s others": "%(items)s και %(remaining)s ακόμα",
177177
"%(items)s and one other": "%(items)s και ένας ακόμα",
178-
"and %(count)s others...": {
179-
"other": "και %(count)s άλλοι...",
180-
"one": "και ένας ακόμα..."
181-
},
178+
"and %(count)s others...|one": "και ένας ακόμα...",
179+
"and %(count)s others...|other": "και %(count)s άλλοι...",
182180
"%(names)s and %(lastPerson)s are typing": "%(names)s και %(lastPerson)s γράφουν",
183181
"%(names)s and one other are typing": "%(names)s και ένας ακόμα γράφουν",
184182
"%(names)s and %(count)s others are typing": "%(names)s και %(count)s άλλοι γράφουν",
@@ -405,8 +403,8 @@
405403
"click to reveal": "κάντε κλικ για εμφάνιση",
406404
"Click to unmute video": "Κάντε κλικ για άρση σίγασης του βίντεο",
407405
"Click to unmute audio": "Κάντε κλικ για άρση σίγασης του ήχου",
408-
"%(count)s new messages.one": "%(count)s νέο μήνυμα",
409-
"%(count)s new messages.other": "%(count)s νέα μηνύματα",
406+
"%(count)s new messages|one": "%(count)s νέο μήνυμα",
407+
"%(count)s new messages|other": "%(count)s νέα μηνύματα",
410408
"Custom": "Προσαρμοσμένο",
411409
"Decline": "Απόρριψη",
412410
"Disable Notifications": "Απενεργοποίηση ειδοποιήσεων",
@@ -569,8 +567,8 @@
569567
"Encrypt room": "Κρυπτογράφηση δωματίου",
570568
"Room": "Δωμάτιο",
571569
"Auto-complete": "Αυτόματη συμπλήρωση",
572-
"(~%(count)s results).one": "(~%(count)s αποτέλεσμα)",
573-
"(~%(count)s results).other": "(~%(count)s αποτελέσματα)",
570+
"(~%(count)s results)|one": "(~%(count)s αποτέλεσμα)",
571+
"(~%(count)s results)|other": "(~%(count)s αποτελέσματα)",
574572
"Active call": "Ενεργή κλήση",
575573
"strike": "επιγράμμιση",
576574
"bullet": "κουκκίδα",
@@ -719,8 +717,8 @@
719717
"to start a chat with someone": "για να ξεκινήσετε μια συνομιλία με κάποιον",
720718
"Unable to capture screen": "Αδυναμία σύλληψης οθόνης",
721719
"Unknown (user, device) pair:": "Άγνωστο ζεύγος (χρήστη, συσκευής):",
722-
"Uploading %(filename)s and %(count)s others.zero": "Γίνεται αποστολή του %(filename)s",
723-
"Uploading %(filename)s and %(count)s others.other": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπων",
720+
"Uploading %(filename)s and %(count)s others|zero": "Γίνεται αποστολή του %(filename)s",
721+
"Uploading %(filename)s and %(count)s others|other": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπων",
724722
"uploaded a file": "ανέβασε ένα αρχείο",
725723
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (δύναμη %(powerLevelNumber)s)",
726724
"Verification Pending": "Εκκρεμεί επιβεβαίωση",
@@ -820,7 +818,7 @@
820818
"to tag direct chat": "για να οριστεί ετικέτα σε απευθείας συνομιλία",
821819
"%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "Ο %(senderName)s ενεργοποίησε την από άκρο σε άκρο κρυπτογράφηση (algorithm %(algorithm)s).",
822820
"Undecryptable": "Μη αποκρυπτογραφημένο",
823-
"Uploading %(filename)s and %(count)s others.one": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπα",
821+
"Uploading %(filename)s and %(count)s others|one": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπα",
824822
"Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Θα θέλατε να <acceptText>δεχθείτε</acceptText> ή να <declineText>απορρίψετε</declineText> την πρόσκληση;",
825823
"You already have existing direct chats with this user:": "Έχετε ήδη απευθείας συνομιλίες με τον χρήστη:",
826824
"You are trying to access %(roomName)s.": "Προσπαθείτε να έχετε πρόσβαση στο %(roomName)s.",

src/i18n/strings/en_EN.json

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,8 @@
158158
"%(items)s and %(remaining)s others": "%(items)s and %(remaining)s others",
159159
"%(items)s and one other": "%(items)s and one other",
160160
"%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
161-
"and %(count)s others...": {
162-
"other": "and %(count)s others...",
163-
"one": "and one other..."
164-
},
161+
"and %(count)s others...|other": "and %(count)s others...",
162+
"and %(count)s others...|one": "and one other...",
165163
"%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
166164
"%(names)s and one other are typing": "%(names)s and one other are typing",
167165
"%(names)s and %(count)s others are typing": "%(names)s and %(count)s others are typing",
@@ -224,10 +222,8 @@
224222
"Confirm your new password": "Confirm your new password",
225223
"Continue": "Continue",
226224
"Could not connect to the integration server": "Could not connect to the integration server",
227-
"%(count)s new messages": {
228-
"one": "%(count)s new message",
229-
"other": "%(count)s new messages"
230-
},
225+
"%(count)s new messages|one": "%(count)s new message",
226+
"%(count)s new messages|other": "%(count)s new messages",
231227
"Create a new chat or reuse an existing one": "Create a new chat or reuse an existing one",
232228
"Create an account": "Create an account",
233229
"Create Room": "Create Room",
@@ -627,11 +623,9 @@
627623
"Unrecognised command:": "Unrecognised command:",
628624
"Unrecognised room alias:": "Unrecognised room alias:",
629625
"Unverified": "Unverified",
630-
"Uploading %(filename)s and %(count)s others": {
631-
"zero": "Uploading %(filename)s",
632-
"one": "Uploading %(filename)s and %(count)s other",
633-
"other": "Uploading %(filename)s and %(count)s others"
634-
},
626+
"Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
627+
"Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
628+
"Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
635629
"uploaded a file": "uploaded a file",
636630
"Upload avatar": "Upload avatar",
637631
"Upload Failed": "Upload Failed",
@@ -749,10 +743,8 @@
749743
"Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
750744
"Auto-complete": "Auto-complete",
751745
"<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.",
752-
"(~%(count)s results)": {
753-
"one": "(~%(count)s result)",
754-
"other": "(~%(count)s results)"
755-
},
746+
"(~%(count)s results)|one": "(~%(count)s result)",
747+
"(~%(count)s results)|other": "(~%(count)s results)",
756748
"Cancel": "Cancel",
757749
"or": "or",
758750
"Active call": "Active call",

src/i18n/strings/en_US.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@
154154
"%(items)s and %(remaining)s others": "%(items)s and %(remaining)s others",
155155
"%(items)s and one other": "%(items)s and one other",
156156
"%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
157-
"and %(count)s others....other": "and %(count)s others...",
158-
"and %(count)s others....one": "and one other...",
157+
"and %(count)s others...|other": "and %(count)s others...",
158+
"and %(count)s others...|one": "and one other...",
159159
"%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
160160
"%(names)s and one other are typing": "%(names)s and one other are typing",
161161
"%(names)s and %(count)s others are typing": "%(names)s and %(count)s others are typing",
@@ -841,8 +841,8 @@
841841
"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.",
842842
"<a>Click here</a> to join the discussion!": "<a>Click here</a> to join the discussion!",
843843
"Close": "Close",
844-
"%(count)s new messages.one": "%(count)s new message",
845-
"%(count)s new messages.other": "%(count)s new messages",
844+
"%(count)s new messages|one": "%(count)s new message",
845+
"%(count)s new messages|other": "%(count)s new messages",
846846
"Custom": "Custom",
847847
"Decline": "Decline",
848848
"Disable markdown formatting": "Disable markdown formatting",
@@ -893,9 +893,9 @@
893893
"unknown caller": "unknown caller",
894894
"Unnamed Room": "Unnamed Room",
895895
"Unverified": "Unverified",
896-
"Uploading %(filename)s and %(count)s others.zero": "Uploading %(filename)s",
897-
"Uploading %(filename)s and %(count)s others.one": "Uploading %(filename)s and %(count)s other",
898-
"Uploading %(filename)s and %(count)s others.other": "Uploading %(filename)s and %(count)s others",
896+
"Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
897+
"Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
898+
"Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
899899
"Upload new:": "Upload new:",
900900
"%(user)s is a": "%(user)s is a",
901901
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
@@ -909,8 +909,8 @@
909909
"You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
910910
"Your home server does not support device management.": "Your home server does not support device management.",
911911
"<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.",
912-
"(~%(count)s results).one": "(~%(count)s result)",
913-
"(~%(count)s results).other": "(~%(count)s results)",
912+
"(~%(count)s results)|one": "(~%(count)s result)",
913+
"(~%(count)s results)|other": "(~%(count)s results)",
914914
"New Password": "New Password",
915915
"Device Name": "Device Name",
916916
"Start chatting": "Start chatting",

src/i18n/strings/es.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@
140140
"%(items)s and %(remaining)s others": "%(items)s y %(remaining)s otros",
141141
"%(items)s and one other": "%(items)s y otro",
142142
"%(items)s and %(lastItem)s": "%(items)s y %(lastItem)s",
143-
"and %(count)s others....other": "y %(count)s otros...",
144-
"and %(count)s others....one": "y otro...",
143+
"and %(count)s others...|other": "y %(count)s otros...",
144+
"and %(count)s others...|one": "y otro...",
145145
"%(names)s and %(lastPerson)s are typing": "%(names)s y %(lastPerson)s están escribiendo",
146146
"%(names)s and one other are typing": "%(names)s y otro están escribiendo",
147147
"%(names)s and %(count)s others are typing": "%(names)s y %(count)s otros están escribiendo",
@@ -341,8 +341,8 @@
341341
"Anyone": "Cualquiera",
342342
"<a>Click here</a> to join the discussion!": "¡<a>Pulse aquí</a> para unirse a la conversación!",
343343
"Close": "Cerrar",
344-
"%(count)s new messages.one": "%(count)s mensaje nuevo",
345-
"%(count)s new messages.other": "%(count)s mensajes nuevos",
344+
"%(count)s new messages|one": "%(count)s mensaje nuevo",
345+
"%(count)s new messages|other": "%(count)s mensajes nuevos",
346346
"Create a new chat or reuse an existing one": "Cree una nueva conversación o reutilice una existente",
347347
"Custom": "Personalizado",
348348
"Custom level": "Nivel personalizado",
@@ -688,9 +688,9 @@
688688
"unknown": "desconocido",
689689
"Unnamed Room": "Sala sin nombre",
690690
"Unverified": "Sin verificar",
691-
"Uploading %(filename)s and %(count)s others.zero": "Subiendo %(filename)s",
692-
"Uploading %(filename)s and %(count)s others.one": "Subiendo %(filename)s y %(count)s otros",
693-
"Uploading %(filename)s and %(count)s others.other": "Subiendo %(filename)s y %(count)s otros",
691+
"Uploading %(filename)s and %(count)s others|zero": "Subiendo %(filename)s",
692+
"Uploading %(filename)s and %(count)s others|one": "Subiendo %(filename)s y %(count)s otros",
693+
"Uploading %(filename)s and %(count)s others|other": "Subiendo %(filename)s y %(count)s otros",
694694
"Upload avatar": "Subir avatar",
695695
"Upload Failed": "Error al subir",
696696
"Upload Files": "Subir archivos",

src/i18n/strings/eu.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@
337337
"Confirm password": "Berretsi pasahitza",
338338
"Conference calls are not supported in this client": "Bezero honek ez ditu konferentzia deiak onartzen",
339339
"Could not connect to the integration server": "Ezin izan da integrazio zerbitzarira konektatu",
340-
"%(count)s new messages.one": "mezu berri %(count)s",
341-
"%(count)s new messages.other": "%(count)s mezu berri",
340+
"%(count)s new messages|one": "mezu berri %(count)s",
341+
"%(count)s new messages|other": "%(count)s mezu berri",
342342
"Create a new chat or reuse an existing one": "Sortu txat berria edo berrerabili aurreko bat",
343343
"Create an account": "Sortu kontua",
344344
"Create Room": "Sortu gela",
@@ -647,9 +647,9 @@
647647
"Unrecognised command:": "Agindu ezezaguna:",
648648
"Unrecognised room alias:": "Gelaren ezizen ezezaguna:",
649649
"Unverified": "Egiaztatu gabea",
650-
"Uploading %(filename)s and %(count)s others.zero": "%(filename)s igotzen",
651-
"Uploading %(filename)s and %(count)s others.one": "%(filename)s eta beste %(count)s igotzen",
652-
"Uploading %(filename)s and %(count)s others.other": "%(filename)s eta beste %(count)s igotzen",
650+
"Uploading %(filename)s and %(count)s others|zero": "%(filename)s igotzen",
651+
"Uploading %(filename)s and %(count)s others|one": "%(filename)s eta beste %(count)s igotzen",
652+
"Uploading %(filename)s and %(count)s others|other": "%(filename)s eta beste %(count)s igotzen",
653653
"uploaded a file": "fitxategi bat igo du",
654654
"Upload avatar": "Igo abatarra",
655655
"Upload Failed": "Igoerak huts egin du",
@@ -754,8 +754,8 @@
754754
"Sent messages will be stored until your connection has returned.": "Bidalitako mezuak zure konexioa berreskuratu arte gordeko dira.",
755755
"Auto-complete": "Osatze automatikoa",
756756
"<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.",
757-
"(~%(count)s results).one": "(~%(count)s emaitza)",
758-
"(~%(count)s results).other": "(~%(count)s emaitza)",
757+
"(~%(count)s results)|one": "(~%(count)s emaitza)",
758+
"(~%(count)s results)|other": "(~%(count)s emaitza)",
759759
"bold": "lodia",
760760
"italic": "etzana",
761761
"strike": "marratua",
@@ -916,8 +916,8 @@
916916
"Disable Peer-to-Peer for 1:1 calls": "Desgaitu P2P biren arteko deietan",
917917
"Add a widget": "Gehitu trepeta bat",
918918
"Allow": "Baimendu",
919-
"and %(count)s others....other": "eta beste %(count)s...",
920-
"and %(count)s others....one": "eta beste bat...",
919+
"and %(count)s others...|other": "eta beste %(count)s...",
920+
"and %(count)s others...|one": "eta beste bat...",
921921
"Cannot add any more widgets": "Ezin dira trepeta gehiago gehitu",
922922
"Changes colour scheme of current room": "Gela honen kolore eskema aldatzen du",
923923
"Delete widget": "Ezabatu trepeta",

0 commit comments

Comments
 (0)