diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
index 55499b0570..0ace98d0fc 100755
--- a/scripts/check-i18n.pl
+++ b/scripts/check-i18n.pl
@@ -141,6 +141,8 @@ foreach my $lang (grep { -f "$i18ndir/$_" && !/(basefile|en_EN)\.json/ } @files)
 sub read_i18n {
     my $path = shift;
     my $map = {};
+    $path =~ /.*\/(.*)$/;
+    my $lang = $1;
 
     open(FILE, "<", $path) || die $!;
     while(<FILE>) {
@@ -148,6 +150,10 @@ sub read_i18n {
             my ($indent, $src, $colon, $dst, $comma) = ($1, $2, $3, $4, $5);
             $src =~ s/\\"/"/g;
             $dst =~ s/\\"/"/g;
+
+            if ($map->{$src}) {
+                printf ("%10s %24s\t%s\n", $lang, "Duplicate translation!", $src);
+            }
             $map->{$src} = $dst;
         }
     }
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index d2c0eda3ff..ae619a1359 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -144,7 +144,7 @@ const commands = {
 
                 dis.dispatch({
                     action: 'view_room',
-                    roomAlias: roomAlias,
+                    room_alias: roomAlias,
                     auto_join: true,
                 });
 
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 (
             <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>
         );
     },
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4105594058..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",
@@ -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&#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",
@@ -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"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 53d24d484b..598b25b3fb 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -174,7 +174,6 @@
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un message texte a été envoyé à +%(msisdn)s. Merci d'entrer le code de vérification qu'il contient",
     "accept": "Accepter",
     "%(targetName)s accepted an invitation.": "%(targetName)s a accepté une invitation.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s a accepté une invitation de %(displayName)s.",
     "Account": "Compte",
     "Add email address": "Ajouter une adresse e-mail",
     "Add phone number": "Ajouter un numéro de téléphone",
@@ -196,7 +195,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 +279,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",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index e636eb54d7..44fc335a2c 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -16,7 +16,6 @@
     "An email has been sent to": "Um email foi enviado para",
     "A new password must be entered.": "Uma nova senha precisa ser informada.",
     "answered the call.": "respondeu à chamada.",
-    "anyone": "qualquer um",
     "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
     "Anyone who knows the room's link, including guests": "Qualquer pessoa que tenha o link da sala, incluindo visitantes",
     "Are you sure you want to leave the room?": "Você tem certeza que deseja sair da sala?",
@@ -354,7 +353,6 @@
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Press": "Aperte",
     "Reason": "Razão",
-    "Refer a friend to Riot:": "Recomende Riot a um/a amigo/a",
     "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index fa9f3bc4da..d2447e8ea3 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -17,7 +17,6 @@
     "New passwords don't match": "As novas senhas não conferem",
     "A new password must be entered.": "Uma nova senha precisa ser informada.",
     "answered the call.": "respondeu à chamada.",
-    "anyone": "qualquer um",
     "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
     "Anyone who knows the room's link, including guests": "Qualquer pessoa que tenha o link da sala, incluindo visitantes",
     "Are you sure you want to leave the room?": "Você tem certeza que deseja sair da sala?",
@@ -358,7 +357,6 @@
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Press": "Aperte",
     "Reason": "Razão",
-    "Refer a friend to Riot:": "Recomende Riot a um/a amigo/a",
     "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 981dd49340..0902edb41a 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -559,7 +559,7 @@
     "Sender device information": "Информация об устройстве отправителя",
     "Send Invites": "Отправить приглашения",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s отправил изображение.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderDisplayName)s отправил приглашение для %(targetDisplayName)s войти в комнату.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s отправил приглашение для %(targetDisplayName)s войти в комнату.",
     "sent a video": "отправил видео",
     "Show panel": "Показать панель",
     "Sign in": "Войти",