diff --git a/index.html b/index.html
index 10530f8f8..b256f852a 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
     <script src="interface_config.js?v=5"></script>
-    <script src="libs/app.bundle.js?v=10"></script>
+    <script src="libs/app.bundle.js?v=11"></script>
 
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
     <link rel="stylesheet" href="css/font.css?v=6"/>
diff --git a/lang/main.json b/lang/main.json
index bb1f26534..e9b03b296 100644
--- a/lang/main.json
+++ b/lang/main.json
@@ -108,7 +108,13 @@
     "notify": {
         "disconnected": "disconnected",
         "moderator": "Moderator rights granted !",
-        "connected": "connected"
+        "connected": "connected",
+        "somebody": "Somebody",
+        "me": "Me",
+        "focus": "Conference focus",
+        "focusFail": "__component__ not available - retry in __ms__ sec",
+        "grantedTo": "Moderator rights granted to __to__!",
+        "grantedToUnknown": "Moderator rights granted to $t(somebody)!"
 
     }
 
diff --git a/libs/app.bundle.js b/libs/app.bundle.js
index 42923b218..5b1cef367 100644
--- a/libs/app.bundle.js
+++ b/libs/app.bundle.js
@@ -1625,9 +1625,9 @@ function onMucLeft(jid) {
     console.log('left.muc', jid);
     var displayName = $('#participant_' + Strophe.getResourceFromJid(jid) +
         '>.displayname').html();
-    messageHandler.notify(displayName || 'Somebody',
+    messageHandler.notify(displayName,'notify.somebody', "Somebody",
         'disconnected',
-        'disconnected');
+        'notify.disconnected', "disconnected");
     // Need to call this with a slight delay, otherwise the element couldn't be
     // found for some reason.
     // XXX(gp) it works fine without the timeout for me (with Chrome 38).
@@ -1659,8 +1659,9 @@ function onLocalRoleChange(jid, info, pres, isModerator, isExternalAuthEnabled)
 
     if (isModerator) {
         Authentication.closeAuthenticationWindow();
-        messageHandler.notify(
-            'Me', 'connected', 'Moderator rights granted !');
+        messageHandler.notify(null, "notify.me",
+            'Me', 'connected', "notify.moderator",
+            'Moderator rights granted !');
     }
 }
 
