diff --git a/views/blue/class.EditUserData.php b/views/blue/class.EditUserData.php
index af2ad10ee..8118cdf45 100644
--- a/views/blue/class.EditUserData.php
+++ b/views/blue/class.EditUserData.php
@@ -118,7 +118,7 @@ function checkForm()
 <?php
 			$languages = getLanguages();
 			foreach ($languages as $currLang) {
-				print "<option value=\"".$currLang."\" ".(($user->getLanguage()==$currLang) ? "selected" : "").">".$currLang."</option>";
+				print "<option value=\"".$currLang."\" ".(($user->getLanguage()==$currLang) ? "selected" : "").">".getMLText($currLang)."</option>";
 			}
 ?>
 			</select>
@@ -129,7 +129,6 @@ function checkForm()
 		<td>
 			<select name="theme">
 <?php
-			$languages = getLanguages();
 			$themes = UI::getStyles();
 			foreach ($themes as $currTheme) {
 				print "<option value=\"".$currTheme."\" ".(($user->getTheme()==$currTheme) ? "selected" : "").">".$currTheme."</option>";
diff --git a/views/blue/class.Login.php b/views/blue/class.Login.php
index 3ad5bdcc0..91527a986 100644
--- a/views/blue/class.Login.php
+++ b/views/blue/class.Login.php
@@ -92,7 +92,7 @@ function guestLogin()
 			print "<option value=\"\">-";
 			$languages = getLanguages();
 			foreach ($languages as $currLang) {
-				print "<option value=\"".$currLang."\">".$currLang;
+				print "<option value=\"".$currLang."\">".getMLText($currLang)."</option>";
 			}
 			print "</select>";
 ?>
diff --git a/views/blue/class.Settings.php b/views/blue/class.Settings.php
index 2e6fb1bb8..d88861404 100644
--- a/views/blue/class.Settings.php
+++ b/views/blue/class.Settings.php
@@ -108,7 +108,7 @@ if(!is_writeable($settings->_configFilePath)) {
                 echo '<option value="' . $language . '" ';
                  if ($settings->_language==$language)
                    echo "selected";
-                echo '>' . $language . '</option>';
+                echo '>' . getMLText($language) . '</option>';
              }
             ?>
           </SELECT>
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 2c41e4809..484d6c5fa 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -135,7 +135,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 				else
 					echo "<li>";
 				echo "<a href=\"../op/op.SetLanguage.php?lang=".$currLang."&referer=".$_SERVER["REQUEST_URI"]."\">";
-				echo $currLang."</a></li>\n";
+				echo getMLText($currLang)."</a></li>\n";
 			}
 			echo "     </ul>\n";
 			echo "    </li>\n";
diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php
index 8e187f5db..033034780 100644
--- a/views/bootstrap/class.EditUserData.php
+++ b/views/bootstrap/class.EditUserData.php
@@ -131,7 +131,7 @@ function checkForm()
 <?php
 			$languages = getLanguages();
 			foreach ($languages as $currLang) {
-				print "<option value=\"".$currLang."\" ".(($user->getLanguage()==$currLang) ? "selected" : "").">".$currLang."</option>";
+				print "<option value=\"".$currLang."\" ".(($user->getLanguage()==$currLang) ? "selected" : "").">".getMLText($currLang)."</option>";
 			}
 ?>
 			</select>
@@ -142,7 +142,6 @@ function checkForm()
 		<td>
 			<select name="theme">
 <?php
-			$languages = getLanguages();
 			$themes = UI::getStyles();
 			foreach ($themes as $currTheme) {
 				print "<option value=\"".$currTheme."\" ".(($user->getTheme()==$currTheme) ? "selected" : "").">".$currTheme."</option>";
diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index fa95e310b..b3e6e4ac8 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -96,7 +96,7 @@ function guestLogin()
 			print "<option value=\"\">-";
 			$languages = getLanguages();
 			foreach ($languages as $currLang) {
-				print "<option value=\"".$currLang."\">".$currLang;
+				print "<option value=\"".$currLang."\">".getMLText($currLang)."</option>";
 			}
 			print "</select>";
 ?>
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 6832bdded..90c347407 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -91,7 +91,7 @@ if(!is_writeable($settings->_configFilePath)) {
                 echo '<option value="' . $language . '" ';
                  if ($settings->_language==$language)
                    echo "selected";
-                echo '>' . $language . '</option>';
+                echo '>' . getMLText($language) . '</option>';
              }
             ?>
           </SELECT>