diff --git a/ChangeLog b/ChangeLog
index 01bdaa251..050d873ce 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-11-23 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * libraries/display_select_lang.lib.php: correct lang definition
+
 2005-11-23 Michal Čihař  <michal@cihar.com>
     * config.default.php, libraries/import/csv.php, libraries/import/ldi.php:
       Drop optional escaping as this should not have any real functionality.
@@ -22,7 +25,7 @@ $Source$
     * Documentation.html, config.default.php, libraries/common.lib.php:
       Configurable default connection collation (RFE #1025969).
 
-2005-11-20 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+2005-11-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * added test/theme.php: for testing themes
     * phpinfo.php:
       - respect only $GLOBALS['cfg']['ShowPhpInfo']
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index c0dc8a368..c499f8a78 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -52,14 +52,15 @@ function PMA_select_language() {
 
         // Include native name if non empty
         if (!empty($tmplang[3])) {
-            $lang_name = htmlentities($tmplang[3], ENT_COMPAT, 'UTF-8') . ' - ' . $lang_name;
+            $lang_name = '<bdo dir="ltr" lang="' . $tmplang[2] . '">'
+                . htmlentities($tmplang[3], ENT_COMPAT, 'UTF-8') . '</bdo> - ' . $lang_name;
         }
 
         // Include charset if it makes sense
         if (!defined('PMA_REMOVED_NON_UTF_8')) {
             $lang_name .= ' (' . substr($id, strpos($id, '-') + 1) . ')';
         }
-        
+
         //Is current one active?
         if ($lang == $id) {
             $selected = ' selected="selected"';
@@ -73,7 +74,7 @@ function PMA_select_language() {
     ?>
                 </select>
             </bdo>
-                <noscript><input type="submit" value="<?php echo $GLOBALS['strGo'];?>" /></noscript>
+                <noscript><input type="submit" value="Go" /></noscript>
             </form>
 <?php
 } // End of function PMA_select_language