From 8d0218be718490994439bcfbfbae4af3ef46467a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor?= <yesszus@gmail.com>
Date: Sat, 24 Dec 2016 13:54:42 +0100
Subject: [PATCH 1/5] Update English_admin.php

---
 e107_themes/bootstrap3/languages/English_admin.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/e107_themes/bootstrap3/languages/English_admin.php b/e107_themes/bootstrap3/languages/English_admin.php
index d156d8b55..17e9ec4d0 100644
--- a/e107_themes/bootstrap3/languages/English_admin.php
+++ b/e107_themes/bootstrap3/languages/English_admin.php
@@ -18,6 +18,8 @@ define("LAN_THEMEPREF_07", "left");
 define("LAN_THEMEPREF_08", "right");
 define("LAN_THEMEPREF_09", "top");
 define("LAN_THEMEPREF_10", "bottom");
- 
+define("LAN_THEMEPREF_11", ""); // unused
+define("LAN_THEMEPREF_12", "Return to Front Panel");
+define("LAN_THEMEPREF_13", "Change Language");  
 
-?>
\ No newline at end of file
+?>

From 4f84caed9d5a5c62ddca1c74f8b9a462c58b27a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor?= <yesszus@gmail.com>
Date: Sat, 24 Dec 2016 13:59:06 +0100
Subject: [PATCH 2/5] Update admin_template.php

---
 e107_themes/bootstrap3/admin_template.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php
index 4ed1f5a92..418d515f8 100644
--- a/e107_themes/bootstrap3/admin_template.php
+++ b/e107_themes/bootstrap3/admin_template.php
@@ -2,7 +2,7 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
@@ -17,11 +17,7 @@
 
 if (!defined('e107_INIT')) { exit(); }
 
-
-
-
-// include_lan(e_THEME."_blank/languages/".e_LANGUAGE.".php");
-
+e107::lan('theme', 'admin',true);
 
 
 $E_ADMIN_NAVIGATION['start'] = '<ul class="nav navbar-nav navbar-left">';
@@ -66,7 +62,7 @@ $E_ADMIN_NAVIGATION['button_home'] = '
 // Change Language
 $E_ADMIN_NAVIGATION['button_language'] = '
 	<li class="dropdown">
-		<a class="dropdown-toggle" title="Change Language" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
+		<a class="dropdown-toggle" title="'.LAN_THEMEPREF_13.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
 		 {LINK_IMAGE} {LINK_TEXT} 
 		<b class="caret"></b>
 		</a> 
@@ -220,10 +216,10 @@ $ADMIN_MODAL = '
 				<h4 class="modal-title modal-caption">&nbsp;</h4>
 			</div>
 			<div class="modal-body">
-				<p>Loading...</p>
+				<p>'.LAN_LOADING.'</p>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+				<button type="button" class="btn btn-primary" data-dismiss="modal">'.LAN_CLOSE.'</button>
 			</div>
 		</div>
 	</div>
@@ -241,7 +237,7 @@ $ADMIN_HEADER = $ADMIN_MODAL . '
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 			</button>
-			<a class="brand navbar-brand" href="'.e_ADMIN_ABS.'admin.php" title="Return to Front Panel">
+			<a class="brand navbar-brand" href="'.e_ADMIN_ABS.'admin.php" title="'.LAN_THEMEPREF_12.'">
 				<img class="admin-logo" src="'.e_THEME_ABS.'bootstrap3/images/e107_adminlogo.png" alt="e107"/>
 			</a>
 		</div>

From ef0171825da4f27f7ebe66e718ee4aee9bcf4389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor?= <yesszus@gmail.com>
Date: Thu, 29 Dec 2016 12:56:16 +0100
Subject: [PATCH 3/5] Update English_admin.php

---
 e107_themes/bootstrap3/languages/English_admin.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/e107_themes/bootstrap3/languages/English_admin.php b/e107_themes/bootstrap3/languages/English_admin.php
index 17e9ec4d0..c17c15866 100644
--- a/e107_themes/bootstrap3/languages/English_admin.php
+++ b/e107_themes/bootstrap3/languages/English_admin.php
@@ -18,8 +18,5 @@ define("LAN_THEMEPREF_07", "left");
 define("LAN_THEMEPREF_08", "right");
 define("LAN_THEMEPREF_09", "top");
 define("LAN_THEMEPREF_10", "bottom");
-define("LAN_THEMEPREF_11", ""); // unused
-define("LAN_THEMEPREF_12", "Return to Front Panel");
-define("LAN_THEMEPREF_13", "Change Language");  
 
 ?>

From 46519e27e861f1f7e3fd399bd91882f1b106af16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor?= <yesszus@gmail.com>
Date: Thu, 29 Dec 2016 12:58:17 +0100
Subject: [PATCH 4/5] Update lan_admin.php

---
 e107_languages/English/admin/lan_admin.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index fcd5b1f80..667b57386 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -485,3 +485,6 @@ define("LAN_GO_TO_LIST", "go to list");
 define("LAN_CREATE_ANOTHER", "create another");
 define("LAN_EDIT_CURRENT", "edit current");
 define("LAN_MAINTENANCE", "Maintenance");
+define("LAN_RETURN_TO_FRONT_PANEL", "Return to Front Panel");
+define("LAN_CHANGE_LANGUAGE", "Change Language");  
+

From 387b16580c19e3d7cc4cba573d7d3ea1664bfaec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor?= <yesszus@gmail.com>
Date: Thu, 29 Dec 2016 13:05:00 +0100
Subject: [PATCH 5/5] Update admin_template.php

---
 e107_themes/bootstrap3/admin_template.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php
index 418d515f8..594df8448 100644
--- a/e107_themes/bootstrap3/admin_template.php
+++ b/e107_themes/bootstrap3/admin_template.php
@@ -17,7 +17,7 @@
 
 if (!defined('e107_INIT')) { exit(); }
 
-e107::lan('theme', 'admin',true);
+//e107::lan('theme', 'admin',true);
 
 
 $E_ADMIN_NAVIGATION['start'] = '<ul class="nav navbar-nav navbar-left">';
@@ -62,7 +62,7 @@ $E_ADMIN_NAVIGATION['button_home'] = '
 // Change Language
 $E_ADMIN_NAVIGATION['button_language'] = '
 	<li class="dropdown">
-		<a class="dropdown-toggle" title="'.LAN_THEMEPREF_13.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
+		<a class="dropdown-toggle" title="'.LAN_CHANGE_LANGUAGE.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
 		 {LINK_IMAGE} {LINK_TEXT} 
 		<b class="caret"></b>
 		</a> 
@@ -237,7 +237,7 @@ $ADMIN_HEADER = $ADMIN_MODAL . '
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 			</button>
-			<a class="brand navbar-brand" href="'.e_ADMIN_ABS.'admin.php" title="'.LAN_THEMEPREF_12.'">
+			<a class="brand navbar-brand" href="'.e_ADMIN_ABS.'admin.php" title="'.LAN_RETURN_TO_FRONT_PANEL.'">
 				<img class="admin-logo" src="'.e_THEME_ABS.'bootstrap3/images/e107_adminlogo.png" alt="e107"/>
 			</a>
 		</div>