Merge pull request #1061 from fabianfrz/translation

translation

src/www/interfaces_lagg_edit.php

@@ -210,41 +210,41 @@ legacy_html_escape_form_data($pconfig);
                       <div class="hidden" for="help_for_proto">
                         <ul>
                           <li><b><?=gettext("failover"); ?></b></li>
-                                <?=gettext("Sends and receives traffic only through the master port.  If " .
-                                   "the master port becomes unavailable, the next active port is " .
-                                   "used.  The first interface added is the master port; any " .
+                                <?=gettext("Sends and receives traffic only through the master port. " .
+                                   "If the master port becomes unavailable, the next active port is " .
+                                   "used. The first interface added is the master port; any " .
                                    "interfaces added after that are used as failover devices."); ?>
                           <li><b><?=gettext("fec"); ?></b><br /></li>
-                                <?=gettext("Supports Cisco EtherChannel.  This is a static setup and " .
+                                <?=gettext("Supports Cisco EtherChannel. This is a static setup and " .
                                    "does not negotiate aggregation with the peer or exchange " .
                                    "frames to monitor the link."); ?>
                           <li>
                             <b><?=gettext("lacp"); ?></b></li>
                                 <?=gettext("Supports the IEEE 802.3ad Link Aggregation Control Protocol " .
-                                   "(LACP) and the Marker Protocol.  LACP will negotiate a set " .
+                                   "(LACP) and the Marker Protocol. LACP will negotiate a set " .
                                    "of aggregable links with the peer in to one or more Link " .
-                                   "Aggregated Groups.  Each LAG is composed of ports of the " .
-                                   "same speed, set to full-duplex operation.  The traffic will " .
+                                   "Aggregated Groups. Each LAG is composed of ports of the " .
+                                   "same speed, set to full-duplex operation. The traffic will " .
                                    "be balanced across the ports in the LAG with the greatest " .
                                    "total speed, in most cases there will only be one LAG which " .
-                                   "contains all ports.  In the event of changes in physical " .
+                                   "contains all ports. In the event of changes in physical " .
                                    "connectivity, Link Aggregation will quickly converge to a " .
                                    "new configuration."); ?>
                           <li><b><?=gettext("loadbalance"); ?></b></li>
                                 <?=gettext("Balances outgoing traffic across the active ports based on " .
                                    "hashed protocol header information and accepts incoming " .
-                                   "traffic from any active port.  This is a static setup and " .
+                                   "traffic from any active port. This is a static setup and " .
                                    "does not negotiate aggregation with the peer or exchange " .
-                                   "frames to monitor the link.  The hash includes the Ethernet " .
+                                   "frames to monitor the link. The hash includes the Ethernet " .
                                    "source and destination address, and, if available, the VLAN " .
-                                   "tag, and the IP source and destination address") ?>.
+                                   "tag, and the IP source and destination address.") ?>
                           <li><b><?=gettext("roundrobin"); ?></b></li>
                                 <?=gettext("Distributes outgoing traffic using a round-robin scheduler " .
                                    "through all active ports and accepts incoming traffic from " .
-                                   "any active port"); ?>.
+                                   "any active port."); ?>
                           <li><b><?=gettext("none"); ?></b></li>
-                                <?=gettext("This protocol is intended to do nothing: it disables any " .
-                                   "traffic without disabling the lagg interface itself"); ?>.
+                                <?=gettext("This protocol is intended to do nothing: It disables any " .
+                                   "traffic without disabling the lagg interface itself."); ?>
 
                         </ul>
                       </div>
@@ -255,8 +255,7 @@ legacy_html_escape_form_data($pconfig);
                     <td>
                       <input name="descr" type="text" value="<?=$pconfig['descr'];?>" />
                       <div class="hidden" for="help_for_descr">
-                        <?=gettext("You may enter a description here " .
-                        "for your reference (not parsed)."); ?>
+                        <?=gettext("You may enter a description here for your reference (not parsed)."); ?>
                       </div>
                     </td>
                   </tr>

src/www/services_dhcpv6.php

@@ -547,8 +547,8 @@ include("head.inc");
                           </tbody>
                         </table>
                         <div class="hidden" for="help_for_prefixrange">
