diff --git a/includes/admin.php b/includes/admin.php
index ea2ede1f..46f388e0 100755
--- a/includes/admin.php
+++ b/includes/admin.php
@@ -38,36 +38,36 @@ function DisplayAuthConfig($username, $password){
   <div class="row">
     <div class="col-lg-12">
       <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-lock fa-fw"></i>Configure Auth</div>
+        <div class="panel-heading"><i class="fa fa-lock fa-fw"></i><?php echo _("Configure Auth"); ?></div>
         <div class="panel-body">
           <p><?php $status->showMessages(); ?></p>
           <form role="form" action="?page=auth_conf" method="POST">
             <?php CSRFToken() ?>
             <div class="row">
               <div class="form-group col-md-4">
-                <label for="username">Username</label>
+                <label for="username"><?php echo _("Username"); ?></label>
                 <input type="text" class="form-control" name="username" value="<?php echo $username; ?>"/>
               </div>
             </div>
             <div class="row">
               <div class="form-group col-md-4">
-                <label for="password">Old password</label>
+                <label for="password"><?php echo _("Old password"); ?></label>
                 <input type="password" class="form-control" name="oldpass"/>
               </div>
             </div>
             <div class="row">
               <div class="form-group col-md-4">
-                <label for="password">New password</label>
+                <label for="password"><?php echo _("New password"); ?></label>
                 <input type="password" class="form-control" name="newpass"/>
               </div>
             </div>
             <div class="row">
               <div class="form-group col-md-4">
-                <label for="password">Repeat new password</label>
+                <label for="password"><?php echo _("Repeat new password"); ?></label>
                 <input type="password" class="form-control" name="newpassagain"/>
               </div>
             </div>
-            <input type="submit" class="btn btn-outline btn-primary" name="UpdateAdminPassword" value="Save settings" />
+            <input type="submit" class="btn btn-outline btn-primary" name="UpdateAdminPassword" value="<?php echo _("Save settings"); ?>" />
           </form>
         </div><!-- /.panel-body -->
       </div><!-- /.panel-default -->
diff --git a/includes/authenticate.php b/includes/authenticate.php
old mode 100644
new mode 100755
diff --git a/includes/config.php b/includes/config.php
old mode 100644
new mode 100755
index 9ce3b835..366b52e9
--- a/includes/config.php
+++ b/includes/config.php
@@ -1,5 +1,6 @@
 <?php
 
+define('RASPI_VERSION', '1.3.1');
 define('RASPI_CONFIG', '/etc/raspap');
 define('RASPI_CONFIG_NETWORKING',RASPI_CONFIG.'/networking');
 define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth');
@@ -26,4 +27,8 @@ define('RASPI_TORPROXY_ENABLED', false );
 define('RASPI_CONFAUTH_ENABLED', true );
 define('RASPI_CHANGETHEME_ENABLED', true );
 
+// Locale settings
+define('LOCALE_ROOT', 'locale');
+define('LOCALE_DOMAIN', 'messages'); 
+
 ?>
diff --git a/includes/configure_client.php b/includes/configure_client.php
index 77c50b1b..a776410a 100755
--- a/includes/configure_client.php
+++ b/includes/configure_client.php
@@ -112,14 +112,14 @@ function DisplayWPAConfig(){
             $status->addMessage('Wifi settings updated successfully', 'success');
             $networks = $tmp_networks;
           } else {
-            $status->addMessage('Wifi settings updated but cannot restart (cannon execute "wpa_cli reconfigure")', 'danger');
+            $status->addMessage('Wifi settings updated but cannot restart (cannot execute "wpa_cli reconfigure")', 'danger');
           }
         } else {
           $status->addMessage('Wifi settings failed to be updated', 'danger');
         }
       }
     } else {
-      $status->addMessage('Failed to updated wifi settings', 'danger');
+      $status->addMessage('Failed to update wifi settings', 'danger');
     }
   }
 
