Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

i18n fixes #951

Merged
merged 4 commits into from
May 28, 2017
Merged

i18n fixes #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b55503e
i18n the forwarding aux panel
t3chguy May 28, 2017
c873258
remove most duplicate keys in en_EN
t3chguy May 28, 2017
8d64bf2
fix weird mangled key vals (and dups)
t3chguy May 28, 2017
3a8288b
remove identical duplicates in fr
t3chguy May 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/views/rooms/ForwardMessage.js
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@
*/

import React from 'react';
import { _t } from '../../../languageHandler';
import MatrixClientPeg from '../../../MatrixClientPeg';
import dis from '../../../dispatcher';
import KeyCode from '../../../KeyCode';
Expand Down Expand Up @@ -88,7 +89,7 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_ForwardMessage">
<h1>Please select the destination room for this message</h1>
<h1>{_t('Please select the destination room for this message')}</h1>
</div>
);
},
Expand Down
11 changes: 3 additions & 8 deletions src/i18n/strings/en_EN.json
View file
Open in desktop
Expand Up @@ -80,7 +80,6 @@
"ja":"Japanese",
"ji":"Yiddish",
"ko":"Korean",
"ko":"Korean (Johab)",
"lt":"Lithuanian",
"lv":"Latvian",
"mk":"Macedonian (FYROM)",
Expand All @@ -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",
Expand Down Expand Up @@ -285,7 +283,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",
Expand Down Expand Up @@ -371,7 +368,6 @@
"Once you&#39;ve followed the link it contains, click below": "Once you&#39;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",
Expand Down Expand Up @@ -604,8 +600,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",
Expand Down Expand Up @@ -678,5 +672,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"
}
2 changes: 0 additions & 2 deletions src/i18n/strings/fr.json
View file
Open in desktop
Expand Up @@ -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 ?",
Expand Down Expand Up @@ -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",
Expand Down