Merge remote-tracking branch 'origin/master'

[jirafeau_mojo42.git] / lib / lang.php

diff --git a/lib/lang.php b/lib/lang.php
index d636b8d944424b53672a8aaf28bd338b8dd89e9c..bf6365977f4531c4cd2055b637b0f7eaec7bf403 100644 (file)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -21,12 +21,15 @@ global $languages_list;
 $languages_list = array ('auto' => 'Automatic',\r
                          'de'   => 'Deutsch',\r
                          'en'   => 'English',\r
+                         'el'   => 'Ελληνικά',\r
+                         'es'   => 'Español',\r
                          'hu'   => 'Magyar',\r
                          'fi'   => 'Suomi',\r
                          'fr'   => 'Français',\r
                          'it'   => 'Italiano',\r
                          'nl'   => 'Nederlands',\r
                          'ro'   => 'Limba română',\r
+                         'ru'   => 'ру́сский',\r
                          'sk'   => 'Slovenčina',\r
                          'zh'   => '汉语');\r
 \r
@@ -102,7 +105,7 @@ function json_lang_generator ()
 \r
     /* Open translation file. */\r
     $trans_j = file_get_contents (JIRAFEAU_ROOT . "lib/locales/$l.json");\r
-    return $trans_j; \r
+    return $trans_j;\r
 }\r
 \r
 ?>\r