@@ -159,24 +159,24 @@ function DisplayWPAConfig(){
   <div class="row">
     <div class="col-lg-12">
       <div class="panel panel-primary">           
-        <div class="panel-heading"><i class="fa fa-signal fa-fw"></i> Configure client</div>
+        <div class="panel-heading"><i class="fa fa-signal fa-fw"></i> <?php echo _("Configure client"); ?></div>
         <!-- /.panel-heading -->
         <div class="panel-body">
           <p><?php $status->showMessages(); ?></p>
-          <h4>Client settings for interface <?php echo RASPI_WIFI_CLIENT_INTERFACE ?></h4>
-          <div class="btn-group btn-block">
-            <a href=".?<?php echo $_SERVER['QUERY_STRING']; ?>" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-2 btn btn-info" id="update">Rescan</a>
-          </div>
+          <h4><?php echo _("Client settings"); ?></h4>
+	        <div class="btn-group btn-block">
+	          <a href=".?<?php echo $_SERVER['QUERY_STRING']; ?>" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-2 btn btn-info" id="update"><?php echo _("Rescan"); ?></a>
+	        </div>
           <form method="POST" action="?page=wpa_conf" name="wpa_conf_form">
             <?php CSRFToken() ?>
             <input type="hidden" name="client_settings" ?>
             <table class="table table-responsive table-striped">
               <tr>
                 <th></th>
-                <th>SSID</th>
-                <th>Channel</th>
-                <th>Security</th>
-                <th>Passphrase</th>
+                <th><?php echo _("SSID"); ?></th>
+                <th><?php echo _("Channel"); ?></th>
+                <th><?php echo _("Security"); ?></th>
+                <th><?php echo _("Passphrase"); ?></th>
                 <th></th>
               </tr>
             <?php $index = 0; ?>
@@ -213,11 +213,11 @@ function DisplayWPAConfig(){
                 <td>
                   <div class="btn-group btn-block">
                   <?php if ($network['configured']) { ?>
-                    <input type="submit" class="col-md-6 btn btn-warning" value="Update" id="update<?php echo $index ?>" name="update<?php echo $index ?>"<?php echo ($network['protocol'] === 'Open' ? ' disabled' : '')?> />
+                    <input type="submit" class="col-md-6 btn btn-warning" value="<?php echo _("Update"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>"<?php echo ($network['protocol'] === 'Open' ? ' disabled' : '')?> />
                   <?php } else { ?>
-                    <input type="submit" class="col-md-6 btn btn-info" value="Add" id="update<?php echo $index ?>" name="update<?php echo $index ?>" <?php echo ($network['protocol'] === 'Open' ? '' : ' disabled')?> />
+                    <input type="submit" class="col-md-6 btn btn-info" value="<?php echo _("Add"); ?>" id="update<?php echo $index ?>" name="update<?php echo $index ?>" <?php echo ($network['protocol'] === 'Open' ? '' : ' disabled')?> />
                   <?php } ?>
-                    <input type="submit" class="col-md-6 btn btn-danger" value="Delete" name="delete<?php echo $index ?>"<?php echo ($network['configured'] ? '' : ' disabled')?> />
+                    <input type="submit" class="col-md-6 btn btn-danger" value="<?php echo _("Delete"); ?>" name="delete<?php echo $index ?>"<?php echo ($network['configured'] ? '' : ' disabled')?> />
                   </div>
                 </td>
               </tr>
@@ -226,7 +226,7 @@ function DisplayWPAConfig(){
             </table>
           </form>
         </div><!-- ./ Panel body -->
-        <div class="panel-footer"><strong>Note,</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP.</div>
+        <div class="panel-footer"><?php echo _("<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"); ?></div>
       </div><!-- /.panel-primary -->
     </div><!-- /.col-lg-12 -->
   </div><!-- /.row -->
diff --git a/includes/dashboard.php b/includes/dashboard.php
index fa5820dc..5e4c9561 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -77,67 +77,66 @@ function DisplayDashboard(){
   <div class="row">
       <div class="col-lg-12">
           <div class="panel panel-primary">
-            <div class="panel-heading"><i class="fa fa-dashboard fa-fw"></i> Dashboard   </div>
+            <div class="panel-heading"><i class="fa fa-dashboard fa-fw"></i> <?php echo _("Dashboard"); ?></div>
               <div class="panel-body">
                 <p><?php $status->showMessages(); ?></p>
                   <div class="row">
-                        <div class="col-md-6">
+                      <div class="col-md-6">
                         <div class="panel panel-default">
-                  <div class="panel-body">
-                      <h4>Interface Information</h4>
-		      <div class="info-item">Interface Name</div> <?php echo RASPI_WIFI_CLIENT_INTERFACE ?></br>
-          <div class="info-item">IP Address</div>     <?php echo $strIPAddress ?></br>
-          <div class="info-item">Subnet Mask</div>    <?php echo $strNetMask ?></br>
-          <div class="info-item">Mac Address</div>    <?php echo $strHWAddress ?></br></br>
+                          <div class="panel-body">
+                            <h4><?php echo _("Interface Information"); ?></h4>
+                              <div class="info-item"><?php echo _("Interface Name"); ?></div> <?php echo RASPI_WIFI_CLIENT_INTERFACE ?></br>
+                              <div class="info-item"><?php echo _("IP Address"); ?></div>     <?php echo $strIPAddress ?></br>
+                              <div class="info-item"><?php echo _("Subnet Mask"); ?></div>    <?php echo $strNetMask ?></br>
+                              <div class="info-item"><?php echo _("Mac Address"); ?></div>    <?php echo $strHWAddress ?></br></br>
 
-                      <h4>Interface Statistics</h4>
-          <div class="info-item">Received Packets</div>    <?php echo $strRxPackets ?></br>
-          <div class="info-item">Received Bytes</div>      <?php echo $strRxBytes ?></br></br>
-          <div class="info-item">Transferred Packets</div> <?php echo $strTxPackets ?></br>
-          <div class="info-item">Transferred Bytes</div>   <?php echo $strTxBytes ?></br>
-        </div><!-- /.panel-body -->
-        </div><!-- /.panel-default -->
+                            <h4><?php echo _("Interface Statistics"); ?></h4>
+                              <div class="info-item"><?php echo _("Received Packets"); ?></div>    <?php echo $strRxPackets ?></br>
+                              <div class="info-item"><?php echo _("Received Bytes"); ?></div>      <?php echo $strRxBytes ?></br></br>
+                              <div class="info-item"><?php echo _("Transferred Packets"); ?></div> <?php echo $strTxPackets ?></br>
+                              <div class="info-item"><?php echo _("Transferred Bytes"); ?></div>   <?php echo $strTxBytes ?></br>
+                          </div><!-- /.panel-body -->
+                        </div><!-- /.panel-default -->
                         </div><!-- /.col-md-6 -->
+                      <div class="col-md-6">
+                        <div class="panel panel-default">
+                          <div class="panel-body wireless">
+                            <h4><?php echo _("Wireless Information"); ?></h4>
+                              <div class="info-item"><?php echo _("Connected To"); ?></div>   <?php echo $strSSID ?></br>
+                              <div class="info-item"><?php echo _("AP Mac Address"); ?></div> <?php echo $strBSSID ?></br>
+                              <div class="info-item"><?php echo _("Bitrate"); ?></div>        <?php echo $strBitrate ?></br>
+                              <div class="info-item"><?php echo _("Signal Level"); ?></div>	<?php echo $strSignalLevel ?></br>
+                              <div class="info-item"><?php echo _("Transmit Power"); ?></div> <?php echo $strTxPower ?></br>
+                              <div class="info-item"><?php echo _("Frequency"); ?></div>      <?php echo $strFrequency ?></br></br>
+                              <div class="info-item"><?php echo _("Link Quality"); ?></div>
+                                <div class="progress">
+                                <div class="progress-bar progress-bar-info progress-bar-striped active"
+                                  role="progressbar"
+                                  aria-valuenow="<?php echo $strLinkQuality ?>" aria-valuemin="0" aria-valuemax="100"
+                                  style="width: <?php echo $strLinkQuality ?>%;"><?php echo $strLinkQuality ?>%
+                                </div>
+                              </div>
+                          </div><!-- /.panel-body -->
+                        </div><!-- /.panel-default -->
+                      </div><!-- /.col-md-6 -->
+                    </div><!-- /.row -->
 
-        <div class="col-md-6">
-                    <div class="panel panel-default">
-              <div class="panel-body wireless">
-                            <h4>Wireless Information</h4>
-          <div class="info-item">Connected To</div>   <?php echo $strSSID ?></br>
-          <div class="info-item">AP Mac Address</div> <?php echo $strBSSID ?></br>
-          <div class="info-item">Bitrate</div>        <?php echo $strBitrate ?></br>
-          <div class="info-item">Signal Level</div>        <?php echo $strSignalLevel ?></br>
-          <div class="info-item">Transmit Power</div> <?php echo $strTxPower ?></br>
-          <div class="info-item">Frequency</div>      <?php echo $strFrequency ?></br></br>
-          <div class="info-item">Link Quality</div>
-            <div class="progress">
-            <div class="progress-bar progress-bar-info progress-bar-striped active"
-              role="progressbar"
-              aria-valuenow="<?php echo $strLinkQuality ?>" aria-valuemin="0" aria-valuemax="100"
-              style="width: <?php echo $strLinkQuality ?>%;"><?php echo $strLinkQuality ?>%
-            </div>
-          </div>
-        </div><!-- /.panel-body -->
-        </div><!-- /.panel-default -->
-                        </div><!-- /.col-md-6 -->
-      </div><!-- /.row -->
-
-                  <div class="col-lg-12">
+                 <div class="col-lg-12">
                  <div class="row">
                     <form action="?page=wlan0_info" method="POST">
                     <?php if ( !$wlan0up ) {
-                      echo '<input type="submit" class="btn btn-success" value="Start ' . RASPI_WIFI_CLIENT_INTERFACE . '" name="ifup_wlan0" />';
+                      echo '<input type="submit" class="btn btn-success" value="' . _("Start ") . RASPI_WIFI_CLIENT_INTERFACE . '" name="ifup_wlan0" />';
                     } else {
-                echo '<input type="submit" class="btn btn-warning" value="Stop ' . RASPI_WIFI_CLIENT_INTERFACE . '" name="ifdown_wlan0" />';
-              }
+                      echo '<input type="submit" class="btn btn-warning" value="' . _("Stop ") . RASPI_WIFI_CLIENT_INTERFACE . '"  name="ifdown_wlan0" />';
+                    }
               ?>
-              <input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" />
+              <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
               </form>
             </div>
               </div>
 
                 </div><!-- /.panel-body -->
-                <div class="panel-footer">Information provided by ifconfig and iwconfig</div>
+                <div class="panel-footer"><?php echo _("Information provided by ifconfig and iwconfig"); ?></div>
             </div><!-- /.panel-default -->
         </div><!-- /.col-lg-12 -->
     </div><!-- /.row -->
diff --git a/includes/dhcp.php b/includes/dhcp.php
index 8e9b17fb..f65059f6 100755
--- a/includes/dhcp.php
+++ b/includes/dhcp.php
@@ -98,16 +98,15 @@ function DisplayDHCPConfig() {
   <div class="row">
   <div class="col-lg-12">
       <div class="panel panel-primary">
-      <div class="panel-heading"><i class="fa fa-exchange fa-fw"></i> Configure DHCP
-            </div>
+      <div class="panel-heading"><i class="fa fa-exchange fa-fw"></i> <?php echo _("Configure DHCP"); ?></div>
         <!-- /.panel-heading -->
         <div class="panel-body">
         <p><?php $status->showMessages(); ?></p>
         <!-- Nav tabs -->
             <ul class="nav nav-tabs">
-                <li class="active"><a href="#server-settings" data-toggle="tab">Server settings</a>
+                <li class="active"><a href="#server-settings" data-toggle="tab"><?php echo _("Server settings"); ?></a>
                 </li>
-                <li><a href="#client-list" data-toggle="tab">Client list</a>
+                <li><a href="#client-list" data-toggle="tab"><?php echo _("Client list"); ?></a>
                 </li>
             </ul>
         <!-- Tab panes -->
@@ -136,36 +135,36 @@ function DisplayDHCPConfig() {
     </div>
     <div class="row">
       <div class="form-group col-md-4">
-        <label for="code">Starting IP Address</label>
+        <label for="code"><?php echo _("Starting IP Address"); ?></label>
         <input type="text" class="form-control"name="RangeStart" value="<?php echo $RangeStart; ?>" />
       </div>
     </div>
 
     <div class="row">
       <div class="form-group col-md-4">
-        <label for="code">Ending IP Address</label>
+        <label for="code"><?php echo _("Ending IP Address"); ?></label>
         <input type="text" class="form-control" name="RangeEnd" value="<?php echo $RangeEnd; ?>" />
       </div>
     </div>
 
     <div class="row">
-      <div class="form-group col-xs-4 col-sm-2">
-        <label for="code">Lease Time</label>
+      <div class="form-group col-xs-2 col-sm-2">
+        <label for="code"><?php echo _("Lease Time"); ?></label>
         <input type="text" class="form-control" name="RangeLeaseTime" value="<?php echo $arrRangeLeaseTime[1]; ?>" />
       </div>
-      <div class="col-xs-4 col-sm-2">
-        <label for="code">Interval</label>
+      <div class="col-xs-2 col-sm-2">
+        <label for="code"><?php echo _("Interval"); ?></label>
         <select name="RangeLeaseTimeUnits" class="form-control" ><option value="m" <?php echo $mselected; ?>>Minute(s)</option><option value="h" <?php echo $hselected; ?>>Hour(s)</option><option value="d" <?php echo $dselected; ?>>Day(s)</option><option value="infinite">Infinite</option></select> 
       </div>
     </div>
 
-    <input type="submit" class="btn btn-outline btn-primary" value="Save settings" name="savedhcpdsettings" />
+    <input type="submit" class="btn btn-outline btn-primary" value="<?php echo _("Save settings"); ?>" name="savedhcpdsettings" />
     <?php
 
     if ( $dnsmasq_state ) {
-      echo '<input type="submit" class="btn btn-warning" value="Stop dnsmasq" name="stopdhcpd" />';
+      echo '<input type="submit" class="btn btn-warning" value="' . _("Stop dnsmasq") . '" name="stopdhcpd" />';
     } else {
-      echo'<input type="submit" class="btn btn-success" value="Start dnsmasq" name="startdhcpd" />';
+      echo'<input type="submit" class="btn btn-success" value="' .  _("Start dnsmasq") . '" name="startdhcpd" />';
     }
     ?>
     </form>
@@ -175,20 +174,18 @@ function DisplayDHCPConfig() {
     <h4>Client list</h4>
     <div class="col-lg-12">
       <div class="panel panel-default">
-      <div class="panel-heading">
-        Active DHCP leases
-      </div>
+      <div class="panel-heading"><?php echo _("Active DHCP leases"); ?></div>
       <!-- /.panel-heading -->
       <div class="panel-body">
         <div class="table-responsive">
           <table class="table table-hover">
             <thead>
               <tr>
-                <th>Expire time</th>
-                <th>MAC Address</th>
-                <th>IP Address</th>
-                <th>Host name</th>
-                <th>Client ID</th>
+                <th><?php echo _("Expire time"); ?></th>
+                <th><?php echo _("MAC Address"); ?></th>
+                <th><?php echo _("IP Address"); ?></th>
+                <th><?php echo _("Host name"); ?></th>
+                <th><?php echo _("Client ID"); ?></th>
               </tr>
             </thead>
             <tbody>
@@ -213,7 +210,7 @@ function DisplayDHCPConfig() {
     </div><!-- /.tab-pane -->
     </div><!-- /.tab-content -->
     </div><!-- ./ Panel body -->
-    <div class="panel-footer"> Information provided by Dnsmasq</div>
+    <div class="panel-footer"> <?php echo _("Information provided by Dnsmasq");?></div>
         </div><!-- /.panel-primary -->
     </div><!-- /.col-lg-12 -->
   </div><!-- /.row -->
diff --git a/includes/hostapd.php b/includes/hostapd.php
index 1465d333..5aecec39 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -66,28 +66,28 @@ function DisplayHostAPDConfig(){
   <div class="row">
     <div class="col-lg-12">
       <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-dot-circle-o fa-fw"></i> Configure hotspot</div>
+        <div class="panel-heading"><i class="fa fa-dot-circle-o fa-fw"></i> <?php echo _("Configure hotspot"); ?></div>
         <!-- /.panel-heading -->
         <div class="panel-body">
 	  <p><?php $status->showMessages(); ?></p>
           <form role="form" action="?page=hostapd_conf" method="POST">
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
-              <li class="active"><a href="#basic" data-toggle="tab">Basic</a></li>
-              <li><a href="#security" data-toggle="tab">Security</a></li>
-              <li><a href="#advanced" data-toggle="tab">Advanced</a></li>
-              <li><a href="#logoutput" data-toggle="tab">Logfile Output</a></li>
+              <li class="active"><a href="#basic" data-toggle="tab"><?php echo _("Basic"); ?></a></li>
+              <li><a href="#security" data-toggle="tab"><?php echo _("Security"); ?></a></li>
+              <li><a href="#advanced" data-toggle="tab"><?php echo _("Advanced"); ?></a></li>
+              <li><a href="#logoutput" data-toggle="tab"><?php echo _("Logfile output"); ?></a></li>
             </ul>
 
             <!-- Tab panes -->
             <div class="tab-content">
                 <div class="tab-pane fade in active" id="basic">
 
-                <h4>Basic settings</h4>
+                <h4><?php echo _("Basic settings") ;?></h4>
                 <?php CSRFToken() ?>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">Interface</label>
+                    <label for="code"><?php echo _("Interface") ;?></label>
                     <?php
                       SelectorOptions('interface', $interfaces, $arrConfig['interface']);
                     ?>
@@ -95,46 +95,46 @@ function DisplayHostAPDConfig(){
                 </div>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">SSID</label>
+                    <label for="code"><?php echo _("SSID"); ?></label>
                     <input type="text" class="form-control" name="ssid" value="<?php echo $arrConfig['ssid']; ?>" />
                   </div>
                 </div>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">Wireless Mode</label>
+                    <label for="code"><?php echo _("Wireless Mode") ;?></label>
                     <?php SelectorOptions('hw_mode', $arrChannel, $arrConfig['hw_mode']); ?>
                   </div>
                 </div>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">Channel</label>
+                    <label for="code"><?php echo _("Channel"); ?></label>
                     <?php SelectorOptions('channel', range(1, 14), intval($arrConfig['channel'])) ?>
                   </div>
                 </div>
               </div>
               <div class="tab-pane fade" id="security">
-                <h4>Security settings</h4>
+                <h4><?php echo _("Security settings"); ?></h4>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">Security type</label>
+                    <label for="code"><?php echo _("Security type"); ?></label>
                     <?php SelectorOptions('wpa', $arrSecurity, $arrConfig['wpa']); ?>
                   </div>
                 </div>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">Encryption Type</label>
+                    <label for="code"><?php echo _("Encryption Type"); ?></label>
                     <?php SelectorOptions('wpa_pairwise', $arrEncType, $arrConfig['wpa_pairwise']); ?>
                   </div>
                 </div>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">PSK</label>
+                    <label for="code"><?php echo _("PSK"); ?></label>
                     <input type="text" class="form-control" name="wpa_passphrase" value="<?php echo $arrConfig['wpa_passphrase'] ?>" />
                   </div>
                 </div>
               </div>
               <div class="tab-pane fade" id="logoutput">
-                <h4>Logfile output</h4>
+	      <h4><?php echo _("Logfile output"); ?></h4>
                   <div class="row">
                     <div class="form-group col-md-8">
                       <?php
@@ -149,12 +149,12 @@ function DisplayHostAPDConfig(){
                 </div>
               </div>
               <div class="tab-pane fade" id="advanced">
-                <h4>Advanced settings</h4>
+                <h4><?php echo _("Advanced settings"); ?></h4>
                 <div class="row">
                   <div class="col-md-4">
                   <div class="form-check">
                     <label class="form-check-label">
-                        Enable Logging <?php $checked = ''; if($arrHostapdConf['LogEnable'] == 1) { $checked = 'checked'; } ?>
+			<?php echo _("Enable logging"); ?> <?php $checked = ''; if($arrHostapdConf['LogEnable'] == 1) { $checked = 'checked'; } ?>
                         <input id="logEnable" name ="logEnable" type="checkbox" class="form-check-input" value="1" <?php echo $checked; ?> />
                     </label>
                   </div>
@@ -162,7 +162,7 @@ function DisplayHostAPDConfig(){
                 </div>
                 <div class="row">
                   <div class="form-group col-md-4">
-                  <label for="code">Country Code</label>
+                  <label for="code"><?php echo _("Country Code"); ?></label>
                   <input type="hidden" id="selected_country" value="<?php echo $arrConfig['country_code'] ?>">
                   <select  class="form-control"  id="countries" name="country_code">
                     <option value="AF">Afghanistan</option>
@@ -429,17 +429,17 @@ function DisplayHostAPDConfig(){
                 </div>
               </div><!-- /.panel-body -->
             </div><!-- /.panel-primary -->
-            <input type="submit" class="btn btn-outline btn-primary" name="SaveHostAPDSettings" value="Save settings" />
+            <input type="submit" class="btn btn-outline btn-primary" name="SaveHostAPDSettings" value="<?php echo _("Save settings"); ?>" />
             <?php
               if($hostapdstatus[0] == 0) {
-                echo '<input type="submit" class="btn btn-success" name="StartHotspot" value="Start hotspot" />';
+                echo '<input type="submit" class="btn btn-success" name="StartHotspot" value="' . _("Start hotspot") . '"/>';
               } else {
-                echo '<input type="submit" class="btn btn-warning" name="StopHotspot" value="Stop hotspot" />';
+                echo '<input type="submit" class="btn btn-warning" name="StopHotspot" value="' . _("Stop hotspot") . '"/>';
               };
             ?>
           </form>
         </div></div><!-- /.panel-primary -->
-      <div class="panel-footer"> Information provided by hostapd</div>
+      <div class="panel-footer"> <?php echo _("Information provided by hostapd"); ?></div>
     </div><!-- /.col-lg-12 -->
   </div><!-- /.row -->
 <?php 
diff --git a/includes/locale.php b/includes/locale.php
new file mode 100755
index 00000000..88709220
--- /dev/null
+++ b/includes/locale.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+* Sets locale information for i18n support
+*
+*/
+
+
+/** 
+* Rudimentary language detection via the browser.
+* Accept-Language returns a list of weighted values with a quality (or 'q') parameter.
+* A better method would parse the list of preferred languages and match this with 
+* the languages supported by our platform.
+*
+* Refer to: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
+*/
+if (!isset($_SESSION["locale"])) {
+  $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+  switch ($lang){
+    case "fr":
+      $locale = "fr_FR.UTF-8";
+      break;
+    case "it":
+      $locale = "it_IT.UTF-8";
+      break; 
+    default:  
+      $locale = "en_GB.UTF-8";
+      break;
+  }
+}
+
+// Note: the associated locale must be installed on the RPi 
+// Use: 'sudo raspi-configure' and select 'Localisation Options' 
+// Uncomment for testing 
+// $locale = "fr_FR.UTF-8";
+$_SESSION["locale"] = $locale; 
+
+// activate the locale setting                                                                                                                                                            
+putenv("LANG=" . $_SESSION["locale"]);                                                                                                                                                                
+setlocale(LC_ALL, $_SESSION["locale"]);                                                                                                                                                               
+                                                                                                                                                                                          
+bindtextdomain(LOCALE_DOMAIN, LOCALE_ROOT);                                                                                                                                                    
+bind_textdomain_codeset(LOCALE_DOMAIN, 'UTF-8');                                                                                                                                                
+                                                                                                                                                                                          
+textdomain(LOCALE_DOMAIN);                                                                                                                                                                      
+?>
diff --git a/includes/networking.php b/includes/networking.php
old mode 100644
new mode 100755
index c0b74816..d0b01f3e
--- a/includes/networking.php
+++ b/includes/networking.php
@@ -23,12 +23,11 @@ function DisplayNetworkingConfig(){
     <div class="col-lg-12">
        <div class="panel panel-primary">
           <div class="panel panel-heading">
-            <i class="fa fa-sitemap fa-fw"></i> Configure Networking
-          </div>
+	  <i class="fa fa-sitemap fa-fw"></i> <?php echo _("Configure networking"); ?></div>
           <div class="panel-body">
             <div id="msgNetworking"></div>
               <ul class="nav nav-tabs">
-                <li role="presentation" class="active"><a href="#summary" aria-controls="summary" role="tab" data-toggle="tab">Summary</a></li>
+	      <li role="presentation" class="active"><a href="#summary" aria-controls="summary" role="tab" data-toggle="tab"><?php echo _("Summary"); ?></a></li>
                 <?php
                   foreach($interfaces as $interface) {
                       echo '<li role="presentation"><a href="#'.$interface.'" aria-controls="'.$interface.'" role="tab" data-toggle="tab">'.$interface.'</a></li>';
@@ -37,7 +36,7 @@ function DisplayNetworkingConfig(){
               </ul>
                 <div class="tab-content">
                   <div role="tabpanel" class="tab-pane active" id="summary">
-                    <h4>Current Settings</h4>
+		    <h4><?php echo _("Current settings"); ?></h4>
                       <div class="row">
                       <?php
                         foreach($interfaces as $interface) {
@@ -52,7 +51,7 @@ function DisplayNetworkingConfig(){
                       </div><!-- /.row -->
                     <div class="col-lg-12">
                       <div class="row">
-                        <a href="#" class="btn btn-outline btn-primary" id="btnSummaryRefresh"><i class="fa fa-refresh"></i> Refresh</a>
+		      <a href="#" class="btn btn-outline btn-primary" id="btnSummaryRefresh"><i class="fa fa-refresh"></i> <?php echo _("Refresh"); ?></a>
                       </div><!-- /.row -->
                     </div><!-- /.col-lg-12 -->
                   </div><!-- /.tab-pane -->
@@ -64,49 +63,49 @@ function DisplayNetworkingConfig(){
                           <div class="col-lg-6">
                             <form id="frm-'.$interface.'">
                               <div class="form-group">
-                                <h4>Adapter IP Address Settings</h4>
+                                <h4>' . _("Adapter IP Address Settings") . '</h4>
                                 <div class="btn-group" data-toggle="buttons">
                                   <label class="btn btn-primary">
-                                    <input type="radio" name="'.$interface.'-addresstype" id="'.$interface.'-dhcp" autocomplete="off">DHCP
+                                    <input type="radio" name="'.$interface.'-addresstype" id="'.$interface.'-dhcp" autocomplete="off">' . _("DHCP") . '
                                   </label>
                                   <label class="btn btn-primary">
-                                    <input type="radio" name="'.$interface.'-addresstype" id="'.$interface.'-static" autocomplete="off">Static IP
+                                    <input type="radio" name="'.$interface.'-addresstype" id="'.$interface.'-static" autocomplete="off">' . _("Static IP") . '
                                   </label>
                                 </div><!-- /.btn-group -->
-                                <h4>Enable Fallback to Static Option</h4>
+                                <h4>' . _("Enable Fallback to Static Option") . '</h4>
                                 <div class="btn-group" data-toggle="buttons">
                                   <label class="btn btn-primary">
-                                    <input type="radio" name="'.$interface.'-dhcpfailover" id="'.$interface.'-failover" autocomplete="off">Enabled
+                                    <input type="radio" name="'.$interface.'-dhcpfailover" id="'.$interface.'-failover" autocomplete="off">' . _("Enabled") . '
                                   </label>
                                   <label class="btn btn-warning">
-                                    <input type="radio" name="'.$interface.'-dhcpfailover" id="'.$interface.'-nofailover" autocomplete="off">Disabled
+                                    <input type="radio" name="'.$interface.'-dhcpfailover" id="'.$interface.'-nofailover" autocomplete="off">' . _("Disabled") . '
                                   </label>
                                 </div><!-- /.btn-group -->
                               </div><!-- /.form-group -->
                               <hr />
-                              <h4>Static IP Options</h4>
+                              <h4>' . _("Static IP Options") . '</h4>
                               <div class="form-group">
-                                <label for="'.$interface.'-ipaddress">IP Address</label>
+                                <label for="'.$interface.'-ipaddress">' . _("IP Address") . '</label>
                                 <input type="text" class="form-control" id="'.$interface.'-ipaddress" placeholder="0.0.0.0">
                               </div>
                               <div class="form-group">
-                                <label for="'.$interface.'-netmask">Subnet Mask</label>
+                                <label for="'.$interface.'-netmask">' . _("Subnet Mask") . '</label>
                                 <input type="text" class="form-control" id="'.$interface.'-netmask" placeholder="255.255.255.0">
                               </div>
                               <div class="form-group">
-                                <label for="'.$interface.'-gateway">Default Gateway</label>
+                                <label for="'.$interface.'-gateway">' . _("Default Gateway") . '</label>
                                 <input type="text" class="form-control" id="'.$interface.'-gateway" placeholder="0.0.0.0">
                               </div>
                               <div class="form-group">
-                                <label for="'.$interface.'-dnssvr">DNS Server</label>
+                                <label for="'.$interface.'-dnssvr">' . _("DNS Server") . '</label>
                                 <input type="text" class="form-control" id="'.$interface.'-dnssvr" placeholder="0.0.0.0">
                               </div>
                               <div class="form-group">
-                                <label for="'.$interface.'-dnssvralt">Alternate DNS Server</label>
+                                <label for="'.$interface.'-dnssvralt">' . _("Alternate DNS Server") . '</label>
                                 <input type="text" class="form-control" id="'.$interface.'-dnssvralt" placeholder="0.0.0.0">
                               </div>
-                              <a href="#" class="btn btn-outline btn-primary intsave" data-int="'.$interface.'">Save Settings</a>
-                              <a href="#" class="btn btn-warning intapply" data-int="'.$interface.'">Apply Settings</a>
+                              <a href="#" class="btn btn-outline btn-primary intsave" data-int="'.$interface.'">' . _("Save settings") . '</a>
+                              <a href="#" class="btn btn-warning intapply" data-int="'.$interface.'">' . _("Apply settings") . '</a>
                               </form>
                             </div>
                       </div><!-- /.tab-panel -->
@@ -115,7 +114,7 @@ function DisplayNetworkingConfig(){
                 ?>
               </div><!-- /.tab-content -->
             </div><!-- /.panel-body -->
-            <div class="panel-footer">Information provided by /sys/class/net</div>
+	    <div class="panel-footer"><?php echo _("Information provided by /sys/class/net"); ?></div>
         </div><!-- /.panel-primary -->
       </div><!-- /.col-lg-12 -->
     </div>
diff --git a/includes/status_messages.php b/includes/status_messages.php
old mode 100644
new mode 100755
index aa87df33..5452baf9
--- a/includes/status_messages.php
+++ b/includes/status_messages.php
@@ -5,7 +5,7 @@ class StatusMessages {
   public function addMessage($message, $level='success', $dismissable=true) {
     $status = '<div class="alert alert-'.$level;
     if ($dismissable) $status .= ' alert-dismissable';
-    $status .= '">'.$message;
+    $status .= '">'. _($message);
     if ($dismissable) $status .= '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">x</button>';
     $status .= '</div>';
 
diff --git a/includes/system.php b/includes/system.php
index 8f8c29e3..171c196d 100755
--- a/includes/system.php
+++ b/includes/system.php
@@ -74,7 +74,7 @@ function DisplaySystem(){
 
   // cpu load
   $cores   = exec("grep -c ^processor /proc/cpuinfo");
-        $loadavg = exec("awk '{print $1}' /proc/loadavg");
+  $loadavg = exec("awk '{print $1}' /proc/loadavg");
   $cpuload = floor(($loadavg * 100) / $cores);
   if     ($cpuload > 90) { $cpuload_status = "danger";  }
   elseif ($cpuload > 75) { $cpuload_status = "warning"; }
@@ -84,16 +84,16 @@ function DisplaySystem(){
   <div class="row">
   <div class="col-lg-12">
   <div class="panel panel-primary">
-  <div class="panel-heading"><i class="fa fa-cube fa-fw"></i> System</div>
+  <div class="panel-heading"><i class="fa fa-cube fa-fw"></i> <?php echo _("System"); ?></div>
   <div class="panel-body">
 
     <?php
     if (isset($_POST['system_reboot'])) {
-      echo '<div class="alert alert-warning">System Rebooting Now!</div>';
+      echo '<div class="alert alert-warning">' . _("System Rebooting Now!") . '</div>';
       $result = shell_exec("sudo /sbin/reboot");
     }
     if (isset($_POST['system_shutdown'])) {
-      echo '<div class="alert alert-warning">System Shutting Down Now!</div>';
+      echo '<div class="alert alert-warning">' . _("System Shutting Down Now!") . '</div>';
       $result = shell_exec("sudo /sbin/shutdown -h now");
     }
     ?>
@@ -103,19 +103,19 @@ function DisplaySystem(){
     <div class="panel panel-default">
     <div class="panel-body">
     <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active systemtab"><a href="#system" aria-controls="system" role="tab" data-toggle="tab">System</a></li>
-        <li role="presentation" class="consoletab"><a href="#console" aria-controls="console" role="tab" data-toggle="tab">Console</a></li>
+        <li role="presentation" class="active systemtab"><a href="#system" aria-controls="system" role="tab" data-toggle="tab"><?php echo _("System"); ?></a></li>
+        <li role="presentation" class="consoletab"><a href="#console" aria-controls="console" role="tab" data-toggle="tab"><?php echo _("Console"); ?></a></li>
     </ul>
 
     <div class="systemtabcontent tab-content">
         <div role="tabpanel" class="tab-pane active" id="system">
             <div class="row">
                 <div class="col-lg-6">
-                        <h4>System Information</h4>
-                        <div class="info-item">Hostname</div> <?php echo $hostname ?></br>
-                        <div class="info-item">Pi Revision</div> <?php echo RPiVersion() ?></br>
-                        <div class="info-item">Uptime</div>   <?php echo $uptime ?></br></br>
-                        <div class="info-item">Memory Used</div>
+                        <h4><?php echo _("System Information"); ?></h4>
+                        <div class="info-item"><?php echo _("Hostname"); ?></div> <?php echo $hostname ?></br>
+                        <div class="info-item"><?php echo _("Pi Revision"); ?></div> <?php echo RPiVersion() ?></br>
+                        <div class="info-item"><?php echo _("Uptime"); ?></div>   <?php echo $uptime ?></br></br>
+                        <div class="info-item"><?php echo _("Memory Used"); ?></div>
                         <div class="progress">
                         <div class="progress-bar progress-bar-<?php echo $memused_status ?> progress-bar-striped active"
                         role="progressbar"
@@ -123,7 +123,7 @@ function DisplaySystem(){
                         style="width: <?php echo $memused ?>%;"><?php echo $memused ?>%
                         </div>
                         </div>
-                        <div class="info-item">CPU Load</div>
+                        <div class="info-item"><?php echo _("CPU Load"); ?></div>
                         <div class="progress">
                         <div class="progress-bar progress-bar-<?php echo $cpuload_status ?> progress-bar-striped active"
                         role="progressbar"
@@ -133,16 +133,20 @@ function DisplaySystem(){
                         </div>
 
                         <form action="?page=system_info" method="POST">
-                        <input type="submit" class="btn btn-warning" name="system_reboot"   value="Reboot" />
-                        <input type="submit" class="btn btn-warning" name="system_shutdown" value="Shutdown" />
-                        <input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" />
+                        <input type="submit" class="btn btn-warning" name="system_reboot"   value="<?php echo _("Reboot"); ?>" />
+                        <input type="submit" class="btn btn-warning" name="system_shutdown" value="<?php echo _("Shutdown"); ?>" />
+                        <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
                         </form>
                 </div>
             </div>
         </div>
-      <div role="tabpanel" class="tab-pane" id="console">
-      <iframe src="includes/webconsole.php" class="webconsole"></iframe>
-      </div>
+        <div role="tabpanel" class="tab-pane" id="console">
+            <div class="row">                                                                                                                                                             
+                <div class="col-lg-12"> 
+                    <iframe src="includes/webconsole.php" class="webconsole"></iframe>
+                </div>
+            </div>
+       </div>
 
 
 
diff --git a/includes/themes.php b/includes/themes.php
old mode 100644
new mode 100755
index 44af3511..fb3850c0
--- a/includes/themes.php
+++ b/includes/themes.php
@@ -25,18 +25,18 @@ function DisplayThemeConfig(){
   <div class="row">
   <div class="col-lg-12">
   <div class="panel panel-primary">
-  <div class="panel-heading"><i class="fa fa-wrench fa-fw"></i> Change Theme</div>
+  <div class="panel-heading"><i class="fa fa-wrench fa-fw"></i> <?php echo _("Change Theme"); ?></div>
   <div class="panel-body">
     <div class="row">
     <div class="col-md-6">
     <div class="panel panel-default">
     <div class="panel-body">
-      <h4>Theme settings</h4>
+      <h4><?php echo _("Theme settings"); ?></h4>
 
   <div class="row">
           <div class="form-group col-md-6">
-            <label for="code">Select a theme</label>  
-              <select class="form-control" id="theme-select">Select a Theme
+            <label for="code"><?php echo _("Select a theme"); ?></label>  
+              <select class="form-control" id="theme-select"><?php echo _("Select a Theme"); ?>
                 <option value="default" class="theme-link" <?php echo $cselected; ?>>RaspAP (default)</option>
                 <option value="hackernews" class="theme-link"<?php echo $hselected; ?>>HackerNews</option>
                 <option value="terminal" class="theme-link" <?php echo $tselected; ?>>Terminal</option>
@@ -50,7 +50,7 @@ function DisplayThemeConfig(){
     </div><!-- /.row -->
 
     <form action="?page=system_info" method="POST">
-      <input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" />
+      <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
     </form>
 
   </div><!-- /.panel-body -->
diff --git a/includes/webconsole.php b/includes/webconsole.php
old mode 100644
new mode 100755
diff --git a/index.php b/index.php
index f8868773..87ef5ea9 100755
--- a/index.php
+++ b/index.php
@@ -13,13 +13,14 @@
  * @author     Lawrence Yau <sirlagz@gmail.com>
  * @author     Bill Zimmerman <billzimmerman@gmail.com>
  * @license    GNU General Public License, version 3 (GPL-3.0)
- * @version    1.3.0
+ * @version    1.3.1
  * @link       https://github.com/billz/raspap-webgui
  * @see        http://sirlagz.net/2013/02/08/raspap-webgui/
  */
 
 include_once( 'includes/config.php' );
 include_once( RASPI_CONFIG.'/raspap.php' );
+include_once( 'includes/locale.php');
 include_once( 'includes/functions.php' );
 include_once( 'includes/dashboard.php' );
 include_once( 'includes/authenticate.php' );
@@ -61,7 +62,7 @@ $theme_url = 'dist/css/' . $theme;
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>Raspbian WiFi Configuration Portal</title>
+    <title><?php echo _("Raspbian WiFi Configuration Portal"); ?></title>
 
     <!-- Bootstrap Core CSS -->
     <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
@@ -104,7 +105,7 @@ $theme_url = 'dist/css/' . $theme;
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="index.php">RaspAP Wifi Portal v1.3.0</a>
+	  <a class="navbar-brand" href="index.php"><?php echo _("RaspAP Wifi Portal"); ?> v<?php echo RASPI_VERSION; ?></a>
         </div>
         <!-- /.navbar-header -->
 
@@ -113,48 +114,48 @@ $theme_url = 'dist/css/' . $theme;
           <div class="sidebar-nav navbar-collapse">
             <ul class="nav" id="side-menu">
               <li>
-                <a href="index.php?page=wlan0_info"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
+                <a href="index.php?page=wlan0_info"><i class="fa fa-dashboard fa-fw"></i> <?php echo _("Dashboard"); ?></a>
               </li>
               <li>
-                <a href="index.php?page=wpa_conf"><i class="fa fa-signal fa-fw"></i> Configure WiFi Client</a>
+                <a href="index.php?page=wpa_conf"><i class="fa fa-signal fa-fw"></i> <?php echo _("Configure WiFi client"); ?></a>
               </li>
               <?php if ( RASPI_HOTSPOT_ENABLED ) : ?>
               <li>
-                <a href="index.php?page=hostapd_conf"><i class="fa fa-dot-circle-o fa-fw"></i> Configure Hotspot</a>
+                <a href="index.php?page=hostapd_conf"><i class="fa fa-dot-circle-o fa-fw"></i> <?php echo _("Configure hotspot"); ?></a>
               </li>
               <?php endif; ?>
               <?php if ( RASPI_NETWORK_ENABLED ) : ?>
               <li>
-                <a href="index.php?page=network_conf"><i class="fa fa-sitemap fa-fw"></i> Configure Networking</a>
+	        <a href="index.php?page=network_conf"><i class="fa fa-sitemap fa-fw"></i> <?php echo _("Configure networking"); ?></a>
               </li> 
               <?php endif; ?>
               <?php if ( RASPI_DHCP_ENABLED ) : ?>
               <li>
-                <a href="index.php?page=dhcpd_conf"><i class="fa fa-exchange fa-fw"></i> Configure DHCP Server</a>
+                <a href="index.php?page=dhcpd_conf"><i class="fa fa-exchange fa-fw"></i> <?php echo _("Configure DHCP"); ?></a>
               </li>
               <?php endif; ?>
               <?php if ( RASPI_OPENVPN_ENABLED ) : ?>
               <li>
-                <a href="index.php?page=openvpn_conf"><i class="fa fa-lock fa-fw"></i> Configure OpenVPN</a>
+                <a href="index.php?page=openvpn_conf"><i class="fa fa-lock fa-fw"></i> <?php echo _("Configure OpenVPN"); ?></a>
               </li>
               <?php endif; ?>
               <?php if ( RASPI_TORPROXY_ENABLED ) : ?>
               <li>
-                 <a href="index.php?page=torproxy_conf"><i class="fa fa-eye-slash fa-fw"></i> Configure TOR proxy</a>
+                 <a href="index.php?page=torproxy_conf"><i class="fa fa-eye-slash fa-fw"></i> <?php echo _("Configure TOR proxy"); ?></a>
               </li>
               <?php endif; ?>
               <?php if ( RASPI_CONFAUTH_ENABLED ) : ?>
               <li>
-                <a href="index.php?page=auth_conf"><i class="fa fa-lock fa-fw"></i> Configure Auth</a>
+                <a href="index.php?page=auth_conf"><i class="fa fa-lock fa-fw"></i> <?php echo _("Configure Auth"); ?></a>
               </li>
               <?php endif; ?>
               <?php if ( RASPI_CHANGETHEME_ENABLED ) : ?>
               <li>
-                <a href="index.php?page=theme_conf"><i class="fa fa-wrench fa-fw"></i> Change Theme</a>
+                <a href="index.php?page=theme_conf"><i class="fa fa-wrench fa-fw"></i> <?php echo _("Change Theme"); ?></a>
               </li>
               <?php endif; ?>
               <li>
-                 <a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> System</a>
+                 <a href="index.php?page=system_info"><i class="fa fa-cube fa-fw"></i> <?php echo _("System"); ?></a>
               </li>
             </ul>
           </div><!-- /.navbar-collapse -->
diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo
new file mode 100644
index 00000000..a17113bd
Binary files /dev/null and b/locale/en_US/LC_MESSAGES/messages.mo differ
diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..7dc6830f
--- /dev/null
+++ b/locale/en_US/LC_MESSAGES/messages.po
@@ -0,0 +1,447 @@
+# RaspAP Portable Object file
+# Project home: https://github.com/billz/raspap-webgui
+# Licensed under the GNU General Public License v3.0
+# This file is distributed under the same license as the RaspAP package
+# FIRST AUTHOR billzimmerman@gmail.com, 2017
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.2.1\n"
+"Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
+"POT-Creation-Date: 2017-10-19 08:56+0000\n"
+"PO-Revision-Date: 2018-05-17 17:15+0000\n"
+"Last-Translator: Bill Zimmerman <billzimmerman@gmail.com>\n"
+"Language-Team: \n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: index.php
+msgid "RaspAP Wifi Configuration Portal"
+msgstr "RaspAP Wifi Configuration Portal"
+
+msgid "Toggle navigation"
+msgstr "Toggle navigation"
+
+msgid "RaspAP Wifi Portal"
+msgstr "RaspAP Wifi Portal"
+
+msgid "Dashboard"
+msgstr "Dashboard"
+
+msgid "Configure WiFI client"
+msgstr "Configure WiFi client"
+
+msgid "Configure hotspot"
+msgstr "Configure hotspot"
+
+msgid "Configure networking"
+msgstr "Configure networking"
+
+msgid "Configure DHCP Server"
+msgstr "Configure DHCP Server"
+
+msgid "Configure OpenVPN"
+msgstr "Configure OpenVPN"
+
+msgid "Configure TOR proxy"
+msgstr "Configure TOR proxy"
+
+msgid "Configure Auth"
+msgstr "Configure Auth"
+
+msgid "Change Theme"
+msgstr "Change Theme"
+
+msgid "System"
+msgstr "System"
+
+#: includes/admin.php
+msgid "New passwords do not match"
+msgstr "New passwords do not match"
+
+msgid "Username must not be empty"
+msgstr "Username must not be empty"
+
+msgid "Admin password updated"
+msgstr "Admin password updated"
+
+msgid "Failed to update admin password"
+msgstr "Failed to update admin password"
+
+msgid "Old password does not match"
+msgstr "Old password does not match"
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Old password"
+msgstr "Old password"
+
+msgid "New password"
+msgstr "New password"
+
+msgid "Repeat new password"
+msgstr "Repeat new password"
+
+#: includes/configure_client.php
+msgid "Client settings"
+msgstr "Client settings"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Channel"
+msgstr "Channel"
+
+msgid "Security"
+msgstr "Security"
+
+msgid "Passphrase"
+msgstr "Passphrase"
+
+msgid "Wifi settings updated successfully"
+msgstr "Wifi settings updated successfully"
+
+msgid "Wifi settings updated but cannot restart (cannot execute 'wpa_cli reconfigure')"
+msgstr "Wifi settings updated but cannot restart (cannot execute 'wpa_cli reconfigure')"
+
+msgid "Wifi settings failed to be updated"
+msgstr "Wifi settings failed to be updated"
+
+msgid "Failed to update wifi settings"
+msgstr "Failed to update wifi settings"
+
+msgid "Rescan"
+msgstr "Rescan"
+
+msgid "Update"
+msgstr "Update"
+
+msgid "Add"
+msgstr "Add"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid "<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"
+msgstr "<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"
+
+#: includes/dashboard.php
+msgid "Interface Information"
+msgstr "Interface Information"
+
+msgid "Interface Name"
+msgstr "Interface Name"
+
+msgid "IP Address"
+msgstr "IP Address"
+
+msgid "Subnet Mask"
+msgstr "Subnet Mask"
+
+msgid "Mac Address"
+msgstr "Mac Address"
+
+msgid "Interface Statistics"
+msgstr "Interface Statistics"
+
+msgid "Received Packets"
+msgstr "Received Packets"
+
+msgid "Received Bytes"
+msgstr "Received Bytes"
+
+msgid "Transferred Packets"
+msgstr "Transferred Packets"
+
+msgid "Transferred Bytes"
+msgstr "Transferred Bytes"
+
+msgid "Wireless Information"
+msgstr "Wireless Information"
+
+msgid "Connected To"
+msgstr "Connected To"
+
+msgid "AP Mac Address"
+msgstr "AP Mac Address"
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Signal Level"
+msgstr "Signal Level"
+
+msgid "Transmit Power"
+msgstr "Transmit Power"
+
+msgid "Frequency"
+msgstr "Frequency"
+
+msgid "Link Quality"
+msgstr "Link Quality"
+
+msgid "Information provided by ifconfig and iwconfig"
+msgstr "Information provided by ifconfig and iwconfig"
+
+msgid "No MAC Address Found"
+msgstr "No MAC Address Found"
+
+msgid "No IP Address Found"
+msgstr "No IP Address Found"
+
+msgid "No Subnet Mask Found"
+msgstr "No Subnet Mask Found"
+
+msgid "No Data"
+msgstr "No Data"
+
+msgid "Not connected"
+msgstr "Not connected"
+
+msgid "Interface is up"
+msgstr "Interface is up"
+
+msgid "Interface is down"
+msgstr "Interface is down"
+
+msgid "Interface already down"
+msgstr "Interface already down"
+
+msgid "Start wlan0"
+msgstr "Start wlan0"
+
+msgid "Stop wlan0"
+msgstr "Stop wlan0"
+
+#: includes/dhcp.php
+msgid "Server settings"
+msgstr "Server settings"
+
+msgid "Client list"
+msgstr "Client list"
+
+msgid "Starting IP Address"
+msgstr "Starting IP Address"
+
+msgid "Ending IP Address"
+msgstr "Ending IP Address"
+
+msgid "Lease Time"
+msgstr "Lease Time"
+
+msgid "Interval"
+msgstr "Interval"
+
+msgid "Active DHCP leases"
+msgstr "Active DHCP leases"
+
+msgid "Expire time"
+msgstr "Expire time"
+
+msgid "MAC Address"
+msgstr "MAC Address"
+
+msgid "Host name"
+msgstr "Host name"
+
+msgid "Client ID"
+msgstr "Client ID"
+
+msgid "Information provided by Dnsmasq"
+msgstr "Information provided by Dnsmasq"
+
+msgid "Stop dnsmasq"
+msgstr "Stop dnsmasq"
+
+msgid "Start dnsmasq"
+msgstr "Start dnsmasq"
+
+msgid "Dnsmasq configuration updated successfully"
+msgstr "Dnsmasq configuration updated successfully"
+
+msgid "dnsmasq already running"
+msgstr "dnsmasq already running"
+
+msgid "Successfully started dnsmasq"
+msgstr "Successfully started dnsmasq"
+
+msgid "Failed to start dnsmasq"
+msgstr "Failed to start dnsmasq"
+
+msgid "Successfully stopped dnsmasq"
+msgstr "Successfully stopped dnsmasq"
+
+msgid "Failed to stop dnsmasq"
+msgstr "Failed to stop dnsmasq"
+
+msgid "dnsmasq already stopped"
+msgstr "dnsmasq already stopped"
+
+msgid "Dnsmasq is running"
+msgstr "Dnsmasq is running"
+
+msgid "Dnsmasq is not running"
+msgstr "Dnsmasq is not running"
+
+#: includes/hostapd.php
+msgid "Basic"
+msgstr "Basic"
+
+msgid "Advanced"
+msgstr "Advanced"
+
+msgid "Basic settings"
+msgstr "Basic settings"
+
+msgid "Wireless Mode"
+msgstr "Wireless Mode"
+
+msgid "Security settings"
+msgstr "Security settings"
+
+msgid "Security type"
+msgstr "Security type"
+
+msgid "Encryption Type"
+msgstr "Encryption Type"
+
+msgid "PSK"
+msgstr "PSK"
+
+msgid "Advanced settings"
+msgstr "Advanced settings"
+
+msgid "Country Code"
+msgstr "Country Code"
+
+msgid "Information provided by hostapd"
+msgstr "Information provided by hostapd"
+
+msgid "Attempting to start hotspot"
+msgstr "Attempting to start hotspot"
+
+msgid "Attempting to stop hotspot"
+msgstr "Attempting to stop hotspot"
+
+msgid "HostAPD is not running"
+msgstr "HostAPD is not running"
+
+msgid "HostAPD is running"
+msgstr "HostAPD is running"
+
+msgid "SSID must be between 1 and 32 characters"
+msgstr "SSID must be between 1 and 32 characters"
+
+msgid "WPA passphrase must be between 8 and 63 characters"
+msgstr "WPA passphrase must be between 8 and 63 characters"
+
+msgid "Unknown interface"
+msgstr "Unknown interface"
+
+msgid "Country code must be blank or two characters"
+msgstr "Country code must be blank or two characters"
+
+msgid "Wifi Hotspot settings saved"
+msgstr "Wifi Hotspot settings saved"
+
+msgid "Unable to save wifi hotspot settings"
+msgstr "Unable to save wifi hotspot settings"
+
+msgid "Start hotspot"
+msgstr "Start hotspot"
+
+msgid "Stop hotspot"
+msgstr "Stop hotspot"
+
+msgid "Enable logging"
+msgstr "Enable logging"
+
+msgid "Logfile output"
+msgstr "Logfile output"
+
+#: includes/networking.php
+msgid "Summary"
+msgstr "Summary"
+
+msgid "Current settings"
+msgstr "Current settings"
+
+msgid "Default Gateway"
+msgstr "Default Gateway"
+
+msgid "DNS Server"
+msgstr "DNS Server"
+
+msgid "Alternate DNS Server"
+msgstr "Alternate DNS Server"
+
+msgid "Adapter IP Address Settings"
+msgstr "Adapter IP Address Settings"
+
+msgid "Enable Fallback to Static Option"
+msgstr "Enable Fallback to Static Option"
+
+msgid "Static IP"
+msgstr "Static IP"
+
+msgid "Enabled"
+msgstr "Enabled"
+
+msgid "Disabled"
+msgstr "Disabled"
+
+msgid "Static IP Options"
+msgstr "Static IP Options"
+
+msgid "Apply settings"
+msgstr "Apply settings"
+
+msgid "Information provided by /sys/class/net"
+msgstr "Information provided by /sys/class/net"
+
+#: includes/system.php
+msgid "Hostname"
+msgstr "Hostname"
+
+msgid "Pi Revision"
+msgstr "Pi Revision"
+
+msgid "Uptime"
+msgstr "Uptime"
+
+msgid "Memory Used"
+msgstr "Memory Used"
+
+msgid "CPU Load"
+msgstr "CPU Load"
+
+msgid "Reboot"
+msgstr "Reboot"
+
+msgid "Shutdown"
+msgstr "Shutdown"
+
+msgid "System Rebooting Now!"
+msgstr "System Rebooting Now!"
+
+msgid "System Shutting Down Now!"
+msgstr "System Shutting Down Now!"
+
+#: includes/themes.php
+msgid "Theme settings"
+msgstr "Theme settings"
+
+msgid "Select a theme"
+msgstr "Select a theme"
+
+#: common form controls
+msgid "Save settings"
+msgstr "Save settings"
+
+msgid "Refresh"
+msgstr "Refresh"
+
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
new file mode 100644
index 00000000..9c14b8aa
Binary files /dev/null and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..ff9379b4
--- /dev/null
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -0,0 +1,444 @@
+# RaspAP Portable Object file
+# Project home: https://github.com/billz/raspap-webgui
+# Licensed under the GNU General Public License v3.0
+# This file is distributed under the same license as the RaspAP package
+# FIRST AUTHOR billzimmerman@gmail.com, 2017
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.2.1\n"
+"Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
+"POT-Creation-Date: 2017-10-19 08:56+0000\n"
+"PO-Revision-Date: 2018-05-27 17:15+0000\n"
+"Last-Translator: Bill Zimmerman <billzimmerman@gmail.com>\n"
+"Language-Team: \n"
+"Language: fr_FR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: index.php
+msgid "RaspAP Wifi Configuration Portal"
+msgstr "RaspAP Wifi Portail de Configuration"
+
+msgid "Toggle navigation"
+msgstr "Basculer la navigation"
+
+msgid "RaspAP Wifi Portal"
+msgstr "RaspAP Wifi Portal"
+
+msgid "Dashboard"
+msgstr "Tableau de bord"
+
+msgid "Configure WiFi client"
+msgstr "Configurer le client WiFi"
+
+msgid "Configure hotspot"
+msgstr "Configurer le hotspot"
+
+msgid "Configure networking"
+msgstr "Configurer le réseau"
+
+msgid "Configure DHCP"
+msgstr "Configurer DHCP"
+
+msgid "Configure OpenVPN"
+msgstr "Configurer OpenVPN"
+
+msgid "Configure TOR proxy"
+msgstr "Configurer le proxy TOR"
+
+msgid "Configure Auth"
+msgstr "Configurer l'auth"
+
+msgid "Change Theme"
+msgstr "Change le thème"
+
+msgid "System"
+msgstr "Système"
+
+#: includes/admin.php
+msgid "New passwords do not match"
+msgstr "Les nouveaux mots de passe ne correspondent pas"
+
+msgid "Username must not be empty"
+msgstr "Le nom d'utilisateur ne doit pas être vide"
+
+msgid "Admin password updated"
+msgstr "Mot de passe admin modifié"
+
+msgid "Failed to update admin password"
+msgstr "Modifier le mot de passe d'admin a échouéd"
+
+msgid "Old password does not match"
+msgstr "L'ancien mot de passe ne correspond pas"
+
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+msgid "Old password"
+msgstr "Ancien mot de passe"
+
+msgid "New password"
+msgstr "Nouveau mot de passe"
+
+msgid "Repeat new password"
+msgstr "Répété le nouveau mot de passe"
+
+#: includes/configure_client.php
+msgid "Client settings"
+msgstr "Paramètres du client"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Security"
+msgstr "Sécurité"
+
+msgid "Passphrase"
+msgstr "Phrase secrète"
+
+msgid "Wifi settings updated successfully"
+msgstr "Paramètres Wifi mis à jour avec succès"
+
+msgid "Wifi settings updated but cannot restart (cannot execute 'wpa_cli reconfigure')"
+msgstr "Les paramètres Wifi sont mis à jour mais ne peuvent pas redémarrer (impossible d'exécuter 'wpa_cli reconfigure')"
+
+msgid "Wifi settings failed to be updated"
+msgstr "Les paramètres Wifi n'ont pas été mis à jour"
+
+msgid "Failed to updated wifi settings"
+msgstr "N'a pas mis à jour les paramètres wifi"
+
+msgid "Rescan"
+msgstr "Rescan"
+
+msgid "Update"
+msgstr "Mettre à jour"
+
+msgid "Add"
+msgstr "Ajouter"
+
+msgid "Delete"
+msgstr "Effacer"
+
+msgid "<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"
+msgstr "<strong>Remarque:</strong> Les points d'accès WEP apparaissent comme 'ouverts'. RaspAP ne prend actuellement pas en charge la connexion à WEP"
+
+#: includes/dashboard.php
+msgid "Interface Information"
+msgstr "Informations d'interface"
+
+msgid "Interface Name"
+msgstr "Nom de l'interface"
+
+msgid "IP Address"
+msgstr "Adresse IP"
+
+msgid "Subnet Mask"
+msgstr "Masque de sous-réseau"
+
+msgid "Mac Address"
+msgstr "Adresse Mac"
+
+msgid "Interface Statistics"
+msgstr "Statistiques d'interface"
+
+msgid "Received Packets"
+msgstr "Paquets reçus"
+
+msgid "Received Bytes"
+msgstr "Octets reçus"
+
+msgid "Transferred Packets"
+msgstr "Paquets transférés"
+
+msgid "Transferred Bytes"
+msgstr "Octets transférés"
+
+msgid "Wireless Information"
+msgstr "Informations sans fil"
+
+msgid "Connected To"
+msgstr "Connecté à"
+
+msgid "AP Mac Address"
+msgstr "AP Mac Adresse"
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Signal Level"
+msgstr "Niveau du signal"
+
+msgid "Transmit Power"
+msgstr "Puissance de transmission"
+
+msgid "Frequency"
+msgstr "La fréquence"
+
+msgid "Link Quality"
+msgstr "Qualité de lien"
+
+msgid "Information provided by ifconfig and iwconfig"
+msgstr "Informations fournies par ifconfig et iwconfig"
+
+msgid "No MAC Address Found"
+msgstr "Aucune adresse MAC trouvée"
+
+msgid "No IP Address Found"
+msgstr "Aucune adresse IP trouvée"
+
+msgid "No Subnet Mask Found"
+msgstr "Aucun masque de sous-réseau trouvé"
+
+msgid "No Data"
+msgstr "Pas de données"
+
+msgid "Not connected"
+msgstr "Pas connecté"
+
+msgid "Interface is up"
+msgstr "L'interface est en place"
+
+msgid "Interface is down"
+msgstr "L'interface est en panne"
+
+msgid "Interface already down"
+msgstr "Interface déjà en bas"
+
+msgid "Start wlan0"
+msgstr "Commencer wlan0"
+
+msgid "Stop wlan0"
+msgstr "Arrêtez wlan0"
+
+#: includes/dhcp.php
+msgid "Server settings"
+msgstr "Paramètres du serveur"
+
+msgid "Client list"
+msgstr "Liste des clients"
+
+msgid "Starting IP Address"
+msgstr "Adresse IP de départ"
+
+msgid "Ending IP Address"
+msgstr "Adresse IP de fin"
+
+msgid "Lease Time"
+msgstr "Temps de bail"
+
+msgid "Interval"
+msgstr "Intervalle"
+
+msgid "Active DHCP leases"
+msgstr "Baux DHCP actifs"
+
+msgid "Expire time"
+msgstr "Temps d'expiration"
+
+msgid "MAC Address"
+msgstr "Adresse Mac"
+
+msgid "Host name"
+msgstr "Nom d'hôte"
+
+msgid "Client ID"
+msgstr "ID du client"
+
+msgid "Information provided by Dnsmasq"
+msgstr "Informations fournies par Dnsmasq"
+
+msgid "Stop dnsmasq"
+msgstr "Arrêtez dnsmasq"
+
+msgid "Start dnsmasq"
+msgstr "Commencer dnsmasq"
+
+msgid "dnsmasq already running"
+msgstr "Dnsmasq déjà en cours d'exécution"
+
+msgid "Successfully started dnsmasq"
+msgstr "Lancé avec succès dnsmasq"
+
+msgid "Failed to start dnsmasq"
+msgstr "N'a pas démarrage de Dnsmasq"
+
+msgid "Successfully stopped dnsmasq"
+msgstr "Arrêté avec succès dnsmasq"
+
+msgid "Failed to stop dnsmasq"
+msgstr "N'a pas arrêté dnsmasq"
+
+msgid "dnsmasq already stopped"
+msgstr "dnsmasq déjà arrêté"
+
+msgid "Dnsmasq is running"
+msgstr "Dnsmasq est en cours d'exécution"
+
+msgid "Dnsmasq is not running"
+msgstr "Dnsmasq ne fonctionne pas"
+
+#: includes/hostapd.php
+msgid "Basic"
+msgstr "De base"
+
+msgid "Advanced"
+msgstr "Avancé"
+
+msgid "Basic settings"
+msgstr "Paramètres de base"
+
+msgid "Wireless Mode"
+msgstr "Mode sans fil"
+
+msgid "Security settings"
+msgstr "Les paramètres de sécurité"
+
+msgid "Security type"
+msgstr "Type de sécurité"
+
+msgid "Encryption Type"
+msgstr "Type de chiffrement"
+
+msgid "PSK"
+msgstr "PSK"
+
+msgid "Advanced settings"
+msgstr "Réglages avancés"
+
+msgid "Country Code"
+msgstr "Le code du pays"
+
+msgid "Information provided by hostapd"
+msgstr "Informations fournies par hostapd"
+
+msgid "Attempting to start hotspot"
+msgstr "Essayez de démarrer le hotspot"
+
+msgid "Attempting to stop hotspot"
+msgstr "Tentative d'arrêt du hotspot"
+
+msgid "HostAPD is not running"
+msgstr "HostAPD n'est pas en cours d'exécution"
+
+msgid "HostAPD is running"
+msgstr "HostAPD est en cours d'exécution"
+
+msgid "SSID must be between 1 and 32 characters"
+msgstr "Le SSID doit avoir entre 1 et 32 caractères"
+
+msgid "WPA passphrase must be between 8 and 63 characters"
+msgstr "La phrase d'authentification WPA doit comporter entre 8 et 63 caractères"
+
+msgid "Unknown interface"
+msgstr "Interface inconnue"
+
+msgid "Country code must be blank or two characters"
+msgstr "Le code du pays doit être vide ou deux caractères"
+
+msgid "Wifi Hotspot settings saved"
+msgstr "Paramètres de hotspot WI-FI enregistrés"
+
+msgid "Unable to save wifi hotspot settings"
+msgstr "Impossible d'enregistrer le réglage du hotspot Wi-Fi"
+
+msgid "Start hotspot"
+msgstr "Démarrer le point d'accès"
+
+msgid "Stop hotspot"
+msgstr "Arrêté hotspot"
+
+msgid "Enable logging"
+msgstr "Activer la journalisation"
+
+msgid "Logfile output"
+msgstr "Sortie de journal"
+
+#: includes/networking.php
+msgid "Summary"
+msgstr "Résumé"
+
+msgid "Current settings"
+msgstr "Paramètres actuels"
+
+msgid "Default Gateway"
+msgstr "Passerelle par défaut"
+
+msgid "DNS Server"
+msgstr "Serveur DNS"
+
+msgid "Alternate DNS Server"
+msgstr "Autre serveur DNS"
+
+msgid "Adapter IP Address Settings"
+msgstr "Paramètres d'adresse IP de l'adaptateur"
+
+msgid "Enable Fallback to Static Option"
+msgstr "Activer la repli vers l'option statique"
+
+msgid "Static IP"
+msgstr "IP statique"
+
+msgid "Enabled"
+msgstr "Activée"
+
+msgid "Disabled"
+msgstr "Désactivé"
+
+msgid "Static IP Options"
+msgstr "Options IP statiques"
+
+msgid "Apply settings"
+msgstr "Appliquer les paramètres"
+
+msgid "Information provided by /sys/class/net"
+msgstr "Informations fournies par /sys/class/net"
+
+#: includes/system.php
+msgid "Hostname"
+msgstr "Nom d'hôte"
+
+msgid "Pi Revision"
+msgstr "Pi Révision"
+
+msgid "Uptime"
+msgstr "Durée de fonctionnent"
+
+msgid "Memory Used"
+msgstr "Mémoire utilisée"
+
+msgid "CPU Load"
+msgstr "Charge du processeur"
+
+msgid "Reboot"
+msgstr "Redémarrer"
+
+msgid "Shutdown"
+msgstr "Fermer"
+
+msgid "System Rebooting Now!"
+msgstr "Système de redémarrage maintenant!"
+
+msgid "System Shutting Down Now!"
+msgstr "Système de fermeture maintenant!"
+
+#: includes/themes.php
+msgid "Theme settings"
+msgstr "Réglage des thèmes"
+
+msgid "Select a theme"
+msgstr "Sélectionnez un thème"
+
+#: common form controls
+msgid "Save settings"
+msgstr "Enregistrer les paramètres"
+
+msgid "Refresh"
+msgstr "Recharger"
+
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
new file mode 100644
index 00000000..73415751
Binary files /dev/null and b/locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..0883b452
--- /dev/null
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -0,0 +1,447 @@
+# RaspAP Portable Object file
+# Project home: https://github.com/billz/raspap-webgui
+# Licensed under the GNU General Public License v3.0
+# This file is distributed under the same license as the RaspAP package
+# FIRST AUTHOR Simone Rizzo <simone.rizzo@live.com>, 2017
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.2.1\n"
+"Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
+"POT-Creation-Date: 2017-10-19 08:56+0000\n"
+"PO-Revision-Date: 2018-05-27 17:15+0000\n"
+"Last-Translator: Simone Rizzo <simone.rizzo@live.com>\n"
+"Language-Team: \n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: index.php
+msgid "RaspAP Wifi Configuration Portal"
+msgstr "Portale configurazione RaspAP Wifi"
+
+msgid "Toggle navigation"
+msgstr "Mostra/nascondi navigazione"
+
+msgid "RaspAP Wifi Portal"
+msgstr "RaspAP Wifi Portal"
+
+msgid "Dashboard"
+msgstr "Dashboard"
+
+msgid "Configure WiFi client"
+msgstr "Configura client WiFi"
+
+msgid "Configure hotspot"
+msgstr "Configura hotspot"
+
+msgid "Configure networking"
+msgstr "Configura rete"
+
+msgid "Configure DHCP"
+msgstr "Configura DHCP"
+
+msgid "Configure OpenVPN"
+msgstr "Configura OpenVPN"
+
+msgid "Configure TOR proxy"
+msgstr "Configura proxy TOR"
+
+msgid "Configure Auth"
+msgstr "Configura Auth"
+
+msgid "Change Theme"
+msgstr "Cambia tema"
+
+msgid "System"
+msgstr "Sistema"
+
+#: includes/admin.php
+msgid "New passwords do not match"
+msgstr "Le nuove password non corrispondono"
+
+msgid "Username must not be empty"
+msgstr "Il nome utente non deve essere vuoto"
+
+msgid "Admin password updated"
+msgstr "Password admin aggiornata"
+
+msgid "Failed to update admin password"
+msgstr "L'aggiornamento della password admin non è andato a buon fine"
+
+msgid "Old password does not match"
+msgstr "La vecchia password non corrisponde"
+
+msgid "Username"
+msgstr "Nome utente"
+
+msgid "Old password"
+msgstr "Vecchia password"
+
+msgid "New password"
+msgstr "Nuova password"
+
+msgid "Repeat new password"
+msgstr "Ripeti la nuova password"
+
+#: includes/configure_client.php
+msgid "Client settings"
+msgstr "Impostazioni client"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Channel"
+msgstr "Canale"
+
+msgid "Security"
+msgstr "Sicurezza"
+
+msgid "Passphrase"
+msgstr "Chiave di sicurezza"
+
+msgid "Wifi settings updated successfully"
+msgstr "Impostazioni Wifi aggiornate con successo"
+
+msgid "Wifi settings updated but cannot restart (cannon execute 'wpa_cli reconfigure')"
+msgstr "Impostazioni Wifi aggiornate ma impossibile riavviare (impossibile eseguire 'wpa_cli reconfigure')"
+
+msgid "Wifi settings failed to be updated"
+msgstr "Non è stato possibile aggiornare le impostazioni Wifi"
+
+msgid "Failed to update wifi settings"
+msgstr "Impossibile aggiornare le impostazioni Wifi"
+
+msgid "Rescan"
+msgstr "Ripeti la scan"
+
+msgid "Update"
+msgstr "Aggiorna"
+
+msgid "Add"
+msgstr "Aggiungi"
+
+msgid "Delete"
+msgstr "Cancella"
+
+msgid "<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"
+msgstr "<strong>Nota:</strong> gli access points WEP appaiono come 'Aperti' . RaspAP non supporta attualmente la connessione WEP"
+
+#: includes/dashboard.php
+msgid "Interface Information"
+msgstr "Informazioni interfaccia"
+
+msgid "Interface Name"
+msgstr "Nome interfaccia"
+
+msgid "IP Address"
+msgstr "Indirizzo IP"
+
+msgid "Subnet Mask"
+msgstr "Subnet mask"
+
+msgid "Mac Address"
+msgstr "Indirizzo MAC"
+
+msgid "Interface Statistics"
+msgstr "Statistiche interfaccia"
+
+msgid "Received Packets"
+msgstr "Pacchetti ricevuti"
+
+msgid "Received Bytes"
+msgstr "Bytes ricevuti"
+
+msgid "Transferred Packets"
+msgstr "Pacchetti trasmessi"
+
+msgid "Transferred Bytes"
+msgstr "Bytes trasmessi"
+
+msgid "Wireless Information"
+msgstr "Informazioni wireless"
+
+msgid "Connected To"
+msgstr "Connesso a"
+
+msgid "AP Mac Address"
+msgstr "Indirizzo MAC access point"
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Signal Level"
+msgstr "Livello segnale"
+
+msgid "Transmit Power"
+msgstr "Potenza di trasmissione"
+
+msgid "Frequency"
+msgstr "Frequenza"
+
+msgid "Link Quality"
+msgstr "Qualità collegamento"
+
+msgid "Information provided by ifconfig and iwconfig"
+msgstr "Informazioni fornite da ifconfig e iwconfig"
+
+msgid "No MAC Address Found"
+msgstr "Indirizzo MAC non trovato"
+
+msgid "No IP Address Found"
+msgstr "Indirizzo IP no trovato"
+
+msgid "No Subnet Mask Found"
+msgstr "Subnet mask non trovata"
+
+msgid "No Data"
+msgstr "Nessun dato"
+
+msgid "Not connected"
+msgstr "Non connesso"
+
+msgid "Interface is up"
+msgstr "Interfaccia attiva"
+
+msgid "Interface is down"
+msgstr "Interfaccia inattiva"
+
+msgid "Interface already down"
+msgstr "Interfaccia già inattiva"
+
+msgid "Start wlan0"
+msgstr "Avvia wlan0"
+
+msgid "Stop wlan0"
+msgstr "Ferma wlan0"
+
+#: includes/dhcp.php
+msgid "Server settings"
+msgstr "Impostazioni server"
+
+msgid "Client list"
+msgstr "Lista client"
+
+msgid "Starting IP Address"
+msgstr "Indirizzo IP iniziale"
+
+msgid "Ending IP Address"
+msgstr "Indirizzo IP finale"
+
+msgid "Lease Time"
+msgstr "Tempo di lease"
+
+msgid "Interval"
+msgstr "Intervallo"
+
+msgid "Active DHCP leases"
+msgstr "Lease DHCP attivi"
+
+msgid "Expire time"
+msgstr "Tempo di scadenza"
+
+msgid "MAC Address"
+msgstr "Indirizzo MAC"
+
+msgid "Host name"
+msgstr "Nome host"
+
+msgid "Client ID"
+msgstr "ID client"
+
+msgid "Information provided by Dnsmasq"
+msgstr "Informazioni fornite da Dnsmasq"
+
+msgid "Stop dnsmasq"
+msgstr "Ferma dnsmasq"
+
+msgid "Start dnsmasq"
+msgstr "Avvia dnsmasq"
+
+msgid "Dnsmasq configuration updated successfully"
+msgstr "Configurazione Dnsmasq aggiornata con successo"
+
+msgid "dnsmasq already running"
+msgstr "dnsmasq è già in esecuzione"
+
+msgid "Successfully started dnsmasq"
+msgstr "dnsmasq avviato con successo"
+
+msgid "Failed to start dnsmasq"
+msgstr "Impossibile avviare dnsmasq"
+
+msgid "Successfully stopped dnsmasq"
+msgstr "dnsmasq fermato con successo"
+
+msgid "Failed to stop dnsmasq"
+msgstr "Impossibile fermare dnsmasq"
+
+msgid "dnsmasq already stopped"
+msgstr "dnsmasq è già stoppato"
+
+msgid "Dnsmasq is running"
+msgstr "Dnsmasq è in esecuzione"
+
+msgid "Dnsmasq is not running"
+msgstr "Dnsmasq non è in esecuzione"
+
+#: includes/hostapd.php
+msgid "Basic"
+msgstr "Base"
+
+msgid "Advanced"
+msgstr "Avanzate"
+
+msgid "Basic settings"
+msgstr "Impostazioni base"
+
+msgid "Wireless Mode"
+msgstr "Modalità wireless"
+
+msgid "Security settings"
+msgstr "Impostazioni sicurezza"
+
+msgid "Security type"
+msgstr "Tipo sicurezza"
+
+msgid "Encryption Type"
+msgstr "Tipo crittografia"
+
+msgid "PSK"
+msgstr "PSK"
+
+msgid "Advanced settings"
+msgstr "Impostazioni avanzate"
+
+msgid "Country Code"
+msgstr "Codice paese"
+
+msgid "Information provided by hostapd"
+msgstr "Informazioni fornite da hostapd"
+
+msgid "Attempting to start hotspot"
+msgstr "Tentando di avviare l'hotspot"
+
+msgid "Attempting to stop hotspot"
+msgstr "Tentando di stoppare l'hotspot"
+
+msgid "HostAPD is not running"
+msgstr "HostAPD non è in esecuzione"
+
+msgid "HostAPD is running"
+msgstr "HostAPD è in esecuzione"
+
+msgid "SSID must be between 1 and 32 characters"
+msgstr "Il SSID deve essere lungo da 1 a 32 caratteri"
+
+msgid "WPA passphrase must be between 8 and 63 characters"
+msgstr "La passphrase WPA deve essere lunga da 8 a 32 caratteri"
+
+msgid "Unknown interface"
+msgstr "Interfaccia sconosciuta"
+
+msgid "Country code must be blank or two characters"
+msgstr "Il codice paese deve essere o vuoto o di due caratteri"
+
+msgid "Wifi Hotspot settings saved"
+msgstr "Impostazioni hotspot Wifi salvate"
+
+msgid "Unable to save wifi hotspot settings"
+msgstr "Impossibile salvare le impostazioni dell'hotspot Wifi"
+
+msgid "Start hotspot"
+msgstr "Avvia l'hotspot"
+
+msgid "Stop hotspot"
+msgstr "Ferma l'hotspot"
+
+msgid "Enable logging"
+msgstr "Abilita la registrazione"
+
+msgid "Logfile output"
+msgstr "File di log in uscita"
+
+#: includes/networking.php
+msgid "Summary"
+msgstr "Sommario"
+
+msgid "Current settings"
+msgstr "Impostazioni attuali"
+
+msgid "Default Gateway"
+msgstr "Gateway predefinito"
+
+msgid "DNS Server"
+msgstr "Server DNS"
+
+msgid "Alternate DNS Server"
+msgstr "Server DNS alternativo"
+
+msgid "Adapter IP Address Settings"
+msgstr "Impostazioni dell'indirizzo IP dell'adattatore"
+
+msgid "Enable Fallback to Static Option"
+msgstr "Abilita l'opzione statica di fallback"
+
+msgid "Static IP"
+msgstr "IP statico"
+
+msgid "Enabled"
+msgstr "Abilitato"
+
+msgid "Disabled"
+msgstr "Disabilitato"
+
+msgid "Static IP Options"
+msgstr "Opzioni IP statiche"
+
+msgid "Apply settings"
+msgstr "Applica le impostazioni"
+
+msgid "Information provided by /sys/class/net"
+msgstr "Informazioni fornite da /sys/class/net"
+
+#: includes/system.php
+msgid "Hostname"
+msgstr "Nome host"
+
+msgid "Pi Revision"
+msgstr "Revisione Pi"
+
+msgid "Uptime"
+msgstr "Tempo di attività"
+
+msgid "Memory Used"
+msgstr "Memoria usata"
+
+msgid "CPU Load"
+msgstr "Carico CPU"
+
+msgid "Reboot"
+msgstr "Riavvia"
+
+msgid "Shutdown"
+msgstr "Spegni"
+
+msgid "System Rebooting Now!"
+msgstr "Il sistema si sta riavviando!"
+
+msgid "System Shutting Down Now!"
+msgstr "Il sistema si sta spegnendo!"
+
+#: includes/themes.php
+msgid "Theme settings"
+msgstr "Impostazioni tema"
+
+msgid "Select a theme"
+msgstr "Seleziona un tema"
+
+#: common form controls
+msgid "Save settings"
+msgstr "Salva le impostazioni"
+
+msgid "Refresh"
+msgstr "Ricarica"
+
diff --git a/raspap.php b/raspap.php
old mode 100644
new mode 100755