From ba386e3417f5c1d86f46c08c2149a8f8dc1aaf36 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 11 Oct 2017 20:08:09 -0600 Subject: [PATCH 1/3] Singularise unsent message prompt, if applicable Adds vector-im/riot-web#1217 Signed-off-by: Travis Ralston --- src/components/structures/RoomStatusBar.js | 7 ++++++- src/components/structures/RoomView.js | 4 +++- src/i18n/strings/en_EN.json | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js index 3a2ab33db8..68d25e9a2a 100644 --- a/src/components/structures/RoomStatusBar.js +++ b/src/components/structures/RoomStatusBar.js @@ -39,6 +39,9 @@ module.exports = React.createClass({ // string to display when there are messages in the room which had errors on send unsentMessageError: React.PropTypes.string, + // the number of messages not sent. + numUnsentMessages: React.PropTypes.number, + // this is true if we are fully scrolled-down, and are looking at // the end of the live timeline. atEndOfLiveTimeline: React.PropTypes.bool, @@ -252,6 +255,8 @@ module.exports = React.createClass({ } if (this.props.unsentMessageError) { + let resendStr = "Resend message or cancel message now."; + if (this.props.numUnsentMessages > 1) resendStr = "Resend all or cancel all now. You can also select individual messages to resend or cancel."; return (
/!\ @@ -259,7 +264,7 @@ module.exports = React.createClass({ { this.props.unsentMessageError }
- { _tJsx("Resend all or cancel all now. You can also select individual messages to resend or cancel.", + { _tJsx(resendStr, [/(.*?)<\/a>/, /(.*?)<\/a>/], [ (sub) => { sub }, diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index 14273fc95f..9a1eb9ef31 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -748,7 +748,8 @@ module.exports = React.createClass({ for (const event of unsentMessages) { if (!event.error || event.error.name !== "UnknownDeviceError") { - return _t("Some of your messages have not been sent."); + if (unsentMessages.length > 1) return _t("Some of your messages have not been sent."); + return _t("Your message was not sent."); } } return _t("Message not sent due to unknown devices being present"); @@ -1570,6 +1571,7 @@ module.exports = React.createClass({ isStatusAreaExpanded = this.state.statusBarVisible; statusBar = Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Resend all or cancel all now. You can also select individual messages to resend or cancel.", + "Resend message or cancel message now.": "Resend message or cancel message now.", "(~%(count)s results)|one": "(~%(count)s result)", "(~%(count)s results)|other": "(~%(count)s results)", "Cancel": "Cancel", From be48460595525c5c895fc6ae98e873c3abb344c5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 4 Jan 2018 15:05:08 +0000 Subject: [PATCH 2/3] Singularise unsent message prompt, if applicable Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/RoomStatusBar.js | 6 +++--- src/i18n/strings/en_EN.json | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js index 77d506d9af..8be0f2c941 100644 --- a/src/components/structures/RoomStatusBar.js +++ b/src/components/structures/RoomStatusBar.js @@ -302,11 +302,11 @@ module.exports = React.createClass({ ) { title = unsentMessages[0].error.data.error; } else { - title = _t("Some of your messages have not been sent."); + title = _t('%(count)s of your messages have not been sent.', { count: unsentMessages.length }); } - content = _t("Resend all or cancel all now. " + + content = _t("%(count)s Resend all or cancel all now. " + "You can also select individual messages to resend or cancel.", - {}, + { count: unsentMessages.length }, { 'resendText': (sub) => { sub }, diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index f28322398c..82ecb304d2 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -774,8 +774,10 @@ "Scroll to bottom of page": "Scroll to bottom of page", "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present", "Show devices or cancel all.": "Show devices or cancel all.", - "Some of your messages have not been sent.": "Some of your messages have not been sent.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Resend all or cancel all now. You can also select individual messages to resend or cancel.", + "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.", + "%(count)s of your messages have not been sent.|one": "Your message was not sent.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Resend all or cancel all now. You can also select individual messages to resend or cancel.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|one": "Resend message or cancel message now.", "Warning": "Warning", "Connectivity to the server has been lost.": "Connectivity to the server has been lost.", "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.", From e99477d48652a77da356d3f7cb0d1b3760ed0267 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 4 Jan 2018 15:13:54 +0000 Subject: [PATCH 3/3] naive translation rescue post-pluralisation Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/cs.json | 2 +- src/i18n/strings/de_DE.json | 4 ++-- src/i18n/strings/el.json | 4 ++-- src/i18n/strings/en_US.json | 4 ++-- src/i18n/strings/es.json | 2 +- src/i18n/strings/eu.json | 4 ++-- src/i18n/strings/fi.json | 4 ++-- src/i18n/strings/fr.json | 4 ++-- src/i18n/strings/hu.json | 4 ++-- src/i18n/strings/ko.json | 4 ++-- src/i18n/strings/lv.json | 4 ++-- src/i18n/strings/nl.json | 4 ++-- src/i18n/strings/pl.json | 4 ++-- src/i18n/strings/pt.json | 4 ++-- src/i18n/strings/pt_BR.json | 4 ++-- src/i18n/strings/ru.json | 4 ++-- src/i18n/strings/sk.json | 4 ++-- src/i18n/strings/sv.json | 2 +- src/i18n/strings/te.json | 2 +- src/i18n/strings/tr.json | 4 ++-- src/i18n/strings/zh_Hans.json | 4 ++-- src/i18n/strings/zh_Hant.json | 4 ++-- 22 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index c797044693..6e1c22142a 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -326,7 +326,7 @@ "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zobrazovat časové značky v 12hodinovém formátu (např. 2:30 odp.)", "Sign in": "Přihlásit", "Sign out": "Odhlásit", - "Some of your messages have not been sent.": "Některé z vašich zpráv nebyly odeslány.", + "%(count)s of your messages have not been sent.|other": "Některé z vašich zpráv nebyly odeslány.", "Someone": "Někdo", "Start a chat": "Začít chat", "Start authentication": "Začít ověření", diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index db12a69657..258a8d787c 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -378,7 +378,7 @@ "Server may be unavailable, overloaded, or search timed out :(": "Der Server ist entweder nicht verfügbar, überlastet oder die Suche wurde wegen Zeitüberschreitung abgebrochen :(", "Server may be unavailable, overloaded, or the file too big": "Server ist entweder nicht verfügbar, überlastet oder die Datei ist zu groß", "Server unavailable, overloaded, or something else went wrong.": "Server ist nicht verfügbar, überlastet oder ein anderer Fehler ist aufgetreten.", - "Some of your messages have not been sent.": "Einige deiner Nachrichten wurden nicht gesendet.", + "%(count)s of your messages have not been sent.|other": "Einige deiner Nachrichten wurden nicht gesendet.", "Submit": "Absenden", "%(actionVerb)s this person?": "Diese Person %(actionVerb)s?", "This room has no local addresses": "Dieser Raum hat keine lokale Adresse", @@ -640,7 +640,7 @@ "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 register to use this functionality": "Du musst dich registrieren, um diese Funktionalität nutzen zu können", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Alle erneut senden oder alle verwerfen. Du kannst auch einzelne Nachrichten erneut senden oder verwerfen.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Alle erneut senden oder alle verwerfen. Du kannst auch einzelne Nachrichten erneut senden oder verwerfen.", "Create new room": "Neuen Raum erstellen", "Room directory": "Raum-Verzeichnis", "Start chat": "Chat starten", diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index e8362b5181..84f56f4502 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -531,7 +531,7 @@ "Server unavailable, overloaded, or something else went wrong.": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή κάτι άλλο να πήγε στραβά.", "Show panel": "Εμφάνιση καρτέλας", "Show Text Formatting Toolbar": "Εμφάνιση της εργαλειοθήκης μορφοποίησης κειμένου", - "Some of your messages have not been sent.": "Μερικά από τα μηνύματα σας δεν έχουν αποσταλεί.", + "%(count)s of your messages have not been sent.|other": "Μερικά από τα μηνύματα σας δεν έχουν αποσταλεί.", "This room is not recognised.": "Αυτό το δωμάτιο δεν αναγνωρίζεται.", "to favourite": "στα αγαπημένα", "Unable to capture screen": "Αδυναμία σύλληψης οθόνης", @@ -673,7 +673,7 @@ "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Ο κωδικός πρόσβασής σας άλλαξε επιτυχώς. Δεν θα λάβετε ειδοποιήσεις push σε άλλες συσκευές μέχρι να συνδεθείτε ξανά σε αυτές", "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Δεν θα μπορέσετε να αναιρέσετε αυτήν την αλλαγή καθώς προωθείτε τον χρήστη να έχει το ίδιο επίπεδο δύναμης με τον εαυτό σας.", "Sent messages will be stored until your connection has returned.": "Τα απεσταλμένα μηνύματα θα αποθηκευτούν μέχρι να αακτηθεί η σύνδεσή σας.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Αποστολή ξανά όλων ή ακύρωση όλων τώρα. Μπορείτε επίσης να επιλέξετε μεμονωμένα μηνύματα για να τα στείλετε ξανά ή να ακυρώσετε.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Αποστολή ξανά όλων ή ακύρωση όλων τώρα. Μπορείτε επίσης να επιλέξετε μεμονωμένα μηνύματα για να τα στείλετε ξανά ή να ακυρώσετε.", "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Είστε βέβαιοι ότι θέλετε να καταργήσετε (διαγράψετε) αυτό το συμβάν; Σημειώστε ότι αν διαγράψετε το όνομα δωματίου ή αλλάξετε το θέμα, θα μπορούσε να αναιρέσει την αλλαγή.", "This allows you to use this app with an existing Matrix account on a different home server.": "Αυτό σας επιτρέπει να χρησιμοποιήσετε την εφαρμογή με έναν υπάρχον λογαριασμό Matrix σε έναν διαφορετικό διακομιστή.", "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Μπορείτε επίσης να ορίσετε έναν προσαρμοσμένο διακομιστή ταυτοποίησης, αλλά αυτό συνήθως θα αποτρέψει την αλληλεπίδραση με τους χρήστες που βασίζονται στην ηλεκτρονική διεύθυνση αλληλογραφίας.", diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index 3783a42ddc..ce2458f8a0 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -340,7 +340,7 @@ "since the point in time of selecting this option": "since the point in time of selecting this option", "since they joined": "since they joined", "since they were invited": "since they were invited", - "Some of your messages have not been sent.": "Some of your messages have not been sent.", + "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.", "Someone": "Someone", "Sorry, this homeserver is using a login which is not recognised ": "Sorry, this homeserver is using a login which is not recognized ", "Start a chat": "Start a chat", @@ -736,7 +736,7 @@ "You may wish to login with a different account, or add this email to this account.": "You may wish to login with a different account, or add this email to this account.", "You must register to use this functionality": "You must register to use this functionality", "Your home server does not support device management.": "Your home server does not support device management.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Resend all or cancel all now. You can also select individual messages to resend or cancel.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Resend all or cancel all now. You can also select individual messages to resend or cancel.", "(~%(count)s results)|one": "(~%(count)s result)", "(~%(count)s results)|other": "(~%(count)s results)", "New Password": "New Password", diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 261700a916..dad7c97fe9 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -321,7 +321,7 @@ "since the point in time of selecting this option": "a partir del momento en que seleccione esta opción", "since they joined": "desde que se conectaron", "since they were invited": "desde que fueron invitados", - "Some of your messages have not been sent.": "Algunos de sus mensajes no han sido enviados.", + "%(count)s of your messages have not been sent.|other": "Algunos de sus mensajes no han sido enviados.", "Someone": "Alguien", "Sorry, this homeserver is using a login which is not recognised ": "Lo siento, este servidor está usando un usuario no reconocido. ", "Start a chat": "Iniciar una conversación", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 486991d350..db18597752 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -415,7 +415,7 @@ "since the point in time of selecting this option": "aukera hau hautatu denetik", "since they joined": "elkartu direnetik", "since they were invited": "gonbidatu zaienetik", - "Some of your messages have not been sent.": "Zure mezu batzuk ez dira bidali.", + "%(count)s of your messages have not been sent.|other": "Zure mezu batzuk ez dira bidali.", "Sorry, this homeserver is using a login which is not recognised ": "Hasiera zerbitzari honek ezagutzen ez den saio bat erabiltzen du ", "Tagged as: ": "Jarritako etiketa: ", "The default role for new room members is": "Gelako kide berrien lehenetsitako rola:", @@ -571,7 +571,7 @@ "Encrypt room": "Zifratu gela", "There are no visible files in this room": "Ez dago fitxategi ikusgairik gela honetan", "Sent messages will be stored until your connection has returned.": "Bidalitako mezuak zure konexioa berreskuratu arte gordeko dira.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Birbidali guztiak edo baztertu guztiak orain. Mezuak banaka aukeratu ditzakezu ere birbidali ala baztertzeko.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Birbidali guztiak edo baztertu guztiak orain. Mezuak banaka aukeratu ditzakezu ere birbidali ala baztertzeko.", "(~%(count)s results)|one": "(~%(count)s emaitza)", "(~%(count)s results)|other": "(~%(count)s emaitza)", "bold": "lodia", diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index aeca03c48d..4a861011f0 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -286,7 +286,7 @@ "Sign out": "Kirjaudu ulos", "since they joined": "liittymisestä lähtien", "since they were invited": "kutsusta lähtien", - "Some of your messages have not been sent.": "Jotkut viesteistäsi ei ole lähetetty.", + "%(count)s of your messages have not been sent.|other": "Jotkut viesteistäsi ei ole lähetetty.", "Someone": "Joku", "Start a chat": "Aloita keskustelu", "Start Chat": "Aloita keskustelu", @@ -419,7 +419,7 @@ "Failed to copy": "Kopiointi epäonnistui", "Connectivity to the server has been lost.": "Yhteys palvelimeen menetettiin.", "Sent messages will be stored until your connection has returned.": "Lähetetyt viestit tallennetaan kunnes yhteys on taas muodostettu.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Uudelleenlähetä kaikki tai hylkää kaikki nyt. Voit myös valita yksittäisiä viestejä uudelleenlähetettäväksi tai hylättäväksi.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Uudelleenlähetä kaikki tai hylkää kaikki nyt. Voit myös valita yksittäisiä viestejä uudelleenlähetettäväksi tai hylättäväksi.", "(~%(count)s results)|one": "(~%(count)s tulos)", "(~%(count)s results)|other": "(~%(count)s tulosta)", "Active call": "Aktiivinen puhelu", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index a9b7232e29..13fb3c96b5 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -297,7 +297,7 @@ "since the point in time of selecting this option": "depuis le moment où cette option a été sélectionnée", "since they joined": "depuis qu’ils ont rejoint le salon", "since they were invited": "depuis qu’ils ont été invités", - "Some of your messages have not been sent.": "Certains de vos messages n’ont pas été envoyés.", + "%(count)s of your messages have not been sent.|other": "Certains de vos messages n’ont pas été envoyés.", "Someone": "Quelqu'un", "Sorry, this homeserver is using a login which is not recognised ": "Désolé, ce serveur d'accueil utilise un identifiant qui n’est pas reconnu ", "Start a chat": "Commencer une discussion", @@ -637,7 +637,7 @@ "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 register to use this functionality": "Vous devez vous inscrire pour utiliser cette fonctionnalité", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Tout renvoyer ou tout annuler maintenant. Vous pouvez aussi sélectionner des messages individuels à renvoyer ou annuler.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Tout renvoyer ou tout annuler maintenant. Vous pouvez aussi sélectionner des messages individuels à renvoyer ou annuler.", "Create new room": "Créer un nouveau salon", "Room directory": "Répertoire des salons", "Start chat": "Commencer une discussion", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index b316e994a1..aefed5fb51 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -370,7 +370,7 @@ "since the point in time of selecting this option": "onnantól, hogy ez az opció kiválasztásra került", "since they joined": "onnantól, hogy csatlakozott", "since they were invited": "onnantól, hogy meg lett hívva", - "Some of your messages have not been sent.": "Néhány üzeneted nem lett elküldve.", + "%(count)s of your messages have not been sent.|other": "Néhány üzeneted nem lett elküldve.", "Someone": "Valaki", "Sorry, this homeserver is using a login which is not recognised ": "Bocs, ez a saját szerver olyan beléptetést használ ami nem ismert ", "Start a chat": "Csevegés indítása", @@ -550,7 +550,7 @@ "Room": "Szoba", "Connectivity to the server has been lost.": "A szerverrel a kapcsolat megszakadt.", "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.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Most újraküldöd mind vagy eldobod mind. Újraküldésre vagy eldobásra egyenként is kiválaszthatod az üzeneteket.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Most újraküldöd mind vagy eldobod mind. Ú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)|other": "(~%(count)s db eredmény)", "Active call": "Folyamatban lévő hívás", diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index f3d54e9449..a46bc90687 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -375,7 +375,7 @@ "since the point in time of selecting this option": "이 선택을 하는 시점부터", "since they joined": "들어온 이후", "since they were invited": "초대받은 이후", - "Some of your messages have not been sent.": "일부 메시지는 보내지 못했어요.", + "%(count)s of your messages have not been sent.|other": "일부 메시지는 보내지 못했어요.", "Someone": "다른 사람", "Sorry, this homeserver is using a login which is not recognised ": "죄송해요, 이 홈 서버는 인식할 수 없는 로그인을 쓰고 있네요 ", "Start a chat": "이야기하기", @@ -553,7 +553,7 @@ "Room": "방", "Connectivity to the server has been lost.": "서버 연결이 끊어졌어요.", "Sent messages will be stored until your connection has returned.": "보내신 메시지는 다시 연결될 때까지 저장할 거에요.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "전부 다시 보내거나 취소하세요. 다시 보내거나 취소할 메시지를 하나씩 고르실 수도 있어요.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "전부 다시 보내거나 취소하세요. 다시 보내거나 취소할 메시지를 하나씩 고르실 수도 있어요.", "(~%(count)s results)|one": "(~%(count)s 결과)", "(~%(count)s results)|other": "(~%(count)s 결과)", "Active call": "전화 중", diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index 63a504d71e..854454ab24 100644 --- a/src/i18n/strings/lv.json +++ b/src/i18n/strings/lv.json @@ -456,7 +456,7 @@ "since the point in time of selecting this option": "kopš šī uzstādījuma izvēles brīža", "since they joined": "kopš tie pievienojās", "since they were invited": "kopš tie tika uzaicināti", - "Some of your messages have not been sent.": "Dažas no tavām ziņām netika nosūtītas.", + "%(count)s of your messages have not been sent.|other": "Dažas no tavām ziņām netika nosūtītas.", "Someone": "Kāds", "Sorry, this homeserver is using a login which is not recognised ": "Atvaino, šis serveris izmanto neatpazītu pierakstīšanās veidu ", "Start a chat": "Sākt čatu", @@ -614,7 +614,7 @@ "Room": "Istaba", "Connectivity to the server has been lost.": "Savienojums ar serveri tika zaudēts.", "Sent messages will be stored until your connection has returned.": "Nosūtītās ziņas tiks saglabātas tiklīdz savienojums tiks atjaunots.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Sūtīt vēlreiz visas vai atcelt visas. Tu vari arī atlasīt atsevišķas ziņas, kuras sūtīt vai atcelt.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Sūtīt vēlreiz visas vai atcelt visas. Tu vari arī atlasīt atsevišķas ziņas, kuras sūtīt vai atcelt.", "Active call": "Aktīvs zvans", "bold": "trekns", "italic": "itāļu", diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 357ab92026..b364bdadb1 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -404,7 +404,7 @@ "since the point in time of selecting this option": "sinds het punt in tijd dat deze optie geselecteerd wordt", "since they joined": "sinds ze zijn toegetreden", "since they were invited": "sinds ze zijn uitgenodigd", - "Some of your messages have not been sent.": "Een paar van je berichten zijn niet verstuurd.", + "%(count)s of your messages have not been sent.|other": "Een paar van je berichten zijn niet verstuurd.", "Someone": "Iemand", "Sorry, this homeserver is using a login which is not recognised ": "Sorry, deze thuisserver gebruikt een inlogmethode die niet wordt herkend. ", "The default role for new room members is": "De standaardrol voor nieuwe ruimteleden is", @@ -553,7 +553,7 @@ "Room": "Ruimte", "Connectivity to the server has been lost.": "De connectiviteit naar de server is verloren.", "Sent messages will be stored until your connection has returned.": "Verstuurde berichten zullen opgeslagen worden tot je connectie weer terug is.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Verstuur alle of annuleer alle nu. Je kan ook individuele berichten selecteren om te versturen of te annuleren.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Verstuur alle of annuleer alle nu. Je kan ook individuele berichten selecteren om te versturen of te annuleren.", "(~%(count)s results)|one": "(~%(count)s resultaat)", "(~%(count)s results)|other": "(~%(count)s resultaten)", "Active call": "Actief gesprek", diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index 4e7aa2fd55..0990fec856 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -451,7 +451,7 @@ "since the point in time of selecting this option": "od momentu zaznaczenia tej opcji", "since they joined": "od momentu dołączenia", "since they were invited": "od momentu zaproszenia", - "Some of your messages have not been sent.": "Niektóre z twoich wiadomości nie zostały wysłane.", + "%(count)s of your messages have not been sent.|other": "Niektóre z twoich wiadomości nie zostały wysłane.", "Someone": "Ktoś", "Sorry, this homeserver is using a login which is not recognised ": "Przepraszamy, ten serwer używa loginu który nie jest rozpoznawany ", "Start a chat": "Rozpocznij rozmowę", @@ -613,7 +613,7 @@ "Make Moderator": "Nadaj uprawnienia moderatora", "Make this room private": "Nadaj temu pokojowi charakter prywatny", "Sent messages will be stored until your connection has returned.": "Wysłane wiadomości będą przechowywane aż do momentu odzyskania połączenia.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Wyślij ponownie wszystkie lub anuluj wszystkie teraz. Możesz też wybrać poszczególne wiadomości aby wysłać je ponownie lub anulować.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Wyślij ponownie wszystkie lub anuluj wszystkie teraz. Możesz też wybrać poszczególne wiadomości aby wysłać je ponownie lub anulować.", "(~%(count)s results)|one": "(~%(count)s wynik)", "(~%(count)s results)|other": "(~%(count)s wyników)", "Active call": "Aktywna rozmowa", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index 8ef4e6f6a0..3ebf23c1ee 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -393,7 +393,7 @@ "Server may be unavailable, overloaded, or search timed out :(": "O servidor pode estar indisponível, sobrecarregado, ou a busca ultrapassou o tempo limite :(", "Server may be unavailable, overloaded, or the file too big": "O servidor pode estar indisponível, sobrecarregado, ou o arquivo é muito grande", "Server unavailable, overloaded, or something else went wrong.": "O servidor pode estar indisponível, sobrecarregado, ou alguma outra coisa não funcionou.", - "Some of your messages have not been sent.": "Algumas das suas mensagens não foram enviadas.", + "%(count)s of your messages have not been sent.|other": "Algumas das suas mensagens não foram enviadas.", "Submit": "Enviar", "The main address for this room is": "O endereço principal desta sala é", "%(actionVerb)s this person?": "%(actionVerb)s esta pessoa?", @@ -702,7 +702,7 @@ "The phone number entered looks invalid": "O número de telefone inserido parece ser inválido", "Rejoin": "Voltar a participar da sala", "Create a new chat or reuse an existing one": "Criar uma nova conversa ou reutilizar alguma já existente", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Reenviar todas ou cancelar todas agora. Você também pode selecionar mensagens individuais que queira reenviar ou cancelar.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Reenviar todas ou cancelar todas agora. Você também pode selecionar mensagens individuais que queira reenviar ou cancelar.", "Reason: %(reasonText)s": "Justificativa: %(reasonText)s", "Home": "Início", "Something went wrong!": "Algo deu errado!", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index fee6bcba31..67f6c5d7ab 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -395,7 +395,7 @@ "Server may be unavailable, overloaded, or search timed out :(": "O servidor pode estar indisponível, sobrecarregado, ou a busca ultrapassou o tempo limite :(", "Server may be unavailable, overloaded, or the file too big": "O servidor pode estar indisponível, sobrecarregado, ou o arquivo é muito grande", "Server unavailable, overloaded, or something else went wrong.": "O servidor pode estar indisponível, sobrecarregado, ou alguma outra coisa não funcionou.", - "Some of your messages have not been sent.": "Algumas das suas mensagens não foram enviadas.", + "%(count)s of your messages have not been sent.|other": "Algumas das suas mensagens não foram enviadas.", "Submit": "Enviar", "The main address for this room is": "O endereço principal desta sala é", "%(actionVerb)s this person?": "%(actionVerb)s esta pessoa?", @@ -642,7 +642,7 @@ "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", "You must register to use this functionality": "Você deve se registrar para poder usar esta funcionalidade", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Reenviar todas ou cancelar todas agora. Você também pode selecionar mensagens individuais que queira reenviar ou cancelar.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Reenviar todas ou cancelar todas agora. Você também pode selecionar mensagens individuais que queira reenviar ou cancelar.", "Create new room": "Criar nova sala", "Room directory": "Lista pública de salas", "Start chat": "Iniciar conversa", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 8ca50ec72f..9a5e77da1a 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -358,7 +358,7 @@ "since the point in time of selecting this option": "с момента выбора этой настройки", "since they joined": "с момента входа", "since they were invited": "с момента приглашения", - "Some of your messages have not been sent.": "Некоторые сообщения не были отправлены.", + "%(count)s of your messages have not been sent.|other": "Некоторые сообщения не были отправлены.", "Someone": "Кто-то", "Submit": "Отправить", "Success": "Успех", @@ -641,7 +641,7 @@ "Uploading %(filename)s and %(count)s others|other": "Отправка %(filename)s и %(count)s других", "Username invalid: %(errMessage)s": "Неверное имя пользователя: %(errMessage)s", "You must register to use this functionality": "Вы должны зарегистрироваться, чтобы использовать эту функцию", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Отправить все или отменить отправку. Также можно выбрать отдельные сообщения для повторной отправки или отмены.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Отправить все или отменить отправку. Также можно выбрать отдельные сообщения для повторной отправки или отмены.", "New Password": "Новый пароль", "Start chatting": "Начать общение", "Start Chatting": "Начать общение", diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index 837a55e380..264d011be8 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -728,14 +728,14 @@ "Scroll to bottom of page": "Posunúť na spodok stránky", "Connectivity to the server has been lost.": "Spojenie so serverom bolo prerušené.", "Sent messages will be stored until your connection has returned.": "Odoslané správy ostanú uložené, kým sa spojenie nenadviaže znovu.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "Znovu odoslať všetky alebo zrušiť všetky teraz. Môžete tiež znovu poslať alebo zrušiť odosielanie jednotlivých správ zvlášť.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "Znovu odoslať všetky alebo zrušiť všetky teraz. Môžete tiež znovu poslať alebo zrušiť odosielanie jednotlivých správ zvlášť.", "%(count)s new messages|other": "%(count)s nových správ", "%(count)s new messages|one": "%(count)s nová správa", "Active call": "Aktívny hovor", "There's no one else here! Would you like to invite others or stop warning about the empty room?": "Okrem vás v tejto miestnosti nie je nik iný! Želáte si pozvať ďalších alebo prestať upozorňovať na prázdnu miestnosť?", "You seem to be uploading files, are you sure you want to quit?": "Zdá sa, že práve nahrávate súbory, ste si istí, že chcete skončiť?", "You seem to be in a call, are you sure you want to quit?": "Zdá sa, že máte prebiehajúci hovor, ste si istí, že chcete skončiť?", - "Some of your messages have not been sent.": "Niektoré vaše správy ešte neboli odoslané.", + "%(count)s of your messages have not been sent.|other": "Niektoré vaše správy ešte neboli odoslané.", "Message not sent due to unknown devices being present": "Neodoslaná správa kvôli nájdeným neznámym zariadeniam", "Failed to upload file": "Nepodarilo sa nahrať súbor", "Server may be unavailable, overloaded, or the file too big": "Server môže byť nedostupný, preťažený, alebo je súbor príliš veľký", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index f14a563117..d091ae9d77 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -365,7 +365,7 @@ "since the point in time of selecting this option": "från och med att det här alternativet valdes", "since they joined": "från och med att de gick med", "since they were invited": "från och med att de bjöds in", - "Some of your messages have not been sent.": "Vissa av dina meddelanden har inte skickats.", + "%(count)s of your messages have not been sent.|other": "Vissa av dina meddelanden har inte skickats.", "Someone": "Någon", "Sorry, this homeserver is using a login which is not recognised ": "Den här hemsevern använder en login-metod som inte stöds ", "Start a chat": "Starta en chatt", diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json index d542f8140c..0ad3c0fd15 100644 --- a/src/i18n/strings/te.json +++ b/src/i18n/strings/te.json @@ -161,7 +161,7 @@ "Connectivity to the server has been lost.": "సెర్వెర్ కనెక్టివిటీని కోల్పోయారు.", "Sent messages will be stored until your connection has returned.": "మీ కనెక్షన్ తిరిగి వచ్చే వరకు పంపిన సందేశాలు నిల్వ చేయబడతాయి.", "Cancel": "రద్దు", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "అన్నీ మళ్లీ పంపులేదాఅన్నింటినీ రద్దు చేయండిప్పుడు.వ్యక్తిగత సందేశాలను మీరు మళ్ళీ చేసుకోవచ్చు లేదా రద్దు చేసుకోవచ్చు.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "అన్నీ మళ్లీ పంపులేదాఅన్నింటినీ రద్దు చేయండిప్పుడు.వ్యక్తిగత సందేశాలను మీరు మళ్ళీ చేసుకోవచ్చు లేదా రద్దు చేసుకోవచ్చు.", "bold": "బోల్డ్", "italic": "ఇటాలిక్", "strike": "సమ్మె", diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 5f1e8256ac..9964606e93 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -365,7 +365,7 @@ "since the point in time of selecting this option": "Bu seçenek seçildiğinden beri", "since they joined": "Katıldıklarından beri", "since they were invited": "davet edildiklerinden beri", - "Some of your messages have not been sent.": "Bazı mesajlarınız gönderilemedi.", + "%(count)s of your messages have not been sent.|other": "Bazı mesajlarınız gönderilemedi.", "Someone": "Birisi", "Sorry, this homeserver is using a login which is not recognised ": "Maalesef , bu Ana Sunucu tanımlanmamış bir Giriş kullanıyor ", "Start a chat": "Bir Sohbet Başlat", @@ -545,7 +545,7 @@ "Room": "Oda", "Connectivity to the server has been lost.": "Sunucuyla olan bağlantı kesildi.", "Sent messages will be stored until your connection has returned.": "Gönderilen iletiler bağlantınız geri gelene kadar saklanacak.", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": " Hepsini yeniden gönderin veya Hepsini iptal edin şimdi . Ayrıca yeniden göndermek veya iptal etmek için özel iletiler seçebilirsin.", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": " Hepsini yeniden gönderin veya Hepsini iptal edin ş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)|other": "(~%(count)s sonuçlar)", "Cancel": "İptal Et", diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index 474233909f..160e6c4e86 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -128,7 +128,7 @@ "since the point in time of selecting this option": "从选择此选项起", "since they joined": "从他们加入时起", "since they were invited": "从他们被邀请时起", - "Some of your messages have not been sent.": "部分消息未发送。", + "%(count)s of your messages have not been sent.|other": "部分消息未发送。", "Someone": "某个用户", "Sorry, this homeserver is using a login which is not recognised ": "很抱歉，无法识别此主服务器使用的登录方式 ", "Start a chat": "创建聊天", @@ -679,7 +679,7 @@ "The visibility of existing history will be unchanged": "现有历史记录的可见性不会被改变", "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 打开了端到端加密 (算法 %(algorithm)s).", "Unable to remove contact information": "无法移除联系人信息", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "现在 重发全部 或者 取消全部。你也可以选择重发或取消单独的消息。", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "现在 重发全部 或者 取消全部。你也可以选择重发或取消单独的消息。", "were invited %(repeats)s times": "被邀请 %(repeats)s 次", "was invited %(repeats)s times": "被邀请 %(repeats)s 次", "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据来允许我们改善这个应用。", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 6e0cfd3892..1669b1ce48 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -176,7 +176,7 @@ "since the point in time of selecting this option": "從選擇此選項起", "since they joined": "從他們加入時起", "since they were invited": "從他們被邀請時起", - "Some of your messages have not been sent.": "部分訊息未送出。", + "%(count)s of your messages have not been sent.|other": "部分訊息未送出。", "Someone": "某個用戶", "Sorry, this homeserver is using a login which is not recognised ": "很抱歉，無法識別此主伺服器使用的登錄方式 ", "Start a chat": "創建聊天", @@ -583,7 +583,7 @@ "Room": "房間", "Connectivity to the server has been lost.": "至伺服器的連線已遺失。", "Sent messages will be stored until your connection has returned.": "傳送的訊息會在您的連線恢復前先儲存起來。", - "Resend all or cancel all now. You can also select individual messages to resend or cancel.": "現在重新傳送全部或是取消全部。您也可以單獨選擇訊息來重新傳送或取消。", + "%(count)s Resend all or cancel all now. You can also select individual messages to resend or cancel.|other": "現在重新傳送全部或是取消全部。您也可以單獨選擇訊息來重新傳送或取消。", "(~%(count)s results)|one": "（~%(count)s 結果）", "(~%(count)s results)|other": "（~%(count)s 結果）", "Active call": "活躍的通話",