From b55503e67f79cf7de9a07ad9caf367f2c1f570ed Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 28 May 2017 13:27:57 +0100 Subject: [PATCH 1/4] i18n the forwarding aux panel Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/rooms/ForwardMessage.js | 3 ++- src/i18n/strings/en_EN.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js index 0ebcdf1e4a..33df201d7c 100644 --- a/src/components/views/rooms/ForwardMessage.js +++ b/src/components/views/rooms/ForwardMessage.js @@ -16,6 +16,7 @@ */ import React from 'react'; +import { _t } from '../../../languageHandler'; import MatrixClientPeg from '../../../MatrixClientPeg'; import dis from '../../../dispatcher'; import KeyCode from '../../../KeyCode'; @@ -88,7 +89,7 @@ module.exports = React.createClass({ render: function() { return (
-

Please select the destination room for this message

+

{_t('Please select the destination room for this message')}

); }, diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 4105594058..c86d124ef3 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -678,5 +678,6 @@ "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)schanged their avatar %(repeats)s times", "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)schanged their avatar %(repeats)s times", "%(severalUsers)schanged their avatar": "%(severalUsers)schanged their avatar", - "%(oneUser)schanged their avatar": "%(oneUser)schanged their avatar" + "%(oneUser)schanged their avatar": "%(oneUser)schanged their avatar", + "Please select the destination room for this message": "Please select the destination room for this message" } From c8732582d3fda8c4ca4859d1feac5bac9461d7a5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 28 May 2017 13:35:30 +0100 Subject: [PATCH 2/4] remove most duplicate keys in en_EN Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/en_EN.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index c86d124ef3..8b116109e1 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -285,7 +285,6 @@ "Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.", "Guest users can't create new rooms. Please register to create room and start a chat": "Guest users can't create new rooms. Please register to create room and start a chat", "Guest users can't upload files. Please register to upload": "Guest users can't upload files. Please register to upload", - "Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.", "Guests can't use labs features. Please register.": "Guests can't use labs features. Please register.", "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.", "had": "had", @@ -371,7 +370,6 @@ "Once you've followed the link it contains, click below": "Once you've followed the link it contains, click below", "Only people who have been invited": "Only people who have been invited", "Operation failed": "Operation failed", - "or": "or", "Password": "Password", "Passwords can't be empty": "Passwords can't be empty", "People": "People", @@ -604,8 +602,6 @@ "Encrypt room": "Encrypt room", "There are no visible files in this room": "There are no visible files in this room", "Room": "Room", - "Room name (optional)": "Room name (optional)", - "Who would you like to add to this room?": "Who would you like to add to this room?", "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.", "Auto-complete": "Auto-complete", From 8d64bf27af660dfc72870fc9217eafbc3aa9acbc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 28 May 2017 13:38:37 +0100 Subject: [PATCH 3/4] fix weird mangled key vals (and dups) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/en_EN.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 8b116109e1..dcd35bdaef 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -80,7 +80,6 @@ "ja":"Japanese", "ji":"Yiddish", "ko":"Korean", - "ko":"Korean (Johab)", "lt":"Lithuanian", "lv":"Latvian", "mk":"Macedonian (FYROM)", @@ -101,8 +100,7 @@ "sk":"Slovak", "sl":"Slovenian", "sq":"Albanian", - "sr":"Serbian (Cyrillic)", - "sr":"Serbian (Latin)", + "sr":"Serbian", "sv-fi":"Swedish (Finland)", "sv":"Swedish", "sx":"Sutu", From 3a8288bf345419a90b0c9924ff880bc344cf5dd2 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 28 May 2017 13:43:44 +0100 Subject: [PATCH 4/4] remove identical duplicates in fr Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/fr.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 53d24d484b..8849ade021 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -196,7 +196,6 @@ "%(names)s and %(count)s others are typing": "%(names)s et %(count)s d'autres sont en train de taper", "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é.", - "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.", "Anyone who knows the room's link, apart from guests": "Tout ceux qui connaissent le lien du salon, à part les invités", "Anyone who knows the room's link, including guests": "Tout ceux qui connaissent le lien du salon, y compris les invités", "Are you sure?": "Êtes-vous sûr ?", @@ -281,7 +280,6 @@ "Authentication": "Authentification", "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.", "An error has occurred.": "Une erreur est survenue.", - "%(senderName)s banned %(targetName)s.": "%(senderName)s a banni %(targetName)s.", "Email": "E-mail", "Failed to send request.": "Erreur lors de l'envoi de la requête.", "Failed to unban": "Échec de l'amnistie",