diff --git a/app/admin/firewall-zones/settings.php b/app/admin/firewall-zones/settings.php index 4d6e26de9ddc8c579156af7d5756422b92296fde..860d7d63935ca0af907c14a34961c38f0c79741a 100644 --- a/app/admin/firewall-zones/settings.php +++ b/app/admin/firewall-zones/settings.php @@ -124,7 +124,7 @@ $(function() { <input type="text" class="form-control input-sm" name="zoneLength" value="<?php print $firewallZoneSettings['zoneLength']; ?>"> </td> <td> - <span class="text-muted"><?php print _("Choose a maximum lenght of the zone name.<br>The default: 3, maximum: 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )"); ?></span> + <span class="text-muted"><?php print _("Choose a maximum length of the zone name.<br>The default: 3, maximum: 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )"); ?></span> </td> </tr> diff --git a/app/install/postinstall_submit.php b/app/install/postinstall_submit.php index 92a4f93be0153f8a099a383e17ba2073ccbec80d..07e61ff3431597b46f31879ae202fdd80c0b2634 100755 --- a/app/install/postinstall_submit.php +++ b/app/install/postinstall_submit.php @@ -21,7 +21,7 @@ if($admin->password!='$6$rounds=3000$JQEE6dL9NpvjeFs4$RK5X3oa28.Uzt/h5VAfdrsvlVe } # update else { - # check lenghts + # check lengths if(strlen($_POST['password1'])<8) { $Result->show("danger", _("Password must be at least 8 characters long!"), true); } if(strlen($_POST['password2'])<8) { $Result->show("danger", _("Password must be at least 8 characters long!"), true); } diff --git a/functions/PEAR/Spreadsheet/Excel/Writer/Workbook.php b/functions/PEAR/Spreadsheet/Excel/Writer/Workbook.php index b1a09cd953d7be567197942846a15686a594848f..4b3cbf500b6511f6660fe28c709746fa5669200d 100755 --- a/functions/PEAR/Spreadsheet/Excel/Writer/Workbook.php +++ b/functions/PEAR/Spreadsheet/Excel/Writer/Workbook.php @@ -624,7 +624,7 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri if ($this->_country_code != -1) { $offset += 8; // adding COUNTRY record } - // add the lenght of SUPBOOK, EXTERNSHEET and NAME records + // add the length of SUPBOOK, EXTERNSHEET and NAME records //$offset += 8; // FIXME: calculate real value when storing the records } $total_worksheets = count($this->_worksheets); diff --git a/functions/classes/class.FirewallZones.php b/functions/classes/class.FirewallZones.php index 275ac31055b46c4fe65434b0f91a5c5b6dbffafb..fc44b50719a5f1d64c9e4f52efdc0a0bfde71509 100644 --- a/functions/classes/class.FirewallZones.php +++ b/functions/classes/class.FirewallZones.php @@ -275,7 +275,7 @@ class FirewallZones extends Common_functions { # add some padding if it is activated and the zone generatore is not text if($mappings[$key]->padding == 1 && $mappings[$key]->generator != 2){ # remove leading zeros (padding) and raise the value in case of any zone name length changes - # add some padding to reach the maximum zone name lenght + # add some padding to reach the maximum zone name length $mappings[$key]->zone = str_pad(ltrim($mappings[$key]->zone,0),$mappings[$key]->length,"0",STR_PAD_LEFT); } # inject network informations @@ -349,7 +349,7 @@ class FirewallZones extends Common_functions { # add some padding if it is activated and the zone generatore is not text if($mapping[$key]->padding == 1 && $mapping[$key]->generator != 2){ # remove leading zeros (padding) and raise the value in case of any zone name length changes - # add some padding to reach the maximum zone name lenght + # add some padding to reach the maximum zone name length $mapping[$key]->zone = str_pad(ltrim($mapping[$key]->zone,0),$mapping[$key]->length,"0",STR_PAD_LEFT); } # inject network informations @@ -427,7 +427,7 @@ class FirewallZones extends Common_functions { # add some padding if it is activated and the zone generatore is not text if($info[$key]->padding == 1 && $info[$key]->generator != 2){ # remove leading zeros (padding) and raise the value in case of any zone name length changes - # add some padding to reach the maximum zone name lenght + # add some padding to reach the maximum zone name length $info[$key]->zone = str_pad(ltrim($info[$key]->zone,0),$info[$key]->length,"0",STR_PAD_LEFT); } } @@ -478,7 +478,7 @@ class FirewallZones extends Common_functions { # add some padding if it is activated and the zone generatore is not text if($zones[$key]->padding == 1 && $zones[$key]->generator != 2){ # remove leading zeros (padding) and raise the value in case of any zone name length changes - # add some padding to reach the maximum zone name lenght + # add some padding to reach the maximum zone name length $zones[$key]->zone = str_pad(ltrim($zones[$key]->zone,0),$zones[$key]->length,"0",STR_PAD_LEFT); } # inject network informations @@ -538,7 +538,7 @@ class FirewallZones extends Common_functions { # add some padding if it is activated and the zone generatore is not text if($zone[$key]->padding == 1 && $zone[$key]->generator != 2){ # remove leading zeros (padding) and raise the value in case of any zone name length changes - # add some padding to reach the maximum zone name lenght + # add some padding to reach the maximum zone name length $zone[$key]->zone = str_pad(ltrim($zone[$key]->zone,0),$zone[$key]->length,"0",STR_PAD_LEFT); } # inject network informations diff --git a/functions/locale/de_DE.UTF-8/LC_MESSAGES/phpipam.mo b/functions/locale/de_DE.UTF-8/LC_MESSAGES/phpipam.mo index 300c391901087a1cfb3c85075584c17bba9ef693..8dca767e38f26542483a6df9755392ec2b2e0d75 100644 Binary files a/functions/locale/de_DE.UTF-8/LC_MESSAGES/phpipam.mo and b/functions/locale/de_DE.UTF-8/LC_MESSAGES/phpipam.mo differ diff --git a/functions/locale/de_DE.UTF-8/LC_MESSAGES/phpipam.po b/functions/locale/de_DE.UTF-8/LC_MESSAGES/phpipam.po index 2d4648b6f0929257a37423ddd90da3b6b1c1d7a7..7e3fa9ee2d95873eca0258cdd63e19839c8a0475 100644 --- a/functions/locale/de_DE.UTF-8/LC_MESSAGES/phpipam.po +++ b/functions/locale/de_DE.UTF-8/LC_MESSAGES/phpipam.po @@ -3817,7 +3817,7 @@ msgstr "Maximale Länge Zonennamen" #: app/admin/firewall-zones/settings.php:127 msgid "" -"Choose a maximum lenght of the zone name.<br>The default: 3, maximum: 31 " +"Choose a maximum length of the zone name.<br>The default: 3, maximum: 31 " "characters.<br>(keep in mind that your firewall may have a limit for the " "length of zone names or address objects )" msgstr "" diff --git a/functions/locale/en_GB.UTF-8/LC_MESSAGES/phpipam.po b/functions/locale/en_GB.UTF-8/LC_MESSAGES/phpipam.po index c7b736190ed8221def84692f60f34fccf7610061..e6dba6dc83f47cf19d571bf516263b549c9a77e0 100644 --- a/functions/locale/en_GB.UTF-8/LC_MESSAGES/phpipam.po +++ b/functions/locale/en_GB.UTF-8/LC_MESSAGES/phpipam.po @@ -6267,7 +6267,7 @@ msgstr "" msgid "Maximum zone name length" msgstr "" -msgid "Choose a maximum lenght of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" +msgid "Choose a maximum length of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" msgstr "" msgid "IPv4 address type alias" @@ -7698,9 +7698,6 @@ msgstr "" msgid "General" msgstr "" -msgid "Availability" -msgstr "" - msgid "Rack details" msgstr "" @@ -8305,4 +8302,4 @@ msgid "Attributes not found" msgstr "" msgid "phpIPAM settings" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/functions/locale/en_US.UTF-8/LC_MESSAGES/phpipam.mo b/functions/locale/en_US.UTF-8/LC_MESSAGES/phpipam.mo index 3d88dd6c006be3421caba1f301e2c7c5308631b7..7b6752df63d589fa65300813212e1ba7d73fc6d1 100644 Binary files a/functions/locale/en_US.UTF-8/LC_MESSAGES/phpipam.mo and b/functions/locale/en_US.UTF-8/LC_MESSAGES/phpipam.mo differ diff --git a/functions/locale/en_US.UTF-8/LC_MESSAGES/phpipam.po b/functions/locale/en_US.UTF-8/LC_MESSAGES/phpipam.po index f2e314225b58a13bfc3a3ac0fca59e342d37eefe..a68c4d6e0b7efc50bfecba0e2f336a2f6054d7a1 100644 --- a/functions/locale/en_US.UTF-8/LC_MESSAGES/phpipam.po +++ b/functions/locale/en_US.UTF-8/LC_MESSAGES/phpipam.po @@ -4353,27 +4353,27 @@ msgstr "" #: functions/functions-common.php msgid "Favourite subnets" -msgstr "" +msgstr "Favorite subnets" msgid "No favourite subnets selected" -msgstr "" +msgstr "No favorite subnets selected" msgid "You can add subnets to favourites by clicking star icon in subnet details" -msgstr "" +msgstr "You can add subnets to favorites by clicking star icon in subnet details" msgid "Click to remove from favourites" -msgstr "" +msgstr "Click to remove from favorites" msgid "Click to add to favourites" -msgstr "" +msgstr "Click to add to favorites" #: site/tools/favouriteEdit.php msgid "Error editing favourite" -msgstr "" +msgstr "Error editing favorite" #: site/sections.php msgid "Favourite networks" -msgstr "" +msgstr "Favorite networks" #: site/ipaddr/ipDetailsChangelog.php msgid "Changelog" @@ -6267,7 +6267,7 @@ msgstr "" msgid "Maximum zone name length" msgstr "" -msgid "Choose a maximum lenght of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" +msgid "Choose a maximum length of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" msgstr "" msgid "IPv4 address type alias" @@ -7698,9 +7698,6 @@ msgstr "" msgid "General" msgstr "" -msgid "Availability" -msgstr "" - msgid "Rack details" msgstr "" diff --git a/functions/locale/fr_FR.UTF-8/LC_MESSAGES/phpipam.mo b/functions/locale/fr_FR.UTF-8/LC_MESSAGES/phpipam.mo index 6aab13ff1dcd0314b50f1e4d09d2ea3483a40ddf..cbc5bc92fa519d345f080753502a756a30142fb4 100644 Binary files a/functions/locale/fr_FR.UTF-8/LC_MESSAGES/phpipam.mo and b/functions/locale/fr_FR.UTF-8/LC_MESSAGES/phpipam.mo differ diff --git a/functions/locale/fr_FR.UTF-8/LC_MESSAGES/phpipam.po b/functions/locale/fr_FR.UTF-8/LC_MESSAGES/phpipam.po index 895ad5751803b2ea2f02d8e2aac6a29dd937a41f..0c61d22ffa0dc215294b1dfa4bb55a829fcd3aec 100644 --- a/functions/locale/fr_FR.UTF-8/LC_MESSAGES/phpipam.po +++ b/functions/locale/fr_FR.UTF-8/LC_MESSAGES/phpipam.po @@ -6130,7 +6130,7 @@ msgid "Maximum zone name length" msgstr "Longeur maximum de nom de zone" msgid "" -"Choose a maximum lenght of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep " +"Choose a maximum length of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep " "in mind that your firewall may have a limit for the length of zone names or address objects )" msgstr "" "Choisissez une longueur maximale pour les noms de zone. <br> la longueur par défaut est 3, le maximum est de " diff --git a/functions/locale/it_IT.UTF-8/LC_MESSAGES/phpipam.mo b/functions/locale/it_IT.UTF-8/LC_MESSAGES/phpipam.mo index 665c007c0155b9f4e2cf76ac42f98992dc90529d..f38bb2511fa00e23ba01dda196058605ac6223ef 100644 Binary files a/functions/locale/it_IT.UTF-8/LC_MESSAGES/phpipam.mo and b/functions/locale/it_IT.UTF-8/LC_MESSAGES/phpipam.mo differ diff --git a/functions/locale/it_IT.UTF-8/LC_MESSAGES/phpipam.po b/functions/locale/it_IT.UTF-8/LC_MESSAGES/phpipam.po index 7e9484bb0ab262de2c80853140923b1ce525d4f9..d7ba051c9c4bd786779ad18cfd6f2864c7a1fa7d 100644 --- a/functions/locale/it_IT.UTF-8/LC_MESSAGES/phpipam.po +++ b/functions/locale/it_IT.UTF-8/LC_MESSAGES/phpipam.po @@ -5992,7 +5992,7 @@ msgstr "Tipo dispositivo non valido." msgid "Maximum zone name length" msgstr "Lunghezza massima nome zona" -msgid "Choose a maximum lenght of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" +msgid "Choose a maximum length of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" msgstr "" "Scegli una lunghezza massima per il nome della zona.<br>La lunghezza predefinita è 3, il massimo è 32 caratteri.<br>(considerare che il firewall potrebbe avere dei limiti per la lunghezza dei nomi zona o " "degli address objects)" diff --git a/functions/locale/ja_JP.UTF-8/LC_MESSAGES/phpipam.mo b/functions/locale/ja_JP.UTF-8/LC_MESSAGES/phpipam.mo index 581ea9e58495f82e4b91728602867102f084ec54..0dace208a67181aecdadd6449951873f2bc6f6b1 100644 Binary files a/functions/locale/ja_JP.UTF-8/LC_MESSAGES/phpipam.mo and b/functions/locale/ja_JP.UTF-8/LC_MESSAGES/phpipam.mo differ diff --git a/functions/locale/ja_JP.UTF-8/LC_MESSAGES/phpipam.po b/functions/locale/ja_JP.UTF-8/LC_MESSAGES/phpipam.po index 7d025c16bb8b63111dad44884cf63c5e7d958d43..854157c6a8e37d54b660045c532476f790144c54 100644 --- a/functions/locale/ja_JP.UTF-8/LC_MESSAGES/phpipam.po +++ b/functions/locale/ja_JP.UTF-8/LC_MESSAGES/phpipam.po @@ -5296,7 +5296,7 @@ msgid "Maximum zone name length" msgstr "最大ゾーン名の長さ" #: /var/www/phpipam/app/admin/firewall-zones/settings.php:127 -msgid "Choose a maximum lenght of the zone name.<br>The default: 3, maximum: 31 " +msgid "Choose a maximum length of the zone name.<br>The default: 3, maximum: 31 " "characters.<br>(keep in mind that your firewall may have a limit for the " "length of zone names or address objects )" msgstr "ゾーン名の最大長を選択します<br>デフォルトの長さは3文字、最大値は31文字です" diff --git a/functions/locale/nl_NL.UTF-8/LC_MESSAGES/phpipam.mo b/functions/locale/nl_NL.UTF-8/LC_MESSAGES/phpipam.mo index df6c312dfb4474cbc56ba39c726fa6b2ef8cbcaf..d34ac71489044a8c423f5278d3243b2930e722dc 100644 Binary files a/functions/locale/nl_NL.UTF-8/LC_MESSAGES/phpipam.mo and b/functions/locale/nl_NL.UTF-8/LC_MESSAGES/phpipam.mo differ diff --git a/functions/locale/nl_NL.UTF-8/LC_MESSAGES/phpipam.po b/functions/locale/nl_NL.UTF-8/LC_MESSAGES/phpipam.po index 0838cd4b962adedcabf131bcb99aa5761869b19c..1e4b2f42be6f1a6c4c51b22d04fcfb3f59f0e1db 100644 --- a/functions/locale/nl_NL.UTF-8/LC_MESSAGES/phpipam.po +++ b/functions/locale/nl_NL.UTF-8/LC_MESSAGES/phpipam.po @@ -6597,7 +6597,7 @@ msgid "Maximum zone name length" msgstr "Maximale lengte van de zonenaam" msgid "" -"Choose a maximum lenght of the zone name.<br>The default length is 3, the " +"Choose a maximum length of the zone name.<br>The default length is 3, the " "maximum is 31 characters.<br>(keep in mind that your firewall may have a " "limit for the length of zone names or address objects )" msgstr "" diff --git a/functions/locale/ru_RU.UTF-8/LC_MESSAGES/phpipam.mo b/functions/locale/ru_RU.UTF-8/LC_MESSAGES/phpipam.mo index a3e3c2fc81a1f502509858f2efbe2e5a32b7f00f..edeb223241990f37c8d705c8ed40c2a6417ed39c 100644 Binary files a/functions/locale/ru_RU.UTF-8/LC_MESSAGES/phpipam.mo and b/functions/locale/ru_RU.UTF-8/LC_MESSAGES/phpipam.mo differ diff --git a/functions/locale/ru_RU.UTF-8/LC_MESSAGES/phpipam.po b/functions/locale/ru_RU.UTF-8/LC_MESSAGES/phpipam.po index 44da26ce0a8e8adfa187857a6a633fc911a87760..75dacdb75dd95292d688ad482641d597395fa57e 100644 --- a/functions/locale/ru_RU.UTF-8/LC_MESSAGES/phpipam.po +++ b/functions/locale/ru_RU.UTF-8/LC_MESSAGES/phpipam.po @@ -11026,7 +11026,7 @@ msgid "Maximum zone name length" msgstr "Максимальная длина имени зоны" #: app/admin/firewall-zones/settings.php:127 -msgid "Choose a maximum lenght of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" +msgid "Choose a maximum length of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" msgstr "Выберите максимальную длину имени зоны.<br>Дефолтная длина 3, максимальная - 31 символ.<br>(учтите, что ваш фаервол может иметь лимит длины имени зоны или объекта адреса )" #: app/admin/firewall-zones/settings.php:206 @@ -12299,7 +12299,7 @@ msgstr "Неверное название подсети. Не манипули msgid "Zone settings" msgstr "Установки Зоны" -msgid "Choose a maximum lenght of the zone name.<br>The default: 3, maximum: 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" +msgid "Choose a maximum length of the zone name.<br>The default: 3, maximum: 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" msgstr "Выберите максимальную длину имени зоны.<br>По-умолчанию:3, максимум:31 символ. <br>(учтите, что ваш фаервол может иметь ограничение на длину имени зоны или объектов адреса)" msgid "Generate zone names automaticaly with the setting "decimal" or "hex".<br>The maximum value for a zone in hex mode would be ffffffff (4294967295 zones).<br>To use your own unique zone names you can choose the option "text"." diff --git a/functions/locale/zh_CN.UTF-8/LC_MESSAGES/phpipam.mo b/functions/locale/zh_CN.UTF-8/LC_MESSAGES/phpipam.mo index fb76c1b3dd59b9d25e876fe79e26625d8a6bfc02..ceac86d8f9346a99776dbe2c93779e12d0aba3d5 100644 Binary files a/functions/locale/zh_CN.UTF-8/LC_MESSAGES/phpipam.mo and b/functions/locale/zh_CN.UTF-8/LC_MESSAGES/phpipam.mo differ diff --git a/functions/locale/zh_CN.UTF-8/LC_MESSAGES/phpipam.po b/functions/locale/zh_CN.UTF-8/LC_MESSAGES/phpipam.po index a55cb5bf26a42e77c778d9b70fff98098138c6f3..85100d452a660b0fc8d8697a2cf4b3d80d98da0a 100644 --- a/functions/locale/zh_CN.UTF-8/LC_MESSAGES/phpipam.po +++ b/functions/locale/zh_CN.UTF-8/LC_MESSAGES/phpipam.po @@ -4876,7 +4876,7 @@ msgstr "无效的设备类型" msgid "Maximum zone name length" msgstr "最大区域名称长度" -msgid "Choose a maximum lenght of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" +msgid "Choose a maximum length of the zone name.<br>The default length is 3, the maximum is 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" msgstr "选择区域名称的最大长度。<br>默认长度为3,最多为31个字符。<br>(请注意,防火墙可能对区域名称或地址对象的长度有限制)" msgid "IPv4 address type alias" @@ -5521,7 +5521,7 @@ msgstr "子网名称无效。 不要操纵POST值!" msgid "Zone settings" msgstr "区域设置" -msgid "Choose a maximum lenght of the zone name.<br>The default: 3, maximum: 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" +msgid "Choose a maximum length of the zone name.<br>The default: 3, maximum: 31 characters.<br>(keep in mind that your firewall may have a limit for the length of zone names or address objects )" msgstr "选择区域名称的最大长度。<br>默认值:3,最大值:31个字符。<br>(请记住,防火墙可能对区域名称或地址对象的长度有限制)" msgid "Generate zone names automaticaly with the setting "decimal" or "hex".<br>The maximum value for a zone in hex mode would be ffffffff (4294967295 zones).<br>To use your own unique zone names you can choose the option "text"." diff --git a/functions/locale/zh_TW.UTF-8/LC_MESSAGES/phpipam.mo b/functions/locale/zh_TW.UTF-8/LC_MESSAGES/phpipam.mo index a233432200e47f3248ae2eca352c710a9e117940..5ba628e3f8cc8015c9ba2577609bd29d288917d8 100644 Binary files a/functions/locale/zh_TW.UTF-8/LC_MESSAGES/phpipam.mo and b/functions/locale/zh_TW.UTF-8/LC_MESSAGES/phpipam.mo differ diff --git a/functions/locale/zh_TW.UTF-8/LC_MESSAGES/phpipam.po b/functions/locale/zh_TW.UTF-8/LC_MESSAGES/phpipam.po index 5cc4c48214b5d40812d0190ba07ed5b029650f37..c3906bca25a018beceb7de5229108a79c1cca9d1 100644 --- a/functions/locale/zh_TW.UTF-8/LC_MESSAGES/phpipam.po +++ b/functions/locale/zh_TW.UTF-8/LC_MESSAGES/phpipam.po @@ -6376,7 +6376,7 @@ msgid "Maximum zone name length" msgstr "區域名稱最大長度" msgid "" -"Choose a maximum lenght of the zone name.<br>The default length is 3, the " +"Choose a maximum length of the zone name.<br>The default length is 3, the " "maximum is 31 characters.<br>(keep in mind that your firewall may have a " "limit for the length of zone names or address objects )" msgstr "" @@ -7058,7 +7058,7 @@ msgid "Zone settings" msgstr "區域設定" msgid "" -"Choose a maximum lenght of the zone name.<br>The default: 3, maximum: 31 " +"Choose a maximum length of the zone name.<br>The default: 3, maximum: 31 " "characters.<br>(keep in mind that your firewall may have a limit for the " "length of zone names or address objects )" msgstr "" @@ -9902,4 +9902,4 @@ msgid "First IP Address available" msgstr "第一個可用的 IP 位址" msgid "Select server" -msgstr "選擇伺服器" \ No newline at end of file +msgstr "選擇伺服器"