@@ -1704,9 +1705,9 @@ function onPasswordReqiured(callback) {
     );
 }
 function onMucEntered(jid, id, displayName) {
-    messageHandler.notify(displayName || 'Somebody',
+    messageHandler.notify(displayName,'notify.somebody', "Somebody",
         'connected',
-        'connected');
+        'notify.connected', "connected");
 
     // Add Peer's container
     VideoLayout.ensurePeerContainerExists(jid,id);
@@ -1721,14 +1722,22 @@ function onMucRoleChanged(role, displayName) {
     VideoLayout.showModeratorIndicator();
 
     if (role === 'moderator') {
-        var displayName = displayName;
-        if (!displayName) {
-            displayName = 'Somebody';
+        var messageKey, messageOptions = {};
+        var lDisplayName = displayName;
+        if (!lDisplayName) {
+            lDisplayName = 'Somebody';
+            messageKey = "notify.grantedToUnknown";
+        }
+        else
+        {
+            messageKey = "notify.grantedTo";
+            messageOptions = {to: displayName};
         }
         messageHandler.notify(
-            displayName,
-            'connected',
-                'Moderator rights granted to ' + displayName + '!');
+            displayName,'notify.somebody', "Somebody",
+            'connected', messageKey,
+            'Moderator rights granted to ' + lDisplayName + '!',
+            messageOptions);
     }
 }
 
@@ -5520,13 +5529,32 @@ var messageHandler = (function(my) {
         messageHandler.openMessageDialog(title, message);
     };
 
-    my.notify = function(displayName, cls, message) {
+    my.notify = function(displayName, displayNameKey, displayNameDefault,
+                         cls, messageKey, messageDefault, messageArguments) {
+        var displayNameSpan = '<span class="nickname" ';
+        if(displayName)
+        {
+            displayNameSpan += ">" + displayName;
+        }
+        else
+        {
+            displayNameSpan += "data-i18n='" + displayNameKey +
+                "'>" + APP.translation.translateString(displayNameKey, null,
+                {defaultValue: displayNameDefault});
+        }
+        displayNameSpan += "</span>";
+        var lMessageArguments = messageArguments;
+        if(!messageArguments)
+            lMessageArguments = {};
+        lMessageArguments.defaultValue = messageDefault;
         toastr.info(
-            '<span class="nickname">' +
-                displayName +
-            '</span><br>' +
-            '<span class=' + cls + '>' +
-                message +
+            displayNameSpan + '<br>' +
+            '<span class=' + cls + ' data-i18n="' + messageKey + '"' +
+                (messageArguments?
+                    " i18n-options='" + JSON.stringify(messageArguments) + "'"
+                    : "") + ">" +
+            APP.translation.translateString(messageKey, null,
+                lMessageArguments) +
             '</span>');
     };
 
@@ -7507,7 +7535,7 @@ var VideoLayout = (function (my) {
                     "top");
                 videoMutedSpan.appendChild(mutedIndicator);
                 //translate texts for muted indicator
-                APP.translation.translateElement($('#' + videoSpanId  + " > i"));
+                APP.translation.translateElement($('#' + videoSpanId  + " > span > i"));
             }
 
             VideoLayout.updateMutePosition(videoSpanId);
@@ -11443,13 +11471,13 @@ module.exports = {
             options.lng = lang;
         i18n.init(options, initCompleted);
     },
-    translateString: function (key, cb) {
+    translateString: function (key, cb, defaultValue) {
         if(!cb)
-            return i18n.t(key);
+            return i18n.t(key, defaultValue);
 
         if(initialized)
         {
-            cb(i18n.t(key));
+            cb(i18n.t(key, defaultValue));
         }
         else
         {
@@ -14506,11 +14534,13 @@ var Moderator = {
                 var waitMs = getNextErrorTimeout();
                 console.error("Focus error, retry after " + waitMs, error);
                 // Show message
-                APP.UI.messageHandler.notify(
-                    'Conference focus', 'disconnected',
+                APP.UI.messageHandler.notify( null, "notify.focus",
+                    'Conference focus', 'disconnected',"notify.focusFail",
                         Moderator.getFocusComponent() +
                         ' not available - retry in ' +
-                        (waitMs / 1000) + ' sec');
+                        (waitMs / 1000) + ' sec',
+                    {component: Moderator.getFocusComponent(),
+                        ms: (waitMs / 1000)});
                 // Reset response timeout
                 getNextTimeout(true);
                 window.setTimeout(
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 44910bb6c..6f21471c7 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -390,9 +390,9 @@ function onMucLeft(jid) {
     console.log('left.muc', jid);
     var displayName = $('#participant_' + Strophe.getResourceFromJid(jid) +
         '>.displayname').html();
-    messageHandler.notify(displayName || 'Somebody',
+    messageHandler.notify(displayName,'notify.somebody', "Somebody",
         'disconnected',
-        'disconnected');
+        'notify.disconnected', "disconnected");
     // Need to call this with a slight delay, otherwise the element couldn't be
     // found for some reason.
     // XXX(gp) it works fine without the timeout for me (with Chrome 38).
@@ -424,8 +424,9 @@ function onLocalRoleChange(jid, info, pres, isModerator, isExternalAuthEnabled)
 
     if (isModerator) {
         Authentication.closeAuthenticationWindow();
-        messageHandler.notify(
-            'Me', 'connected', 'Moderator rights granted !');
+        messageHandler.notify(null, "notify.me",
+            'Me', 'connected', "notify.moderator",
+            'Moderator rights granted !');
     }
 }
 
@@ -469,9 +470,9 @@ function onPasswordReqiured(callback) {
     );
 }
 function onMucEntered(jid, id, displayName) {
-    messageHandler.notify(displayName || 'Somebody',
+    messageHandler.notify(displayName,'notify.somebody', "Somebody",
         'connected',
-        'connected');
+        'notify.connected', "connected");
 
     // Add Peer's container
     VideoLayout.ensurePeerContainerExists(jid,id);
@@ -486,14 +487,22 @@ function onMucRoleChanged(role, displayName) {
     VideoLayout.showModeratorIndicator();
 
     if (role === 'moderator') {
-        var displayName = displayName;
-        if (!displayName) {
-            displayName = 'Somebody';
+        var messageKey, messageOptions = {};
+        var lDisplayName = displayName;
+        if (!lDisplayName) {
+            lDisplayName = 'Somebody';
+            messageKey = "notify.grantedToUnknown";
+        }
+        else
+        {
+            messageKey = "notify.grantedTo";
+            messageOptions = {to: displayName};
         }
         messageHandler.notify(
-            displayName,
-            'connected',
-                'Moderator rights granted to ' + displayName + '!');
+            displayName,'notify.somebody', "Somebody",
+            'connected', messageKey,
+            'Moderator rights granted to ' + lDisplayName + '!',
+            messageOptions);
     }
 }
 
diff --git a/modules/UI/util/MessageHandler.js b/modules/UI/util/MessageHandler.js
index c12b25f72..f6d27de73 100644
--- a/modules/UI/util/MessageHandler.js
+++ b/modules/UI/util/MessageHandler.js
@@ -149,13 +149,32 @@ var messageHandler = (function(my) {
         messageHandler.openMessageDialog(title, message);
     };
 
-    my.notify = function(displayName, cls, message) {
+    my.notify = function(displayName, displayNameKey, displayNameDefault,
+                         cls, messageKey, messageDefault, messageArguments) {
+        var displayNameSpan = '<span class="nickname" ';
+        if(displayName)
+        {
+            displayNameSpan += ">" + displayName;
+        }
+        else
+        {
+            displayNameSpan += "data-i18n='" + displayNameKey +
+                "'>" + APP.translation.translateString(displayNameKey, null,
+                {defaultValue: displayNameDefault});
+        }
+        displayNameSpan += "</span>";
+        var lMessageArguments = messageArguments;
+        if(!messageArguments)
+            lMessageArguments = {};
+        lMessageArguments.defaultValue = messageDefault;
         toastr.info(
-            '<span class="nickname">' +
-                displayName +
-            '</span><br>' +
-            '<span class=' + cls + '>' +
-                message +
+            displayNameSpan + '<br>' +
+            '<span class=' + cls + ' data-i18n="' + messageKey + '"' +
+                (messageArguments?
+                    " i18n-options='" + JSON.stringify(messageArguments) + "'"
+                    : "") + ">" +
+            APP.translation.translateString(messageKey, null,
+                lMessageArguments) +
             '</span>');
     };
 
diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js
index 82792a745..301b9c093 100644
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -1422,7 +1422,7 @@ var VideoLayout = (function (my) {
                     "top");
                 videoMutedSpan.appendChild(mutedIndicator);
                 //translate texts for muted indicator
-                APP.translation.translateElement($('#' + videoSpanId  + " > i"));
+                APP.translation.translateElement($('#' + videoSpanId  + " > span > i"));
             }
 
             VideoLayout.updateMutePosition(videoSpanId);
diff --git a/modules/translation/translation.js b/modules/translation/translation.js
index 1b9822b71..9f0b424ba 100644
--- a/modules/translation/translation.js
+++ b/modules/translation/translation.js
@@ -82,13 +82,13 @@ module.exports = {
             options.lng = lang;
         i18n.init(options, initCompleted);
     },
-    translateString: function (key, cb) {
+    translateString: function (key, cb, defaultValue) {
         if(!cb)
-            return i18n.t(key);
+            return i18n.t(key, defaultValue);
 
         if(initialized)
         {
-            cb(i18n.t(key));
+            cb(i18n.t(key, defaultValue));
         }
         else
         {
diff --git a/modules/xmpp/moderator.js b/modules/xmpp/moderator.js
index ccde8fe38..235bfa5de 100644
--- a/modules/xmpp/moderator.js
+++ b/modules/xmpp/moderator.js
@@ -231,11 +231,13 @@ var Moderator = {
                 var waitMs = getNextErrorTimeout();
                 console.error("Focus error, retry after " + waitMs, error);
                 // Show message
-                APP.UI.messageHandler.notify(
-                    'Conference focus', 'disconnected',
+                APP.UI.messageHandler.notify( null, "notify.focus",
+                    'Conference focus', 'disconnected',"notify.focusFail",
                         Moderator.getFocusComponent() +
                         ' not available - retry in ' +
-                        (waitMs / 1000) + ' sec');
+                        (waitMs / 1000) + ' sec',
+                    {component: Moderator.getFocusComponent(),
+                        ms: (waitMs / 1000)});
                 // Reset response timeout
                 getNextTimeout(true);
                 window.setTimeout(