diff options
58 files changed, 143 insertions, 137 deletions
diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua index 0a0a2d512e..72685b0110 100644 --- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua +++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-app.lua @@ -15,7 +15,7 @@ app_authenticate:value("no", "Do Not Load") app_authenticate:value("auto", "Load as Required") app_authenticate.rmempty = true -app_cdr = module:option(ListValue, "app_cdr", "Make sure asterisk doesnt save CDR", "") +app_cdr = module:option(ListValue, "app_cdr", "Make sure asterisk doesn't save CDR", "") app_cdr:value("yes", "Load") app_cdr:value("no", "Do Not Load") app_cdr:value("auto", "Load as Required") @@ -117,7 +117,7 @@ app_externalivr:value("no", "Do Not Load") app_externalivr:value("auto", "Load as Required") app_externalivr.rmempty = true -app_forkcdr = module:option(ListValue, "app_forkcdr", "Fork The CDR into 2 seperate entities", "") +app_forkcdr = module:option(ListValue, "app_forkcdr", "Fork The CDR into 2 separate entities", "") app_forkcdr:value("yes", "Load") app_forkcdr:value("no", "Do Not Load") app_forkcdr:value("auto", "Load as Required") diff --git a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua index 783aab2b74..7c818760d1 100644 --- a/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua +++ b/applications/luci-app-asterisk/luasrc/model/cbi/asterisk-mod-res-feature.lua @@ -84,7 +84,7 @@ pickupexten = featurepark:option(Value, "pickupexten", "Pickup extension", "") pickupexten.rmempty = true pickupexten:depends({ parkenabled = "1" }) -transferdigittimeout = featurepark:option(Value, "transferdigittimeout", "Seconds to wait bewteen digits when transferring", "") +transferdigittimeout = featurepark:option(Value, "transferdigittimeout", "Seconds to wait between digits when transferring", "") transferdigittimeout.rmempty = true transferdigittimeout:depends({ parkenabled = "1" }) diff --git a/applications/luci-app-asterisk/po/ca/asterisk.po b/applications/luci-app-asterisk/po/ca/asterisk.po index 9775758e42..aa534432e1 100644 --- a/applications/luci-app-asterisk/po/ca/asterisk.po +++ b/applications/luci-app-asterisk/po/ca/asterisk.po @@ -187,7 +187,7 @@ msgstr "" #~ msgid "Pickup extension" #~ msgstr "Connector de recol·lecció" -#~ msgid "Seconds to wait bewteen digits when transferring" +#~ msgid "Seconds to wait between digits when transferring" #~ msgstr "Segons a esperar entre dígits quan es transfereix" #~ msgid "sound when attended transfer is complete" @@ -247,7 +247,7 @@ msgstr "" #~ msgid "Authentication Application" #~ msgstr "Aplicació d'autenticació" -#~ msgid "Make sure asterisk doesnt save CDR" +#~ msgid "Make sure asterisk doesn't save CDR" #~ msgstr "Assegura't que asterisk no desa CDR" #~ msgid "Check if channel is available" @@ -298,7 +298,7 @@ msgstr "" #~ msgid "External IVR application interface" #~ msgstr "Interfície d'aplicació IVR externa" -#~ msgid "Fork The CDR into 2 seperate entities" +#~ msgid "Fork The CDR into 2 separate entities" #~ msgstr "Bifurca el CDR en 2 entitats separades" #~ msgid "Get ADSI CPE ID" diff --git a/applications/luci-app-asterisk/po/en/asterisk.po b/applications/luci-app-asterisk/po/en/asterisk.po index e462f56b86..fc095087e2 100644 --- a/applications/luci-app-asterisk/po/en/asterisk.po +++ b/applications/luci-app-asterisk/po/en/asterisk.po @@ -187,8 +187,8 @@ msgstr "" #~ msgid "Pickup extension" #~ msgstr "Pickup extension" -#~ msgid "Seconds to wait bewteen digits when transferring" -#~ msgstr "Seconds to wait bewteen digits when transferring" +#~ msgid "Seconds to wait between digits when transferring" +#~ msgstr "Seconds to wait between digits when transferring" #~ msgid "sound when attended transfer is complete" #~ msgstr "sound when attended transfer is complete" @@ -247,8 +247,8 @@ msgstr "" #~ msgid "Authentication Application" #~ msgstr "Authentication Application" -#~ msgid "Make sure asterisk doesnt save CDR" -#~ msgstr "Make sure asterisk doesnt save CDR" +#~ msgid "Make sure asterisk doesn't save CDR" +#~ msgstr "Make sure asterisk doesn't save CDR" #~ msgid "Check if channel is available" #~ msgstr "Check if channel is available" @@ -298,8 +298,8 @@ msgstr "" #~ msgid "External IVR application interface" #~ msgstr "External IVR application interface" -#~ msgid "Fork The CDR into 2 seperate entities" -#~ msgstr "Fork The CDR into 2 seperate entities" +#~ msgid "Fork The CDR into 2 separate entities" +#~ msgstr "Fork The CDR into 2 separate entities" #~ msgid "Get ADSI CPE ID" #~ msgstr "Get ADSI CPE ID" diff --git a/applications/luci-app-asterisk/po/es/asterisk.po b/applications/luci-app-asterisk/po/es/asterisk.po index 8e2fe1e307..f42ddb4fd5 100644 --- a/applications/luci-app-asterisk/po/es/asterisk.po +++ b/applications/luci-app-asterisk/po/es/asterisk.po @@ -188,7 +188,7 @@ msgstr "" #~ msgid "Pickup extension" #~ msgstr "Extensión de Pickup" -#~ msgid "Seconds to wait bewteen digits when transferring" +#~ msgid "Seconds to wait between digits when transferring" #~ msgstr "Segundos de espera entre digitos mientras se transfiere" #~ msgid "sound when attended transfer is complete" @@ -248,7 +248,7 @@ msgstr "" #~ msgid "Authentication Application" #~ msgstr "Aplicación de autenticación" -#~ msgid "Make sure asterisk doesnt save CDR" +#~ msgid "Make sure asterisk doesn't save CDR" #~ msgstr "Asegúrate que asterisk no graba CDR" #~ msgid "Check if channel is available" @@ -296,7 +296,7 @@ msgstr "" #~ msgid "External IVR application interface" #~ msgstr "Interfaz de aplicación IVR externa" -#~ msgid "Fork The CDR into 2 seperate entities" +#~ msgid "Fork The CDR into 2 separate entities" #~ msgstr "Bifurcar el CDR en 2 entidades separadas" #~ msgid "Get ADSI CPE ID" diff --git a/applications/luci-app-asterisk/po/fr/asterisk.po b/applications/luci-app-asterisk/po/fr/asterisk.po index 75c1d38e43..63d085a1af 100644 --- a/applications/luci-app-asterisk/po/fr/asterisk.po +++ b/applications/luci-app-asterisk/po/fr/asterisk.po @@ -158,7 +158,7 @@ msgstr "" #~ msgid "Parking time (secs)" #~ msgstr "Durée de mise en parking (secondes)" -#~ msgid "Seconds to wait bewteen digits when transferring" +#~ msgid "Seconds to wait between digits when transferring" #~ msgstr "Attente en secondes entre les chiffres Lors d'un transfert" #~ msgid "sound when attended transfer is complete" @@ -218,7 +218,7 @@ msgstr "" #~ msgid "Authentication Application" #~ msgstr "Application d'authentification" -#~ msgid "Make sure asterisk doesnt save CDR" +#~ msgid "Make sure asterisk doesn't save CDR" #~ msgstr "S'assure qu'Asterisk ne sauve pas le CDR" #~ msgid "Check if channel is available" @@ -254,7 +254,7 @@ msgstr "" #~ msgid "External IVR application interface" #~ msgstr "Interface d'application SVI externe" -#~ msgid "Fork The CDR into 2 seperate entities" +#~ msgid "Fork The CDR into 2 separate entities" #~ msgstr "Dupliquer le CDR en deux entités séparées" #~ msgid "Get ADSI CPE ID" diff --git a/applications/luci-app-asterisk/po/it/asterisk.po b/applications/luci-app-asterisk/po/it/asterisk.po index 9eb24da5d1..f2aa51e96f 100644 --- a/applications/luci-app-asterisk/po/it/asterisk.po +++ b/applications/luci-app-asterisk/po/it/asterisk.po @@ -125,7 +125,7 @@ msgstr "" #~ msgid "Pickup extension" #~ msgstr "Estensione Pickup" -#~ msgid "Seconds to wait bewteen digits when transferring" +#~ msgid "Seconds to wait between digits when transferring" #~ msgstr "Secondi di attesa tra le cifre per il trasferimento" #~ msgid "Sound when attended transfer fails" diff --git a/applications/luci-app-asterisk/po/ms/asterisk.po b/applications/luci-app-asterisk/po/ms/asterisk.po index e1260e1ba5..d4b6baac90 100644 --- a/applications/luci-app-asterisk/po/ms/asterisk.po +++ b/applications/luci-app-asterisk/po/ms/asterisk.po @@ -196,7 +196,7 @@ msgstr "" #~ msgid "Pickup extension" #~ msgstr "Angkat sambungan" -#~ msgid "Seconds to wait bewteen digits when transferring" +#~ msgid "Seconds to wait between digits when transferring" #~ msgstr "Detik untuk menunggu antara nombor ketika memindahkan" #~ msgid "sound when attended transfer is complete" @@ -256,7 +256,7 @@ msgstr "" #~ msgid "Authentication Application" #~ msgstr "Pengesahan Aplikasi" -#~ msgid "Make sure asterisk doesnt save CDR" +#~ msgid "Make sure asterisk doesn't save CDR" #~ msgstr "Membuat asterisk yakin tidak menyimpan CDR" #~ msgid "Check if channel is available" @@ -307,7 +307,7 @@ msgstr "" #~ msgid "External IVR application interface" #~ msgstr "IVR aplikasi antara muka luaran" -#~ msgid "Fork The CDR into 2 seperate entities" +#~ msgid "Fork The CDR into 2 separate entities" #~ msgstr "CDR garpu menjadi 2 entiti yang berasingan" #~ msgid "Get ADSI CPE ID" diff --git a/applications/luci-app-asterisk/po/pt-br/asterisk.po b/applications/luci-app-asterisk/po/pt-br/asterisk.po index 07d7052809..00a0bb6431 100644 --- a/applications/luci-app-asterisk/po/pt-br/asterisk.po +++ b/applications/luci-app-asterisk/po/pt-br/asterisk.po @@ -194,7 +194,7 @@ msgstr "" #~ msgid "Pickup extension" #~ msgstr "Extensão de captura" -#~ msgid "Seconds to wait bewteen digits when transferring" +#~ msgid "Seconds to wait between digits when transferring" #~ msgstr "Segundos para esperar entre os dígitos quando transferindo" #~ msgid "sound when attended transfer is complete" @@ -254,7 +254,7 @@ msgstr "" #~ msgid "Authentication Application" #~ msgstr "Aplicativo de Autenticação" -#~ msgid "Make sure asterisk doesnt save CDR" +#~ msgid "Make sure asterisk doesn't save CDR" #~ msgstr "Garanta que o asterisk não salva o CDR" #~ msgid "Check if channel is available" @@ -305,7 +305,7 @@ msgstr "" #~ msgid "External IVR application interface" #~ msgstr "Interface de aplicativo IVR externo" -#~ msgid "Fork The CDR into 2 seperate entities" +#~ msgid "Fork The CDR into 2 separate entities" #~ msgstr "Bifurcar o CDR em duas entidades separadas" #~ msgid "Get ADSI CPE ID" diff --git a/applications/luci-app-asterisk/po/ru/asterisk.po b/applications/luci-app-asterisk/po/ru/asterisk.po index acedb82e60..d27ba33d7c 100644 --- a/applications/luci-app-asterisk/po/ru/asterisk.po +++ b/applications/luci-app-asterisk/po/ru/asterisk.po @@ -197,7 +197,7 @@ msgstr "" #~ msgid "Authentication Application" #~ msgstr "Приложение аутентификации" -#~ msgid "Make sure asterisk doesnt save CDR" +#~ msgid "Make sure asterisk doesn't save CDR" #~ msgstr "Убедитесь что Asterisk не сохраняет CDR" #~ msgid "Check if channel is available" diff --git a/applications/luci-app-asterisk/po/vi/asterisk.po b/applications/luci-app-asterisk/po/vi/asterisk.po index d1cc6b255f..133f864abb 100644 --- a/applications/luci-app-asterisk/po/vi/asterisk.po +++ b/applications/luci-app-asterisk/po/vi/asterisk.po @@ -187,7 +187,7 @@ msgstr "" #~ msgid "Pickup extension" #~ msgstr "Pickup extension" -#~ msgid "Seconds to wait bewteen digits when transferring" +#~ msgid "Seconds to wait between digits when transferring" #~ msgstr "Thời gian chờ giữa những chữ số khi chuyển đổi" #~ msgid "sound when attended transfer is complete" @@ -247,7 +247,7 @@ msgstr "" #~ msgid "Authentication Application" #~ msgstr "Ứng dụng xác thực" -#~ msgid "Make sure asterisk doesnt save CDR" +#~ msgid "Make sure asterisk doesn't save CDR" #~ msgstr "Bảo đảm asterisk không lưu CDR" #~ msgid "Check if channel is available" @@ -298,7 +298,7 @@ msgstr "" #~ msgid "External IVR application interface" #~ msgstr "Ứng dụng giao diện bên ngoài IVR" -#~ msgid "Fork The CDR into 2 seperate entities" +#~ msgid "Fork The CDR into 2 separate entities" #~ msgstr "Fork The CDR into 2 nhân riêng biệt" #~ msgid "Get ADSI CPE ID" diff --git a/applications/luci-app-coovachilli/po/ca/coovachilli.po b/applications/luci-app-coovachilli/po/ca/coovachilli.po index 085d9917d6..4970a1270e 100644 --- a/applications/luci-app-coovachilli/po/ca/coovachilli.po +++ b/applications/luci-app-coovachilli/po/ca/coovachilli.po @@ -449,7 +449,7 @@ msgstr "Autenticació UAM i MAC" #~ msgstr "Fitxers d'usuaris local" #~ msgid "" -#~ "A colon seperated file containing usernames and passwords of locally " +#~ "A colon separated file containing usernames and passwords of locally " #~ "authenticated users" #~ msgstr "" #~ "Un fitxer contenint usuaris i contrasenyes separats per punts d'usuaris " @@ -604,7 +604,7 @@ msgstr "Autenticació UAM i MAC" #~ msgid "" #~ "Executable to run as a CGI type program (like haserl) for URLs with " -#~ "extention .chi" +#~ "extension .chi" #~ msgstr "" #~ "Executable per executar com un programa de tipus CGI (com el haserl) per " #~ "URLs amb extensió .chi" diff --git a/applications/luci-app-coovachilli/po/cs/coovachilli.po b/applications/luci-app-coovachilli/po/cs/coovachilli.po index 0dc5fc0cd3..bc7ef7a584 100644 --- a/applications/luci-app-coovachilli/po/cs/coovachilli.po +++ b/applications/luci-app-coovachilli/po/cs/coovachilli.po @@ -225,7 +225,7 @@ msgstr "UAM a MAC ověřování" #~ msgstr "Soubor s místními uživateli" #~ msgid "" -#~ "A colon seperated file containing usernames and passwords of locally " +#~ "A colon separated file containing usernames and passwords of locally " #~ "authenticated users" #~ msgstr "" #~ "Soubor, obsahující uživatelská jména a hesla místně ověřovaných " diff --git a/applications/luci-app-coovachilli/po/de/coovachilli.po b/applications/luci-app-coovachilli/po/de/coovachilli.po index d8322db3ef..79955d7ba5 100644 --- a/applications/luci-app-coovachilli/po/de/coovachilli.po +++ b/applications/luci-app-coovachilli/po/de/coovachilli.po @@ -454,7 +454,7 @@ msgstr "UAM- und MAC-Authentifizierung" #, fuzzy #~ msgid "" -#~ "A colon seperated file containing usernames and passwords of locally " +#~ "A colon separated file containing usernames and passwords of locally " #~ "authenticated users" #~ msgstr "Netzwerk/TUN Konfiguration" @@ -598,7 +598,7 @@ msgstr "UAM- und MAC-Authentifizierung" #, fuzzy #~ msgid "" #~ "Executable to run as a CGI type program (like haserl) for URLs with " -#~ "extention .chi" +#~ "extension .chi" #~ msgstr "Netzwerk/TUN Konfiguration" #, fuzzy diff --git a/applications/luci-app-coovachilli/po/en/coovachilli.po b/applications/luci-app-coovachilli/po/en/coovachilli.po index ebaa3452b2..6d7c747a55 100644 --- a/applications/luci-app-coovachilli/po/en/coovachilli.po +++ b/applications/luci-app-coovachilli/po/en/coovachilli.po @@ -436,10 +436,10 @@ msgstr "" #~ msgstr "Local users file" #~ msgid "" -#~ "A colon seperated file containing usernames and passwords of locally " +#~ "A colon separated file containing usernames and passwords of locally " #~ "authenticated users" #~ msgstr "" -#~ "A colon seperated file containing usernames and passwords of locally " +#~ "A colon separated file containing usernames and passwords of locally " #~ "authenticated users" #~ msgid "Location name" @@ -588,10 +588,10 @@ msgstr "" #~ msgid "" #~ "Executable to run as a CGI type program (like haserl) for URLs with " -#~ "extention .chi" +#~ "extension .chi" #~ msgstr "" #~ "Executable to run as a CGI type program (like haserl) for URLs with " -#~ "extention .chi" +#~ "extension .chi" #~ msgid "Web content directory" #~ msgstr "Web content directory" diff --git a/applications/luci-app-coovachilli/po/pt-br/coovachilli.po b/applications/luci-app-coovachilli/po/pt-br/coovachilli.po index 9c219812fb..46ed3581b0 100644 --- a/applications/luci-app-coovachilli/po/pt-br/coovachilli.po +++ b/applications/luci-app-coovachilli/po/pt-br/coovachilli.po @@ -445,7 +445,7 @@ msgstr "Autenticação UAM e MAC" #~ msgstr "Arquivo de usuários locais" #~ msgid "" -#~ "A colon seperated file containing usernames and passwords of locally " +#~ "A colon separated file containing usernames and passwords of locally " #~ "authenticated users" #~ msgstr "" #~ "Um arquivo separado por dois pontos (:) contendo o nome de usuário e " @@ -602,7 +602,7 @@ msgstr "Autenticação UAM e MAC" #~ msgid "" #~ "Executable to run as a CGI type program (like haserl) for URLs with " -#~ "extention .chi" +#~ "extension .chi" #~ msgstr "" #~ "Executável para rodar como um programa do tipo CGI (como o haserl) para " #~ "URLs com a extensão .chi" diff --git a/applications/luci-app-coovachilli/po/pt/coovachilli.po b/applications/luci-app-coovachilli/po/pt/coovachilli.po index 115ae03ae0..c2cccc31ae 100644 --- a/applications/luci-app-coovachilli/po/pt/coovachilli.po +++ b/applications/luci-app-coovachilli/po/pt/coovachilli.po @@ -350,7 +350,7 @@ msgstr "Autenticação UAM e MAC" #, fuzzy #~ msgid "" #~ "Executable to run as a CGI type program (like haserl) for URLs with " -#~ "extention .chi" +#~ "extension .chi" #~ msgstr "" #~ "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS" diff --git a/applications/luci-app-coovachilli/po/ru/coovachilli.po b/applications/luci-app-coovachilli/po/ru/coovachilli.po index 379ff7eaa6..3420e24f70 100644 --- a/applications/luci-app-coovachilli/po/ru/coovachilli.po +++ b/applications/luci-app-coovachilli/po/ru/coovachilli.po @@ -387,7 +387,7 @@ msgstr "Аутентификация с помощью UAM и MAC" #~ msgstr "Локальный файл пользователей" #~ msgid "" -#~ "A colon seperated file containing usernames and passwords of locally " +#~ "A colon separated file containing usernames and passwords of locally " #~ "authenticated users" #~ msgstr "" #~ "Файл, содержащий логины и пароли локально авторизованных пользователей " diff --git a/applications/luci-app-coovachilli/po/vi/coovachilli.po b/applications/luci-app-coovachilli/po/vi/coovachilli.po index 66abf0dc6c..dc27f8b7a2 100644 --- a/applications/luci-app-coovachilli/po/vi/coovachilli.po +++ b/applications/luci-app-coovachilli/po/vi/coovachilli.po @@ -551,7 +551,7 @@ msgstr "" #, fuzzy #~ msgid "" #~ "Executable to run as a CGI type program (like haserl) for URLs with " -#~ "extention .chi" +#~ "extension .chi" #~ msgstr "Thống nhất cấu hình phương pháp cài đặt" #, fuzzy diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua index c924e845c2..e38a6060a0 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua @@ -335,7 +335,7 @@ function svc4.validate(self, value) if usev6:formvalue(section) ~= "1" then -- do only on IPv4 return value else - return "" -- supress validate error + return "" -- suppress validate error end end function svc4.write(self, section, value) @@ -376,7 +376,7 @@ function svc6.validate(self, value) if DDNS.has_ipv6 then return value end return nil, err_tab_basic(self) .. err_ipv6_plain else - return "" -- supress validate error + return "" -- suppress validate error end end function svc6.write(self, section, value) @@ -626,7 +626,7 @@ if DDNS.has_ssl then cert.forcewrite = true function cert.validate(self, value) if https:formvalue(section) ~= "1" then - return "" -- supress validate error if NOT https + return "" -- suppress validate error if NOT https end if value then -- otherwise errors in datatype check if DTYP.directory(value) diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua index 3f5997463c..32ad3c3485 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua @@ -68,7 +68,7 @@ if not DDNS.has_ssl then translate("HTTPS not supported") .. bold_off sl.value = translate("Neither GNU Wget with SSL nor cURL installed to support updates via HTTPS protocol.") .. "<br />- " .. - translate("You should install GNU Wget with SSL (prefered) or cURL package.") .. + translate("You should install GNU Wget with SSL (preferred) or cURL package.") .. "<br />- " .. translate("In some versions cURL/libcurl in OpenWrt is compiled without proxy support.") end @@ -114,7 +114,7 @@ if not DDNS.has_forceip then "the IP version to use for communication with DDNS Provider!") if not (DDNS.has_wgetssl or DDNS.has_curl or DDNS.has_fetch) then value = value .. "<br />- " .. - translate("You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch package.") + translate("You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch package.") end if not (DDNS.has_bindhost or DDNS.has_hostip) then value = value .. "<br />- " .. diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua index e6da7cc188..9a989bae41 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua @@ -41,7 +41,7 @@ m.on_after_commit = function(self) end end --- SimpleSection definiton -- ################################################## +-- SimpleSection definition -- ################################################## -- with all the JavaScripts we need for "a good Show" a = m:section( SimpleSection ) a.template = "ddns/overview_status" diff --git a/applications/luci-app-ddns/po/ca/ddns.po b/applications/luci-app-ddns/po/ca/ddns.po index f4cedfa961..5f0fd36ffa 100644 --- a/applications/luci-app-ddns/po/ca/ddns.po +++ b/applications/luci-app-ddns/po/ca/ddns.po @@ -599,11 +599,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/cs/ddns.po b/applications/luci-app-ddns/po/cs/ddns.po index 7c950d76d7..07d5127e91 100644 --- a/applications/luci-app-ddns/po/cs/ddns.po +++ b/applications/luci-app-ddns/po/cs/ddns.po @@ -597,11 +597,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/de/ddns.po b/applications/luci-app-ddns/po/de/ddns.po index b78cb64d55..98950b96f7 100644 --- a/applications/luci-app-ddns/po/de/ddns.po +++ b/applications/luci-app-ddns/po/de/ddns.po @@ -686,13 +686,13 @@ msgstr "" "Sie sollten das Programmpakete BIND host for DNS Anfragen installieren." msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" "Sie sollten das Programmpaket GNU Wget mit SSL (bevorzugt) oder cURL oder " "uclient-fetch installieren." -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" "Sie sollten das Programmpaket GNU Wget mit SSL (bevorzugt) oder cURL " "installieren." diff --git a/applications/luci-app-ddns/po/el/ddns.po b/applications/luci-app-ddns/po/el/ddns.po index 097de6ad10..b755acbe18 100644 --- a/applications/luci-app-ddns/po/el/ddns.po +++ b/applications/luci-app-ddns/po/el/ddns.po @@ -596,11 +596,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/es/ddns.po b/applications/luci-app-ddns/po/es/ddns.po index c77a308c59..35eac4c990 100644 --- a/applications/luci-app-ddns/po/es/ddns.po +++ b/applications/luci-app-ddns/po/es/ddns.po @@ -595,11 +595,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/fr/ddns.po b/applications/luci-app-ddns/po/fr/ddns.po index 6a35af6815..60a5ab4f75 100644 --- a/applications/luci-app-ddns/po/fr/ddns.po +++ b/applications/luci-app-ddns/po/fr/ddns.po @@ -595,11 +595,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/he/ddns.po b/applications/luci-app-ddns/po/he/ddns.po index 2ad6ac9424..81e53ebeaf 100644 --- a/applications/luci-app-ddns/po/he/ddns.po +++ b/applications/luci-app-ddns/po/he/ddns.po @@ -596,11 +596,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/hu/ddns.po b/applications/luci-app-ddns/po/hu/ddns.po index ba71175963..1907b05c92 100644 --- a/applications/luci-app-ddns/po/hu/ddns.po +++ b/applications/luci-app-ddns/po/hu/ddns.po @@ -595,11 +595,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/it/ddns.po b/applications/luci-app-ddns/po/it/ddns.po index 6eae599b9f..24ba268a3f 100644 --- a/applications/luci-app-ddns/po/it/ddns.po +++ b/applications/luci-app-ddns/po/it/ddns.po @@ -595,11 +595,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/ja/ddns.po b/applications/luci-app-ddns/po/ja/ddns.po index e7563c2137..c497665638 100644 --- a/applications/luci-app-ddns/po/ja/ddns.po +++ b/applications/luci-app-ddns/po/ja/ddns.po @@ -595,11 +595,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/no/ddns.po b/applications/luci-app-ddns/po/no/ddns.po index 586b710cfb..9b17ff648a 100644 --- a/applications/luci-app-ddns/po/no/ddns.po +++ b/applications/luci-app-ddns/po/no/ddns.po @@ -594,11 +594,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/pl/ddns.po b/applications/luci-app-ddns/po/pl/ddns.po index 21da7c6a47..9211a2f368 100644 --- a/applications/luci-app-ddns/po/pl/ddns.po +++ b/applications/luci-app-ddns/po/pl/ddns.po @@ -596,11 +596,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/pt-br/ddns.po b/applications/luci-app-ddns/po/pt-br/ddns.po index 2ee6d81f89..7378269e14 100644 --- a/applications/luci-app-ddns/po/pt-br/ddns.po +++ b/applications/luci-app-ddns/po/pt-br/ddns.po @@ -595,11 +595,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/pt/ddns.po b/applications/luci-app-ddns/po/pt/ddns.po index 383d045647..c6788354e2 100644 --- a/applications/luci-app-ddns/po/pt/ddns.po +++ b/applications/luci-app-ddns/po/pt/ddns.po @@ -597,11 +597,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/ro/ddns.po b/applications/luci-app-ddns/po/ro/ddns.po index d5e033a90b..fe6f3245eb 100644 --- a/applications/luci-app-ddns/po/ro/ddns.po +++ b/applications/luci-app-ddns/po/ro/ddns.po @@ -596,11 +596,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/ru/ddns.po b/applications/luci-app-ddns/po/ru/ddns.po index a42faa76f5..47febd73da 100644 --- a/applications/luci-app-ddns/po/ru/ddns.po +++ b/applications/luci-app-ddns/po/ru/ddns.po @@ -597,11 +597,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/templates/ddns.pot b/applications/luci-app-ddns/po/templates/ddns.pot index fc39db78b8..8da949f6b3 100644 --- a/applications/luci-app-ddns/po/templates/ddns.pot +++ b/applications/luci-app-ddns/po/templates/ddns.pot @@ -582,11 +582,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/tr/ddns.po b/applications/luci-app-ddns/po/tr/ddns.po index 6a4b4075ad..64a959ea2d 100644 --- a/applications/luci-app-ddns/po/tr/ddns.po +++ b/applications/luci-app-ddns/po/tr/ddns.po @@ -593,11 +593,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/uk/ddns.po b/applications/luci-app-ddns/po/uk/ddns.po index eef6c4343e..bae6386e46 100644 --- a/applications/luci-app-ddns/po/uk/ddns.po +++ b/applications/luci-app-ddns/po/uk/ddns.po @@ -598,11 +598,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/vi/ddns.po b/applications/luci-app-ddns/po/vi/ddns.po index 4d63e2910b..a9ab1f3aa2 100644 --- a/applications/luci-app-ddns/po/vi/ddns.po +++ b/applications/luci-app-ddns/po/vi/ddns.po @@ -596,11 +596,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/zh-cn/ddns.po b/applications/luci-app-ddns/po/zh-cn/ddns.po index 24e3e7cd85..80a16ce8a8 100644 --- a/applications/luci-app-ddns/po/zh-cn/ddns.po +++ b/applications/luci-app-ddns/po/zh-cn/ddns.po @@ -606,11 +606,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "你需要安装BIND以请求DNS记录." msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "你需要安装包含SSL支持的GNU Wget(推荐)或是cURL软件包." msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-ddns/po/zh-tw/ddns.po b/applications/luci-app-ddns/po/zh-tw/ddns.po index 3fd138593b..561c197eb0 100644 --- a/applications/luci-app-ddns/po/zh-tw/ddns.po +++ b/applications/luci-app-ddns/po/zh-tw/ddns.po @@ -594,11 +594,11 @@ msgid "You should install BIND host package for DNS requests." msgstr "" msgid "" -"You should install GNU Wget with SSL (prefered) or cURL or uclient-fetch " +"You should install GNU Wget with SSL (preferred) or cURL or uclient-fetch " "package." msgstr "" -msgid "You should install GNU Wget with SSL (prefered) or cURL package." +msgid "You should install GNU Wget with SSL (preferred) or cURL package." msgstr "" msgid "You should install GNU Wget with SSL or cURL package." diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua index 78c9ef5044..6266ff3ba5 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua @@ -12,21 +12,27 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) number_format = "%5.1lf%sB", data = { - sources = { - df = { "free", "used" } + instances = { + df_complex = { "free", "used", "reserved" } }, options = { - df__free = { + df_complex_free = { color = "00ff00", overlay = false, title = "free" }, - df__used = { + df_complex_used = { color = "ff0000", overlay = false, title = "used" + }, + + df_complex_reserved = { + color = "0000ff", + overlay = false, + title = "reserved" } } } diff --git a/build/luadoc/luadoc/taglet/standard/tags.lua b/build/luadoc/luadoc/taglet/standard/tags.lua index e9d0354830..b46d685da4 100644 --- a/build/luadoc/luadoc/taglet/standard/tags.lua +++ b/build/luadoc/luadoc/taglet/standard/tags.lua @@ -85,7 +85,7 @@ end -- Processes a parameter documentation. -- @param tag String with the name of the tag (it must be "param" always). -- @param block Table with previous information about the block. --- @param text String with the current line beeing processed. +-- @param text String with the current line being processed. local function param (tag, block, text) block[tag] = block[tag] or {} diff --git a/build/luadoc/luadoc/util.lua b/build/luadoc/luadoc/util.lua index e1058d5906..7e9cac6c80 100644 --- a/build/luadoc/luadoc/util.lua +++ b/build/luadoc/luadoc/util.lua @@ -12,7 +12,7 @@ local type, table, string, io, assert, tostring, setmetatable, pcall = type, tab module "luadoc.util" ------------------------------------------------------------------------------- --- Removes spaces from the begining and end of a given string +-- Removes spaces from the beginning and end of a given string -- @param s string to be trimmed -- @return trimmed string @@ -21,7 +21,7 @@ function trim (s) end ------------------------------------------------------------------------------- --- Removes spaces from the begining and end of a given string, considering the +-- Removes spaces from the beginning and end of a given string, considering the -- string is inside a lua comment. -- @param s string to be trimmed -- @return trimmed string @@ -61,7 +61,7 @@ end -- Split text into a list consisting of the strings in text, -- separated by strings matching delim (which may be a pattern). -- @param delim if delim is "" then action is the same as %s+ except that --- field 1 may be preceeded by leading whitespace +-- field 1 may be preceded by leading whitespace -- @usage split(",%s*", "Anna, Bob, Charlie,Dolores") -- @usage split(""," x y") gives {"x","y"} -- @usage split("%s+"," x y") gives {"", "x","y"} diff --git a/documentation/CBI.md b/documentation/CBI.md index 4ebc08af09..e937fe6048 100644 --- a/documentation/CBI.md +++ b/documentation/CBI.md @@ -164,7 +164,7 @@ If you call this function several times the dependencies will be linked with **" The default value #### property .disabled = 0 -the value that shoudl be set if the checkbox is unchecked +the value that should be set if the checkbox is unchecked #### property .enabled = 1 the value that should be set if the checkbox is checked diff --git a/documentation/LAR.md b/documentation/LAR.md index f44d8dc7df..457b076f9a 100644 --- a/documentation/LAR.md +++ b/documentation/LAR.md @@ -1,4 +1,4 @@ -LAR is a simple archive format to pack multiple lua source files and arbitary other resources into a single file. +LAR is a simple archive format to pack multiple lua source files and arbitrary other resources into a single file. # Format Specification diff --git a/documentation/ThemesHowTo.md b/documentation/ThemesHowTo.md index 32154c724c..ae6f8e09cd 100644 --- a/documentation/ThemesHowTo.md +++ b/documentation/ThemesHowTo.md @@ -1,7 +1,7 @@ # HowTo: Create Themes *Note:* You should read the [Module Reference](Modules.md) and the [Template Reference](Templates.md) before. -We assume you want to call your new theme _mytheme_. Make sure you replace this by your module name everytime this is mentionend in this Howto. +We assume you want to call your new theme _mytheme_. Make sure you replace this by your module name every time this is mentionend in this Howto. diff --git a/documentation/api/modules/luci.http.protocol.html b/documentation/api/modules/luci.http.protocol.html index 1d45acede6..57063bbcf9 100644 --- a/documentation/api/modules/luci.http.protocol.html +++ b/documentation/api/modules/luci.http.protocol.html @@ -341,7 +341,7 @@ Ltn12 source function Decode a mime encoded http message body with multipart/form-data Content-Type. Stores all extracted data associated with its parameter name -in the params table withing the given message object. Multiple parameter +in the params table within the given message object. Multiple parameter values are stored as tables, ordinary ones as strings. If an optional file callback function is given then it is feeded with the file contents chunk by chunk and only the extracted file name is stored @@ -556,7 +556,7 @@ The decoded string Decode an urlencoded http message body with application/x-www-urlencoded Content-Type. Stores all extracted data associated with its parameter name -in the params table withing the given message object. Multiple parameter +in the params table within the given message object. Multiple parameter values are stored as tables, ordinary ones as strings. diff --git a/documentation/api/modules/luci.ip.cidr.html b/documentation/api/modules/luci.ip.cidr.html index 28fb21d02d..ce8c567952 100644 --- a/documentation/api/modules/luci.ip.cidr.html +++ b/documentation/api/modules/luci.ip.cidr.html @@ -340,7 +340,7 @@ Add given amount to CIDR instance.</td> <td class="name" nowrap><a href="#cidr.sub">cidr:sub</a> (amount, inplace)</td> <td class="summary"> -Substract given amount from CIDR instance.</td> +Subtract given amount from CIDR instance.</td> </tr> <tr> @@ -1082,7 +1082,7 @@ print(addr) -- "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/64"</pr <h3>Return value:</h3> <ul> - <li>When adding inplace: Return <code>true</code> if the addition succeded + <li>When adding inplace: Return <code>true</code> if the addition succeeded or <code>false</code> when the addition overflowed.</li> <li>When deriving new CIDR: Return new instance representing the value of this instance plus the added amount or the highest possible address if @@ -1099,7 +1099,7 @@ print(addr) -- "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/64"</pr <dd> -Substract given amount from CIDR instance. If the result would under, the lowest +Subtract given amount from CIDR instance. If the result would under, the lowest possible address is returned. @@ -1148,11 +1148,11 @@ print(addr) -- "::/64"</pre> <h3>Return value:</h3> <ul> - <li>When substracting inplace: Return <code>true</code> if the substraction - succeded or <code>false</code> when the substraction underflowed.</li> + <li>When subtracting inplace: Return <code>true</code> if the subtraction + succeeded or <code>false</code> when the subtraction underflowed.</li> <li>When deriving new CIDR: Return new instance representing the value of - this instance minus the substracted amount or the lowest address if - the substraction underflowed.</li></ul> + this instance minus the subtracted amount or the lowest address if + the subtraction underflowed.</li></ul> diff --git a/documentation/api/modules/luci.util.html b/documentation/api/modules/luci.util.html index 301cffff68..847230bbbd 100644 --- a/documentation/api/modules/luci.util.html +++ b/documentation/api/modules/luci.util.html @@ -241,7 +241,7 @@ Clones the given object and return it's copy.</td> <td class="name" nowrap><a href="#cmatch">cmatch</a> (str, pattern)</td> <td class="summary"> -Count the occurences of given substring in given string.</td> +Count the occurrences of given substring in given string.</td> </tr> <tr> @@ -629,7 +629,7 @@ Cloned table value <dd> -Count the occurences of given substring in given string. +Count the occurrences of given substring in given string. @@ -652,7 +652,7 @@ Count the occurences of given substring in given string. <h3>Return value:</h3> -Number of found occurences +Number of found occurrences diff --git a/documentation/api/modules/nixio.README.html b/documentation/api/modules/nixio.README.html index a8da0f36da..d8a17f78b4 100644 --- a/documentation/api/modules/nixio.README.html +++ b/documentation/api/modules/nixio.README.html @@ -288,7 +288,7 @@ <br />In general all functions are namend and behave like their POSIX API counterparts - where applicable - applying the following rules: <ul> - <li>Functions should be named like the underlying POSIX API function ommiting + <li>Functions should be named like the underlying POSIX API function omitting prefixes or suffixes - especially when placed in an object-context ( lockf -> File:lock, fsync -> File:sync, dup2 -> dup, ...)</li> <li>If you are unclear about the behaviour of a function you should consult @@ -296,10 +296,10 @@ <li>If the name is significantly different from the POSIX-function, the underlying function(s) are stated in the documentation.</li> <li>Parameters should reflect those of the C-API, buffer length arguments and - by-reference parameters should be ommitted for pratical purposes.</li> + by-reference parameters should be omitted for pratical purposes.</li> <li>If a C function accepts a bitfield as parameter, it should be translated into lower case string flags representing the flags if the bitfield is the - last parameter and also ommiting prefixes or suffixes. (e.g. waitpid + last parameter and also omitting prefixes or suffixes. (e.g. waitpid (pid, &s, WNOHANG | WUNTRACED) -> waitpid(pid, "nohang", "untraced"), getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) -> Socket:getopt("socket", "reuseaddr"), etc.) </li> diff --git a/documentation/api/modules/nixio.Socket.html b/documentation/api/modules/nixio.Socket.html index 105682ced2..7d258fc195 100644 --- a/documentation/api/modules/nixio.Socket.html +++ b/documentation/api/modules/nixio.Socket.html @@ -763,7 +763,7 @@ buffer containing data successfully read Send a message on the socket. This function is identical to sendto except for the missing destination - paramters. See the sendto description for a detailed description. + parameters. See the sendto description for a detailed description. <h3>Parameters</h3> diff --git a/documentation/api/modules/nixio.UnifiedIO.html b/documentation/api/modules/nixio.UnifiedIO.html index 22e6e91658..1717980841 100644 --- a/documentation/api/modules/nixio.UnifiedIO.html +++ b/documentation/api/modules/nixio.UnifiedIO.html @@ -326,7 +326,7 @@ <li>The blocksize given is only advisory and to be seen as an upper limit, if an underlying read returns less bytes the chunk is nevertheless returned. - <li>If the limit parameter is ommited, the iterator returns data + <li>If the limit parameter is omitted, the iterator returns data until an end-of-file, end-of-stream, connection shutdown or similar happens. <li>The iterator will not buffer so it is safe to mix with calls to read. @@ -402,7 +402,7 @@ true <li>This function uses the blocksource function of the source descriptor and the sink function of the target descriptor. - <li>If the limit parameter is ommited, data is copied + <li>If the limit parameter is omitted, data is copied until an end-of-file, end-of-stream, connection shutdown or similar happens. <li>If the descriptor is non-blocking the function may fail with EAGAIN. @@ -414,13 +414,13 @@ true <h3>Return values:</h3> <ol> - <li>bytes that were successfully written if no error occured + <li>bytes that were successfully written if no error occurred <li>- reserved for error code - <li>- reserved for error message - - <li>bytes that were successfully written even if an error occured + <li>bytes that were successfully written even if an error occurred </ol> @@ -461,7 +461,7 @@ true blocksource function of the source descriptor and the sink function of the target descriptor as a fallback mechanism. - <li>If the limit parameter is ommited, data is copied + <li>If the limit parameter is omitted, data is copied until an end-of-file, end-of-stream, connection shutdown or similar happens. <li>If the descriptor is non-blocking the function may fail with EAGAIN. @@ -473,13 +473,13 @@ true <h3>Return values:</h3> <ol> - <li>bytes that were successfully written if no error occured + <li>bytes that were successfully written if no error occurred <li>- reserved for error code - <li>- reserved for error message - - <li>bytes that were successfully written even if an error occured + <li>bytes that were successfully written even if an error occurred </ol> @@ -584,7 +584,7 @@ boolean you can pass "true" to the iterator which will flush the buffer and return the bufferd data. - <li>If the limit parameter is ommited, this function uses the nixio + <li>If the limit parameter is omitted, this function uses the nixio buffersize (8192B by default). <li>If the descriptor is non-blocking the iterator may fail with EAGAIN. @@ -628,7 +628,7 @@ Line-based Iterator <li>This function uses the low-level read function of the descriptor. - <li>If the length parameter is ommited, this function returns all data + <li>If the length parameter is omitted, this function returns all data that can be read before an end-of-file, end-of-stream, connection shutdown or similar happens. @@ -641,13 +641,13 @@ Line-based Iterator <h3>Return values:</h3> <ol> - <li>data that was successfully read if no error occured + <li>data that was successfully read if no error occurred <li>- reserved for error code - <li>- reserved for error message - - <li>data that was successfully read even if an error occured + <li>data that was successfully read even if an error occurred </ol> @@ -733,13 +733,13 @@ Sink <h3>Return values:</h3> <ol> - <li>bytes that were successfully written if no error occured + <li>bytes that were successfully written if no error occurred <li>- reserved for error code - <li>- reserved for error message - - <li>bytes that were successfully written even if an error occured + <li>bytes that were successfully written even if an error occurred </ol> diff --git a/documentation/api/modules/nixio.fs.html b/documentation/api/modules/nixio.fs.html index d4fda2c516..40d0a0636e 100644 --- a/documentation/api/modules/nixio.fs.html +++ b/documentation/api/modules/nixio.fs.html @@ -1274,7 +1274,7 @@ true <h3>Usage:</h3> -It is normally not possible to rename files accross fileystems. +It is normally not possible to rename files across fileystems. diff --git a/documentation/api/modules/nixio.html b/documentation/api/modules/nixio.html index f02fe3be58..8ee0f62dc7 100644 --- a/documentation/api/modules/nixio.html +++ b/documentation/api/modules/nixio.html @@ -1594,7 +1594,7 @@ File Object <h3>Return value:</h3> -flag to be used as second paramter to open +flag to be used as second parameter to open @@ -1670,7 +1670,7 @@ flag to be used as second paramter to open Wait for some event on a file descriptor. poll() sets the revents-field of the tables provided by fds to a bitfield - indicating the events that occured. + indicating the events that occurred. <h3>Parameters</h3> @@ -1846,7 +1846,7 @@ bytes sent <h3>Usage:</h3> -The environment variable will be unset if value is ommited. +The environment variable will be unset if value is omitted. |