-                          <?= gettext("You can define a Prefix range here for DHCP Prefix Delegation. This allows for
-                            assigning networks to subrouters. The start and end of the range must end on boundaries of the prefix delegation size."); ?>
+                          <?= gettext("You can define a Prefix range here for DHCP Prefix Delegation. This allows for assigning networks to subrouters. " .
+                          "The start and end of the range must end on boundaries of the prefix delegation size."); ?>
                         </div>
                       </td>
                     </tr>
@@ -558,7 +558,7 @@ include("head.inc");
                         <input name="dns1" type="text" id="dns1" value="<?=$pconfig['dns1'];?>" /><br />
                         <input name="dns2" type="text" id="dns2" value="<?=$pconfig['dns2'];?>" />
                         <div class="hidden" for="help_for_dns">
-                          <?=gettext("NOTE: leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
+                          <?=gettext("Leave blank to use the system default DNS servers - this interface's IP if DNS forwarder is enabled, otherwise the servers configured on the General page.");?>
                         </div>
                       </td>
                     </tr>
@@ -585,7 +585,7 @@ include("head.inc");
                       <td>
                         <input name="defaultleasetime" type="text" value="<?=$pconfig['defaultleasetime'];?>" />
                         <div class="hidden" for="help_for_defaultleasetime">
-                          <?=gettext("This is used for clients that do not ask for a specific " ."expiration time."); ?><br />
+                          <?=gettext("This is used for clients that do not ask for a specific expiration time."); ?><br />
                           <?=gettext("The default is 7200 seconds.");?>
                         </div>
                       </td>
@@ -595,7 +595,7 @@ include("head.inc");
                       <td>
                         <input name="maxleasetime" type="text" id="maxleasetime" size="10" value="<?=$pconfig['maxleasetime'];?>" />
                         <div class="hidden" for="help_for_maxleasetime">
-                          <?=gettext("This is the maximum lease time for clients that ask"." for a specific expiration time."); ?><br />
+                          <?=gettext("This is the maximum lease time for clients that ask for a specific expiration time."); ?><br />
                           <?=gettext("The default is 86400 seconds.");?>
                         </div>
                       </td>
@@ -608,7 +608,7 @@ include("head.inc");
                           <?=gettext("Change DHCPv6 display lease time from UTC to local time."); ?>
                         </strong>
                         <div class="hidden" for="help_for_dhcpv6leaseinlocaltime">
-                          <strong><?=gettext("Note:");?></strong> <?=gettext("By default DHCPv6 leases are displayed in UTC time.  By checking this box DHCPv6 lease time will be displayed in local time and set to time zone selected.  This will be used for all DHCPv6 interfaces lease time."); ?>
+                          <?=gettext("By default DHCPv6 leases are displayed in UTC time. By checking this box DHCPv6 lease time will be displayed in local time and set to time zone selected. This will be used for all DHCPv6 interfaces lease time."); ?>
                         </div>
                       </td>
                     </tr>
@@ -653,7 +653,7 @@ include("head.inc");
                         </div>
                         <div id="showldap" style="display:none">
                           <input name="ldap" type="text" value="<?=$pconfig['ldap'];?>" />
-                          <?=gettext("Leave blank to disable.  Enter a full URI for the LDAP server in the form ldap://ldap.example.com/dc=example,dc=com");?>
+                          <?=gettext("Leave blank to disable. Enter a full URI for the LDAP server in the form ldap://ldap.example.com/dc=example,dc=com");?>
                         </div>
                       </td>
                     </tr>
@@ -664,7 +664,7 @@ include("head.inc");
                           <input type="button" onclick="show_netboot_config()" value="<?=gettext("Advanced");?>" class="btn btn-xs btn-default"/> - <?=gettext("Show Network booting");?>
                         </div>
                         <div id="shownetboot" style="display:none">
-                          <input style="vertical-align:middle" type="checkbox" value="yes" name="netboot" id="netboot" <?=!empty($pconfig['netboot']) ? " checked=\"checked\"" : ""; ?> />
+                          <input style="vertical-align:middle" type="checkbox" value="yes" name="netboot" id="netboot" <?=!empty($pconfig['netboot']) ? 'checked="checked"' : ""; ?> />
                           <b><?=gettext("Enables network booting.");?></b>
                           <br/>
                           <?=gettext("Enter the Bootfile URL");?>
@@ -752,7 +752,7 @@ include("head.inc");
                             </tfoot>
                           </table>
                           <div class="hidden" for="help_for_numberoptions">
-                          <?=gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information.  For a list of available options please visit this"); ?> <a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank"><?=gettext("URL"); ?></a>
+                          <?= sprintf(gettext("Enter the DHCP option number and the value for each item you would like to include in the DHCP lease information. For a list of available options please visit this %sURL%s"),'<a href="http://www.iana.org/assignments/bootp-dhcp-parameters/" target="_blank">','</a>') ?>
                           </div>
                         </div>
                       </td>

src/www/services_upnp.php

@@ -174,7 +174,7 @@ include("head.inc");
                   <thead>
                     <tr>
                       <td width="22%">
-                        <strong><?=gettext("UPnP &amp; NAT-PMP Settings");?></strong>
+                        <strong><?=gettext("UPnP and NAT-PMP Settings");?></strong>
                       </td>
                       <td width="78%" align="right">
                         <small><?=gettext("full help"); ?> </small>
@@ -283,7 +283,7 @@ include("head.inc");
                       <td>
                        <input name="sysuptime" type="checkbox" value="yes" <?=!empty($pconfig['sysuptime']) ? "checked=\"checked\"" : ""; ?> />
                        <div class="hidden" for="help_for_sysuptime">
-                         <?=gettext("Use system uptime instead of UPnP &amp; NAT-PMP service uptime?");?>
+                         <?=gettext("Use system uptime instead of UPnP and NAT-PMP service uptime?");?>
                        </div>
                       </td>
                     </tr>
@@ -292,7 +292,7 @@ include("head.inc");
                       <td>
                        <input name="permdefault" type="checkbox" value="yes" <?=!empty($pconfig['permdefault']) ? "checked=\"checked\"" : ""; ?> />
                        <div class="hidden" for="help_for_permdefault">
-                         <?=gettext("By default deny access to UPnP &amp; NAT-PMP?");?>
+                         <?=gettext("By default deny access to UPnP and NAT-PMP?");?>
                        </div>
                       </td>
                     </tr>