Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master

Conflicts:
	locale/locales.js

Gruntfile.js

@@ -41,11 +41,13 @@ module.exports = function(grunt) {
                         "jed": "components/jed/jed",
                         "locales": "locale/locales",
                         "af": "locale/af/LC_MESSAGES/af",
-                        "en": "locale/en/LC_MESSAGES/en",
                         "de": "locale/de/LC_MESSAGES/de",
+                        "en": "locale/en/LC_MESSAGES/en",
                         "es": "locale/es/LC_MESSAGES/es",
+                        "hu": "locale/hu/LC_MESSAGES/hu",
                         "it": "locale/it/LC_MESSAGES/it",
                         "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR", 
+                        "ru": "locale/ru/LC_MESSAGES/ru",
                         "tinysort": "components/tinysort/src/jquery.tinysort",
                         "underscore": "components/underscore/underscore",
                         "backbone": "components/backbone/backbone",

build.js

@@ -8,12 +8,14 @@
         "jed": "components/jed/jed",
         "locales": "locale/locales",
         "af": "locale/af/LC_MESSAGES/af",
-        "en": "locale/en/LC_MESSAGES/en",
         "de": "locale/de/LC_MESSAGES/de",
+        "en": "locale/en/LC_MESSAGES/en",
         "es": "locale/es/LC_MESSAGES/es",
         "fr": "locale/fr/LC_MESSAGES/fr",
+        "hu": "locale/hu/LC_MESSAGES/hu",
         "it": "locale/it/LC_MESSAGES/it",
         "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR", 
+        "ru": "locale/ru/LC_MESSAGES/ru",
         "jquery.tinysort": "components/tinysort/src/jquery.tinysort",
         "underscore": "components/underscore/underscore",
         "backbone": "components/backbone/backbone",

index.html

@@ -54,7 +54,7 @@
         <li>Custom status messages</li>
         <li>Typing notifications</li>
         <li>Third person messages (/me )</li>
-        <li>Translated into multiple languages  (af, de, es, fr, it, pt-BR)</li>
+        <li>Translated into multiple languages  (af, de, es, fr, it, hu, pt-BR, ru)</li>
         <li>Off-the-record encryption (via <a href="http://arlolra.github.io/otr/" target="_blank">OTR.js</a>)</li>
     </ul>
 

locale/locales.js

@@ -14,9 +14,10 @@
             "en": "locale/en/LC_MESSAGES/en",
             "es": "locale/es/LC_MESSAGES/es",
             "fr": "locale/fr/LC_MESSAGES/fr",
+            "hu": "locale/hu/LC_MESSAGES/hu",
             "it": "locale/it/LC_MESSAGES/it",
             "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
-            "hu": "locale/hu/LC_MESSAGES/hu"
+            "ru": "locale/ru/LC_MESSAGES/ru"
         }
     });
 
@@ -27,19 +28,21 @@
         'en',
         'es',
         'fr',
+        'hu',
         'it',
         'pt_BR',
-        'hu'
-        ], function (jed, af, de, en, es, fr, it, pt_BR, hu) {
+        'ru'
+        ], function (jed, af, de, en, es, fr, hu, it, pt_BR, ru) {
             root.locales = {
                 'af': af,
                 'de': de,
                 'en': en,
                 'es': es,
                 'fr': fr,
+                'hu': hu,
                 'it': it,
                 'pt-br': pt_BR,
-                'hu': hu
+                'ru': ru
             };
         });
 })(this);