Merge pull request #951 from t3chguy/forward_message

i18n fixes

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 (
             <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>
         );
     },

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",
@@ -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",
@@ -371,7 +368,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 +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",
@@ -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"
 }

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",