Fixed: FS#1883 - Strings missing in the language files and greek flag not showing in list

interface/lib/app.inc.php

@@ -239,6 +239,7 @@ class app {
 		/* Show username */
 		if(isset($_SESSION['s']['user'])) {
 			$this->tpl->setVar('cpuser', $_SESSION['s']['user']['username']);
+			$this->tpl->setVar('logout_txt', $this->lng('logout_txt'));
 		}
 	}
 

interface/lib/lang/en.lng

@@ -39,6 +39,7 @@ $wb['top_menu_dashboard'] = 'Home';
 $wb['top_menu_vm'] = 'VServer';
 $wb['toolsarea_head_txt'] = 'Tools';
 $wb['latest_news_txt'] = 'Latest news';
+$wb['logout_txt'] = "LOGOUT";
 $wb['daynamesmin_su'] = "Su";
 $wb['daynamesmin_mo'] = "Mo";
 $wb['daynamesmin_tu'] = "Tu";

interface/web/client/lib/lang/en.lng

@@ -10,5 +10,6 @@ $wb['Add Reseller'] = 'Add Reseller';
 $wb['Edit Reseller'] = 'Edit Reseller';
 $wb['Resellers'] = 'Resellers';
 $wb["error_has_clients"] = 'This reseller has clients. Delete the clients of the reseller first.';
-
+$wb['add_additional_template_txt'] = 'Add additional template';
+$wb['delete_additional_template_txt'] = 'Delete additional template';
 ?>
\ No newline at end of file

interface/web/client/templates/client_edit_limits.htm

@@ -7,8 +7,8 @@
 		<div class="pnl_toolsarea">
 			<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
 				<div class="buttons">
-					<button class="positive iconstxt icoAdd" type="button" value="Add additional template" onClick="addAdditionalTemplate();"><span>Add additional template</span></button>
-					<button class="negative iconstxt icoDelete" type="button" value="Delete additional template" onClick="delAdditionalTemplate();"><span>Delete additional template</span></button>
+					<button class="positive iconstxt icoAdd" type="button" value="{tmpl_var name='add_additional_template_txt'}" onClick="addAdditionalTemplate();"><span>Add additional template</span></button>
+					<button class="negative iconstxt icoDelete" type="button" value="{tmpl_var name='delete_additional_template_txt'}" onClick="delAdditionalTemplate();"><span>Delete additional template</span></button>
 				</div>
 			</fieldset>
 		</div>

interface/web/dns/lib/lang/en.lng

@@ -21,4 +21,6 @@ $wb['Templates'] = 'Templates';
 $wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
 $wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
 $wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['Secondary Zones'] = 'Secondary Zones';
+$wb['Import Zone File'] = 'Import Zone File';
 ?>
\ No newline at end of file

interface/web/themes/default/css/screen/content_ispc.css

@@ -481,6 +481,7 @@
     select.withicons option[value="EE"] { background-image:url(../../icons/flags/ee.png); }
     select.withicons option[value="EG"] { background-image:url(../../icons/flags/eg.png); }
     select.withicons option[value="EH"] { background-image:url(../../icons/flags/eh.png); }
+	select.withicons option[value="EL"] { background-image:url(../../icons/flags/gr.png); }
     select.withicons option[value="ER"] { background-image:url(../../icons/flags/er.png); }
     select.withicons option[value="ES"] { background-image:url(../../icons/flags/es.png); }
     select.withicons option[value="ET"] { background-image:url(../../icons/flags/et.png); }
@@ -724,6 +725,7 @@
     select.withicons option[value="ee"] { background-image:url(../../icons/flags/ee.png); }
     select.withicons option[value="eg"] { background-image:url(../../icons/flags/eg.png); }
     select.withicons option[value="eh"] { background-image:url(../../icons/flags/eh.png); }
+	select.withicons option[value="el"] { background-image:url(../../icons/flags/gr.png); }
     select.withicons option[value="en"] { background-image:url(../../icons/flags/gb.png); }
     select.withicons option[value="er"] { background-image:url(../../icons/flags/er.png); }
     select.withicons option[value="es"] { background-image:url(../../icons/flags/es.png); }
@@ -769,6 +771,7 @@
     select.withicons option[value="it"] { background-image:url(../../icons/flags/it.png); }
     select.withicons option[value="jm"] { background-image:url(../../icons/flags/jm.png); }
     select.withicons option[value="jo"] { background-image:url(../../icons/flags/jo.png); }
+	select.withicons option[value="ja"] { background-image:url(../../icons/flags/jp.png); }
     select.withicons option[value="jp"] { background-image:url(../../icons/flags/jp.png); }
     select.withicons option[value="ke"] { background-image:url(../../icons/flags/ke.png); }
     select.withicons option[value="kg"] { background-image:url(../../icons/flags/kg.png); }

interface/web/themes/default/templates/main.tpl.htm

@@ -105,7 +105,7 @@
                     <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
                     <!-- end: skip link navigation -->
 			        <tmpl_if name="cpuser">
-                    <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+                    <span><a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
 			        </tmpl_if>
                 </div>
                 <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>

interface/web/tools/lib/lang/en.lng

@@ -4,4 +4,6 @@ $wb['Settings'] = 'Settings';
 $wb['ISPConfig Tools'] = 'ISPConfig Tools';
 $wb['Password and Language'] = 'Password and Language';
 $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.';
+$wb['Dns Tools'] = 'Dns Tools';
+$wb['Resync'] = 'Resync';
 ?>
\ No newline at end of file