diff options
Diffstat (limited to 'modules')
33 files changed, 335 insertions, 238 deletions
diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile index f0763cb1df..972a451c69 100644 --- a/modules/luci-base/Makefile +++ b/modules/luci-base/Makefile @@ -37,10 +37,9 @@ define Host/Compile endef define Host/Install - $(INSTALL_DIR) $(STAGING_DIR)/host/bin - $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin - $(INSTALL_BIN) src/po2lmo $(STAGING_DIR_HOST)/bin/po2lmo - $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(STAGING_DIR)/host/bin/LuaSrcDiet + $(INSTALL_DIR) $(1)/bin + $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo + $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(1)/bin/LuaSrcDiet endef $(eval $(call HostBuild)) diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua index c9a507eaa2..66136903a7 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua @@ -87,7 +87,7 @@ TZ = { { 'America/Cambridge Bay', 'MST7MDT,M3.2.0,M11.1.0' }, { 'America/Campo Grande', 'AMT4AMST,M10.3.0/0,M2.3.0/0' }, { 'America/Cancun', 'EST5' }, - { 'America/Caracas', 'VET4:30' }, + { 'America/Caracas', 'VET4' }, { 'America/Cayenne', 'GFT3' }, { 'America/Cayman', 'EST5' }, { 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' }, @@ -201,97 +201,99 @@ TZ = { { 'America/Winnipeg', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Yakutat', 'AKST9AKDT,M3.2.0,M11.1.0' }, { 'America/Yellowknife', 'MST7MDT,M3.2.0,M11.1.0' }, - { 'Antarctica/Casey', 'AWST-8' }, - { 'Antarctica/Davis', 'DAVT-7' }, - { 'Antarctica/DumontDUrville', 'DDUT-10' }, + { 'Antarctica/Casey', '<+11>-11' }, + { 'Antarctica/Davis', '<+07>-7' }, + { 'Antarctica/DumontDUrville', '<+10>-10' }, { 'Antarctica/Macquarie', 'MIST-11' }, - { 'Antarctica/Mawson', 'MAWT-5' }, + { 'Antarctica/Mawson', '<+05>-5' }, { 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' }, { 'Antarctica/Palmer', 'CLT4CLST,M8.2.6/24,M5.2.6/24' }, - { 'Antarctica/Rothera', 'ROTT3' }, - { 'Antarctica/Syowa', 'SYOT-3' }, - { 'Antarctica/Troll', 'UTC0CEST-2,M3.5.0/1,M10.5.0/3' }, - { 'Antarctica/Vostok', 'VOST-6' }, + { 'Antarctica/Rothera', '<-03>3' }, + { 'Antarctica/Syowa', '<+03>-3' }, + { 'Antarctica/Troll', '<+00>0<+02>-2,M3.5.0/1,M10.5.0/3' }, + { 'Antarctica/Vostok', '<+06>-6' }, { 'Arctic/Longyearbyen', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Asia/Aden', 'AST-3' }, - { 'Asia/Almaty', 'ALMT-6' }, + { 'Asia/Almaty', '<+06>-6' }, { 'Asia/Amman', 'EET-2EEST,M3.5.4/24,M10.5.5/1' }, - { 'Asia/Anadyr', 'ANAT-12' }, - { 'Asia/Aqtau', 'AQTT-5' }, - { 'Asia/Aqtobe', 'AQTT-5' }, - { 'Asia/Ashgabat', 'TMT-5' }, + { 'Asia/Anadyr', '<+12>-12' }, + { 'Asia/Aqtau', '<+05>-5' }, + { 'Asia/Aqtobe', '<+05>-5' }, + { 'Asia/Ashgabat', '<+05>-5' }, { 'Asia/Baghdad', 'AST-3' }, { 'Asia/Bahrain', 'AST-3' }, - { 'Asia/Baku', 'AZT-4' }, + { 'Asia/Baku', '<+04>-4' }, { 'Asia/Bangkok', 'ICT-7' }, { 'Asia/Barnaul', '<+07>-7' }, { 'Asia/Beirut', 'EET-2EEST,M3.5.0/0,M10.5.0/0' }, - { 'Asia/Bishkek', 'KGT-6' }, + { 'Asia/Bishkek', '<+06>-6' }, { 'Asia/Brunei', 'BNT-8' }, - { 'Asia/Chita', 'YAKT-9' }, + { 'Asia/Chita', '<+09>-9' }, { 'Asia/Choibalsan', 'CHOT-8CHOST,M3.5.6,M9.5.6/0' }, - { 'Asia/Colombo', 'IST-5:30' }, + { 'Asia/Colombo', '<+0530>-5:30' }, { 'Asia/Damascus', 'EET-2EEST,M3.5.5/0,M10.5.5/0' }, { 'Asia/Dhaka', 'BDT-6' }, { 'Asia/Dili', 'TLT-9' }, { 'Asia/Dubai', 'GST-4' }, - { 'Asia/Dushanbe', 'TJT-5' }, - { 'Asia/Gaza', 'EET-2EEST,M3.5.6/1,M10.3.6/144' }, - { 'Asia/Hebron', 'EET-2EEST,M3.5.6/1,M10.3.6/144' }, + { 'Asia/Dushanbe', '<+05>-5' }, + { 'Asia/Famagusta', '<+03>-3' }, + { 'Asia/Gaza', 'EET-2EEST,M3.5.6/1,M10.5.6/1' }, + { 'Asia/Hebron', 'EET-2EEST,M3.5.6/1,M10.5.6/1' }, { 'Asia/Ho Chi Minh', 'ICT-7' }, { 'Asia/Hong Kong', 'HKT-8' }, { 'Asia/Hovd', 'HOVT-7HOVST,M3.5.6,M9.5.6/0' }, - { 'Asia/Irkutsk', 'IRKT-8' }, + { 'Asia/Irkutsk', '<+08>-8' }, { 'Asia/Jakarta', 'WIB-7' }, { 'Asia/Jayapura', 'WIT-9' }, { 'Asia/Jerusalem', 'IST-2IDT,M3.4.4/26,M10.5.0' }, { 'Asia/Kabul', 'AFT-4:30' }, - { 'Asia/Kamchatka', 'PETT-12' }, + { 'Asia/Kamchatka', '<+12>-12' }, { 'Asia/Karachi', 'PKT-5' }, { 'Asia/Kathmandu', 'NPT-5:45' }, - { 'Asia/Khandyga', 'YAKT-9' }, + { 'Asia/Khandyga', '<+09>-9' }, { 'Asia/Kolkata', 'IST-5:30' }, - { 'Asia/Krasnoyarsk', 'KRAT-7' }, + { 'Asia/Krasnoyarsk', '<+07>-7' }, { 'Asia/Kuala Lumpur', 'MYT-8' }, { 'Asia/Kuching', 'MYT-8' }, { 'Asia/Kuwait', 'AST-3' }, { 'Asia/Macau', 'CST-8' }, - { 'Asia/Magadan', 'MAGT-10' }, + { 'Asia/Magadan', '<+11>-11' }, { 'Asia/Makassar', 'WITA-8' }, { 'Asia/Manila', 'PHT-8' }, { 'Asia/Muscat', 'GST-4' }, { 'Asia/Nicosia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, - { 'Asia/Novokuznetsk', 'KRAT-7' }, - { 'Asia/Novosibirsk', 'NOVT-6' }, - { 'Asia/Omsk', 'OMST-6' }, - { 'Asia/Oral', 'ORAT-5' }, + { 'Asia/Novokuznetsk', '<+07>-7' }, + { 'Asia/Novosibirsk', '<+07>-7' }, + { 'Asia/Omsk', '<+06>-6' }, + { 'Asia/Oral', '<+05>-5' }, { 'Asia/Phnom Penh', 'ICT-7' }, { 'Asia/Pontianak', 'WIB-7' }, { 'Asia/Pyongyang', 'KST-8:30' }, { 'Asia/Qatar', 'AST-3' }, - { 'Asia/Qyzylorda', 'QYZT-6' }, - { 'Asia/Rangoon', 'MMT-6:30' }, + { 'Asia/Qyzylorda', '<+06>-6' }, { 'Asia/Riyadh', 'AST-3' }, - { 'Asia/Sakhalin', 'SAKT-11' }, - { 'Asia/Samarkand', 'UZT-5' }, + { 'Asia/Sakhalin', '<+11>-11' }, + { 'Asia/Samarkand', '<+05>-5' }, { 'Asia/Seoul', 'KST-9' }, { 'Asia/Shanghai', 'CST-8' }, { 'Asia/Singapore', 'SGT-8' }, - { 'Asia/Srednekolymsk', 'SRET-11' }, + { 'Asia/Srednekolymsk', '<+11>-11' }, { 'Asia/Taipei', 'CST-8' }, - { 'Asia/Tashkent', 'UZT-5' }, - { 'Asia/Tbilisi', 'GET-4' }, + { 'Asia/Tashkent', '<+05>-5' }, + { 'Asia/Tbilisi', '<+04>-4' }, { 'Asia/Tehran', 'IRST-3:30IRDT,J80/0,J264/0' }, { 'Asia/Thimphu', 'BTT-6' }, { 'Asia/Tokyo', 'JST-9' }, + { 'Asia/Tomsk', '<+07>-7' }, { 'Asia/Ulaanbaatar', 'ULAT-8ULAST,M3.5.6,M9.5.6/0' }, { 'Asia/Urumqi', 'XJT-6' }, - { 'Asia/Ust-Nera', 'VLAT-10' }, + { 'Asia/Ust-Nera', '<+10>-10' }, { 'Asia/Vientiane', 'ICT-7' }, - { 'Asia/Vladivostok', 'VLAT-10' }, - { 'Asia/Yakutsk', 'YAKT-9' }, - { 'Asia/Yekaterinburg', 'YEKT-5' }, - { 'Asia/Yerevan', 'AMT-4' }, + { 'Asia/Vladivostok', '<+10>-10' }, + { 'Asia/Yakutsk', '<+09>-9' }, + { 'Asia/Yangon', 'MMT-6:30' }, + { 'Asia/Yekaterinburg', '<+05>-5' }, + { 'Asia/Yerevan', '<+04>-4' }, { 'Atlantic/Azores', 'AZOT1AZOST,M3.5.0/0,M10.5.0/1' }, { 'Atlantic/Bermuda', 'AST4ADT,M3.2.0,M11.1.0' }, { 'Atlantic/Canary', 'WET0WEST,M3.5.0/1,M10.5.0' }, @@ -332,10 +334,11 @@ TZ = { { 'Europe/Guernsey', 'GMT0BST,M3.5.0/1,M10.5.0' }, { 'Europe/Helsinki', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Europe/Isle of Man', 'GMT0BST,M3.5.0/1,M10.5.0' }, - { 'Europe/Istanbul', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, + { 'Europe/Istanbul', '<+03>-3' }, { 'Europe/Jersey', 'GMT0BST,M3.5.0/1,M10.5.0' }, { 'Europe/Kaliningrad', 'EET-2' }, { 'Europe/Kiev', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, + { 'Europe/Kirov', '<+03>-3' }, { 'Europe/Lisbon', 'WET0WEST,M3.5.0/1,M10.5.0' }, { 'Europe/Ljubljana', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/London', 'GMT0BST,M3.5.0/1,M10.5.0' }, @@ -343,7 +346,7 @@ TZ = { { 'Europe/Madrid', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Malta', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Mariehamn', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, - { 'Europe/Minsk', 'MSK-3' }, + { 'Europe/Minsk', '<+03>-3' }, { 'Europe/Monaco', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Moscow', 'MSK-3' }, { 'Europe/Oslo', 'CET-1CEST,M3.5.0,M10.5.0/3' }, @@ -352,7 +355,7 @@ TZ = { { 'Europe/Prague', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Riga', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Europe/Rome', 'CET-1CEST,M3.5.0,M10.5.0/3' }, - { 'Europe/Samara', 'SAMT-4' }, + { 'Europe/Samara', '<+04>-4' }, { 'Europe/San Marino', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Sarajevo', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Simferopol', 'MSK-3' }, @@ -367,7 +370,7 @@ TZ = { { 'Europe/Vatican', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Vienna', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Vilnius', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, - { 'Europe/Volgograd', 'MSK-3' }, + { 'Europe/Volgograd', '<+03>-3' }, { 'Europe/Warsaw', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Zagreb', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Zaporozhye', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, @@ -377,7 +380,7 @@ TZ = { { 'Indian/Christmas', 'CXT-7' }, { 'Indian/Cocos', 'CCT-6:30' }, { 'Indian/Comoro', 'EAT-3' }, - { 'Indian/Kerguelen', 'TFT-5' }, + { 'Indian/Kerguelen', '<+05>-5' }, { 'Indian/Mahe', 'SCT-4' }, { 'Indian/Maldives', 'MVT-5' }, { 'Indian/Mauritius', 'MUT-4' }, @@ -419,7 +422,7 @@ TZ = { { 'Pacific/Saipan', 'ChST-10' }, { 'Pacific/Tahiti', 'TAHT10' }, { 'Pacific/Tarawa', 'GILT-12' }, - { 'Pacific/Tongatapu', 'TOT-13' }, + { 'Pacific/Tongatapu', '<+13>-13<+14>,M11.1.0,M1.3.0/3' }, { 'Pacific/Wake', 'WAKT-12' }, { 'Pacific/Wallis', 'WFT-12' }, } diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua index a8417e06c8..e5da7c6442 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua @@ -27,7 +27,7 @@ OFFSET = { cot = -18000, -- COT mst = -25200, -- MST mdt = -21600, -- MDT - vet = -16200, -- VET + vet = -14400, -- VET gft = -10800, -- GFT pst = -28800, -- PST pdt = -25200, -- PDT @@ -49,59 +49,31 @@ OFFSET = { egst = 0, -- EGST nst = -12600, -- NST ndt = -9000, -- NDT - awst = 28800, -- AWST - davt = 25200, -- DAVT - ddut = 36000, -- DDUT mist = 39600, -- MIST - mawt = 18000, -- MAWT nzst = 43200, -- NZST nzdt = 46800, -- NZDT - rott = -10800, -- ROTT - syot = 10800, -- SYOT - utc = 0, -- UTC - vost = 21600, -- VOST - almt = 21600, -- ALMT - anat = 43200, -- ANAT - aqtt = 18000, -- AQTT - tmt = 18000, -- TMT - azt = 14400, -- AZT ict = 25200, -- ICT - kgt = 21600, -- KGT bnt = 28800, -- BNT - yakt = 32400, -- YAKT chot = 28800, -- CHOT chost = 32400, -- CHOST - ist = 19800, -- IST bdt = 21600, -- BDT tlt = 32400, -- TLT gst = 14400, -- GST - tjt = 18000, -- TJT hkt = 28800, -- HKT hovt = 25200, -- HOVT hovst = 28800, -- HOVST - irkt = 28800, -- IRKT wib = 25200, -- WIB wit = 32400, -- WIT + ist = 7200, -- IST + idt = 10800, -- IDT aft = 16200, -- AFT - pett = 43200, -- PETT pkt = 18000, -- PKT npt = 20700, -- NPT - krat = 25200, -- KRAT myt = 28800, -- MYT - magt = 36000, -- MAGT wita = 28800, -- WITA pht = 28800, -- PHT - novt = 21600, -- NOVT - omst = 21600, -- OMST - orat = 18000, -- ORAT kst = 30600, -- KST - qyzt = 21600, -- QYZT - mmt = 23400, -- MMT - sakt = 39600, -- SAKT - uzt = 18000, -- UZT sgt = 28800, -- SGT - sret = 39600, -- SRET - get = 14400, -- GET irst = 12600, -- IRST irdt = 16200, -- IRDT btt = 21600, -- BTT @@ -109,8 +81,7 @@ OFFSET = { ulat = 28800, -- ULAT ulast = 32400, -- ULAST xjt = 21600, -- XJT - vlat = 36000, -- VLAT - yekt = 18000, -- YEKT + mmt = 23400, -- MMT azot = -3600, -- AZOT azost = 0, -- AZOST cvt = -3600, -- CVT @@ -121,12 +92,11 @@ OFFSET = { acwst = 31500, -- ACWST lhst = 37800, -- LHST lhdt = 39600, -- LHDT + awst = 28800, -- AWST msk = 10800, -- MSK - samt = 14400, -- SAMT iot = 21600, -- IOT cxt = 25200, -- CXT cct = 23400, -- CCT - tft = 18000, -- TFT sct = 14400, -- SCT mvt = 18000, -- MVT mut = 14400, -- MUT @@ -163,7 +133,6 @@ OFFSET = { ckt = -36000, -- CKT taht = -36000, -- TAHT gilt = 43200, -- GILT - tot = 46800, -- TOT wakt = 43200, -- WAKT wft = 43200, -- WFT } diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 1e44147752..3012e8ef08 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -289,8 +289,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Es crearà una xarxa addicional si deixes això sense marcar." +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1539,12 +1539,12 @@ msgstr "Es requereix JavaScript!" msgid "Join Network" msgstr "Uneix-te a la xarxa" -msgid "Join Network: Settings" -msgstr "Unir-se a la xarxa: Ajusts" - msgid "Join Network: Wireless Scan" msgstr "" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "" @@ -2271,7 +2271,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3593,6 +3593,12 @@ msgstr "sí" msgid "« Back" msgstr "« Enrere" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "Es crearà una xarxa addicional si deixes això sense marcar." + +#~ msgid "Join Network: Settings" +#~ msgstr "Unir-se a la xarxa: Ajusts" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index b0ab326d00..082f0bb6ea 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -289,8 +289,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Pokud není zaškrtnuto, bude vytvořena dodatečná síť." +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1552,12 +1552,12 @@ msgstr "Vyžadován JavaScript!" msgid "Join Network" msgstr "Připojit k síti" -msgid "Join Network: Settings" -msgstr "Připojit k síti: nastavení" - msgid "Join Network: Wireless Scan" msgstr "Připojit k síti: Vyhledání bezdrátových sítí" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Zachovat nastavení" @@ -2296,7 +2296,7 @@ msgstr "" "Po takovém množství LCP echo selhání předpokládám, že peer je mrtvý. " "Použijte 0 pro ignorování chyb" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3663,6 +3663,12 @@ msgstr "ano" msgid "« Back" msgstr "« Zpět" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "Pokud není zaškrtnuto, bude vytvořena dodatečná síť." + +#~ msgid "Join Network: Settings" +#~ msgstr "Připojit k síti: nastavení" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 8d72612134..2fe3b80e49 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -288,9 +288,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." +msgid "An additional network will be created if you leave this checked." msgstr "" -"Erzeugt ein zusätzliches Netzwerk wenn diese Option nicht ausgewählt ist" msgid "Annex" msgstr "" @@ -1553,12 +1552,12 @@ msgstr "Java-Script benötigt!" msgid "Join Network" msgstr "Netzwerk beitreten" -msgid "Join Network: Settings" -msgstr "Netzwerk beitreten: Einstellungen" - msgid "Join Network: Wireless Scan" msgstr "Netzwerk beitreten: Suche nach Netzwerken" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Konfiguration behalten" @@ -2302,7 +2301,7 @@ msgstr "" "Deklariere den Client als tot nach der angegebenen Anzahl von LCP Echo " "Fehlschlägen, nutze den Wert 0 um Fehler zu ignorieren" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3688,6 +3687,13 @@ msgstr "ja" msgid "« Back" msgstr "« Zurück" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "" +#~ "Erzeugt ein zusätzliches Netzwerk wenn diese Option nicht ausgewählt ist" + +#~ msgid "Join Network: Settings" +#~ msgstr "Netzwerk beitreten: Einstellungen" + #~ msgid "CPU" #~ msgstr "Prozessor" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 7b716ada36..0d35022889 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -296,8 +296,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Ένα επιπλέον δίκτυο θα δημιουργηθεί εάν αυτό αφεθεί κενό" +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1567,10 +1567,10 @@ msgstr "Απαιτείται Javascript!" msgid "Join Network" msgstr "" -msgid "Join Network: Settings" +msgid "Join Network: Wireless Scan" msgstr "" -msgid "Join Network: Wireless Scan" +msgid "Joining Network: %q" msgstr "" msgid "Keep settings" @@ -2301,7 +2301,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" #, fuzzy @@ -3615,6 +3615,9 @@ msgstr "ναι" msgid "« Back" msgstr "« Πίσω" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "Ένα επιπλέον δίκτυο θα δημιουργηθεί εάν αυτό αφεθεί κενό" + #~ msgid "Port %d" #~ msgstr "Θύρα %d" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 82a4e72542..b032f49709 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -287,8 +287,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "An additional network will be created if you leave this unchecked." +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1536,10 +1536,10 @@ msgstr "" msgid "Join Network" msgstr "Join Network" -msgid "Join Network: Settings" +msgid "Join Network: Wireless Scan" msgstr "" -msgid "Join Network: Wireless Scan" +msgid "Joining Network: %q" msgstr "" msgid "Keep settings" @@ -2268,7 +2268,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3571,5 +3571,8 @@ msgstr "" msgid "« Back" msgstr "« Back" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "An additional network will be created if you leave this unchecked." + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index de9a645324..f69add2f9b 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -293,8 +293,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Se creará una red adicional si deja esto desmarcado." +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1566,12 +1566,12 @@ msgstr "¡Se necesita JavaScript!" msgid "Join Network" msgstr "Unirse a Red" -msgid "Join Network: Settings" -msgstr "Unirse a Red: Configuración" - msgid "Join Network: Wireless Scan" msgstr "Unirse a una red: Exploración inalámbrica" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Conservar la configuración del router" @@ -2310,7 +2310,7 @@ msgstr "" "Asumir que el otro estará muerto tras estos fallos de echo LCP, use 0 para " "ignorar fallos" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3691,6 +3691,12 @@ msgstr "sí" msgid "« Back" msgstr "« Volver" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "Se creará una red adicional si deja esto desmarcado." + +#~ msgid "Join Network: Settings" +#~ msgstr "Unirse a Red: Configuración" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index fcde931c79..b7d811962a 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -299,8 +299,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Un réseau supplémentaire sera créé si vous laissé ceci décoché." +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1577,12 +1577,12 @@ msgstr "Nécessite un Script Java !" msgid "Join Network" msgstr "Rejoindre un réseau" -msgid "Join Network: Settings" -msgstr "Rejoindre un réseau : paramètres" - msgid "Join Network: Wireless Scan" msgstr "Rejoindre un réseau : recherche des réseaux sans-fil" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Garder le paramètrage" @@ -2323,7 +2323,7 @@ msgstr "" "Suppose que le distant a disparu une fois le nombre donné d'erreurs d'échos " "LCP ; utiliser 0 pour ignorer ces erreurs" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3709,6 +3709,12 @@ msgstr "oui" msgid "« Back" msgstr "« Retour" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "Un réseau supplémentaire sera créé si vous laissé ceci décoché." + +#~ msgid "Join Network: Settings" +#~ msgstr "Rejoindre un réseau : paramètres" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 3c2d784707..71fe9ce7cd 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -286,9 +286,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -#, fuzzy -msgid "An additional network will be created if you leave this unchecked." -msgstr "רשת נוספת תווצר אם תשאיר את זה לא מסומן" +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1512,10 +1511,10 @@ msgstr "" msgid "Join Network" msgstr "" -msgid "Join Network: Settings" +msgid "Join Network: Wireless Scan" msgstr "" -msgid "Join Network: Wireless Scan" +msgid "Joining Network: %q" msgstr "" msgid "Keep settings" @@ -2236,7 +2235,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3524,5 +3523,9 @@ msgstr "כן" msgid "« Back" msgstr "<< אחורה" +#, fuzzy +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "רשת נוספת תווצר אם תשאיר את זה לא מסומן" + #~ msgid "CPU" #~ msgstr "מעבד" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index d71bd6907a..4ce03515dc 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -292,8 +292,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Amennyiben ezt jelöletlenül hagyja, egy további hálózat jön létre" +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1566,12 +1566,12 @@ msgstr "Javascript szükséges!" msgid "Join Network" msgstr "Csatlakozás a hálózathoz" -msgid "Join Network: Settings" -msgstr "Csatlakozás a hálózathoz: Beállítások" - msgid "Join Network: Wireless Scan" msgstr "Csatlakozás a hálózathoz: vezetéknélküli hálózatok keresése" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Beállítások megtartása" @@ -2313,7 +2313,7 @@ msgstr "" "A peer halottnak tekintése a megadott számú LCP echo hibák után. Használjon " "0-t a hibák figyelmen kívül hagyásához." -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3698,6 +3698,12 @@ msgstr "igen" msgid "« Back" msgstr "« Vissza" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "Amennyiben ezt jelöletlenül hagyja, egy további hálózat jön létre" + +#~ msgid "Join Network: Settings" +#~ msgstr "Csatlakozás a hálózathoz: Beállítások" + #~ msgid "CPU" #~ msgstr "Processzor" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 2bc5ddabf4..db7c4b4aa2 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -299,8 +299,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Sarà creata una rete aggiuntiva se lasci questo senza spunta." +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1568,12 +1568,12 @@ msgstr "Richiesto Java Script!" msgid "Join Network" msgstr "Aggiungi Rete" -msgid "Join Network: Settings" -msgstr "Aggiunta Rete: Impostazioni" - msgid "Join Network: Wireless Scan" msgstr "Aggiunta Rete: Rilevamento Wireless" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Mantieni le Impostazioni" @@ -2307,7 +2307,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3651,6 +3651,12 @@ msgstr "Sì" msgid "« Back" msgstr "« Indietro" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "Sarà creata una rete aggiuntiva se lasci questo senza spunta." + +#~ msgid "Join Network: Settings" +#~ msgstr "Aggiunta Rete: Impostazioni" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 740c676a8b..d2a953f0ae 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -286,8 +286,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "チェックボックスがオフの場合、追加のネットワークが作成されます。" +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1549,12 +1549,12 @@ msgstr "JavaScriptを有効にしてください!" msgid "Join Network" msgstr "ネットワークに接続する" -msgid "Join Network: Settings" -msgstr "ネットワークに接続する: 設定" - msgid "Join Network: Wireless Scan" msgstr "ネットワークに接続する: 無線LANスキャン" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "設定を保持する" @@ -2290,7 +2290,7 @@ msgstr "" "設定回数のLCP echo 確認失敗後、ピアノードがダウンしているものと見なします。0" "を設定した場合、失敗しても無視します" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3661,6 +3661,12 @@ msgstr "はい" msgid "« Back" msgstr "« 戻る" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "チェックボックスがオフの場合、追加のネットワークが作成されます。" + +#~ msgid "Join Network: Settings" +#~ msgstr "ネットワークに接続する: 設定" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index 5e348d69fe..3aaf0c0185 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -276,7 +276,7 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." +msgid "An additional network will be created if you leave this checked." msgstr "" msgid "Annex" @@ -1507,10 +1507,10 @@ msgstr "" msgid "Join Network" msgstr "Gabung Rangkaian" -msgid "Join Network: Settings" +msgid "Join Network: Wireless Scan" msgstr "" -msgid "Join Network: Wireless Scan" +msgid "Joining Network: %q" msgstr "" msgid "Keep settings" @@ -2240,7 +2240,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index 793d381c2e..579ea24669 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -285,8 +285,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Et nytt nettverk vil bli opprettet hvis du tar bort haken." +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1544,12 +1544,12 @@ msgstr "Java Script kreves!" msgid "Join Network" msgstr "Koble til nettverket" -msgid "Join Network: Settings" -msgstr "Koble til nettverk: Innstilling" - msgid "Join Network: Wireless Scan" msgstr "Koble til nettverk: Trådløs Skanning" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Behold innstillinger" @@ -2288,7 +2288,7 @@ msgstr "" "Annta at peer er uten forbindelse om angitt LCP ekko feiler, bruk verdi 0 " "for å overse feil" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3663,6 +3663,12 @@ msgstr "ja" msgid "« Back" msgstr "« Tilbake" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "Et nytt nettverk vil bli opprettet hvis du tar bort haken." + +#~ msgid "Join Network: Settings" +#~ msgstr "Koble til nettverk: Innstilling" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 4e6152c033..4619ad283f 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -300,9 +300,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." +msgid "An additional network will be created if you leave this checked." msgstr "" -"Zostanie utworzona dodatkowa sieć jeśli zostawisz tą opcję niezaznaczoną." msgid "Annex" msgstr "" @@ -1590,12 +1589,12 @@ msgstr "Java Script jest wymagany!" msgid "Join Network" msgstr "Połącz z siecią" -msgid "Join Network: Settings" -msgstr "Przyłącz do sieci: Ustawienia" - msgid "Join Network: Wireless Scan" msgstr "Przyłącz do sieci: Skanuj sieci WiFi" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Zachowaj ustawienia" @@ -2336,7 +2335,7 @@ msgstr "" "Zakładaj że klient jest martwy po danej ilości błedów odpowiedzi echa LCP, " "wpisz 0 aby zignorować błędy" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3730,6 +3729,13 @@ msgstr "tak" msgid "« Back" msgstr "« Wróć" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "" +#~ "Zostanie utworzona dodatkowa sieć jeśli zostawisz tą opcję niezaznaczoną." + +#~ msgid "Join Network: Settings" +#~ msgstr "Przyłącz do sieci: Ustawienia" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index fda160503c..e61ad6c820 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -300,8 +300,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Uma rede adicional será criada se você deixar isto desmarcado." +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1585,12 +1585,12 @@ msgstr "É necessário Java Script!" msgid "Join Network" msgstr "Conectar à Rede" -msgid "Join Network: Settings" -msgstr "Conectar à Rede: Configurações" - msgid "Join Network: Wireless Scan" msgstr "Conectar à Rede: Busca por Rede Sem Fio" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Manter configurações" @@ -2341,7 +2341,7 @@ msgstr "" "Assumir que o parceiro está morto depois de uma data quantidade de falhas de " "echo do LCP. Use 0 para ignorar as falhas" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3734,6 +3734,12 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "Uma rede adicional será criada se você deixar isto desmarcado." + +#~ msgid "Join Network: Settings" +#~ msgstr "Conectar à Rede: Configurações" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 05bdb76ff9..126ce5372c 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -298,8 +298,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Uma rede adicional será criada se deixar isto desmarcado." +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1568,12 +1568,12 @@ msgstr "É necessário Javascript!" msgid "Join Network" msgstr "Associar Rede" -msgid "Join Network: Settings" -msgstr "Associar Rede: Definições" - msgid "Join Network: Wireless Scan" msgstr "Associar Rede: Procurar Redes Wireless" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Manter definições" @@ -2308,7 +2308,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3659,6 +3659,12 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "Uma rede adicional será criada se deixar isto desmarcado." + +#~ msgid "Join Network: Settings" +#~ msgstr "Associar Rede: Definições" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 73f9fb19f2..58a22c0d3b 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -284,9 +284,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." +msgid "An additional network will be created if you leave this checked." msgstr "" -"Daca lasati aceasta optiune neselectata va fi creata o retea aditionala" msgid "Annex" msgstr "" @@ -1509,10 +1508,10 @@ msgstr "Ai nevoie de Java Script !" msgid "Join Network" msgstr "" -msgid "Join Network: Settings" +msgid "Join Network: Wireless Scan" msgstr "" -msgid "Join Network: Wireless Scan" +msgid "Joining Network: %q" msgstr "" msgid "Keep settings" @@ -2233,7 +2232,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3516,6 +3515,10 @@ msgstr "da" msgid "« Back" msgstr "« Inapoi" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "" +#~ "Daca lasati aceasta optiune neselectata va fi creata o retea aditionala" + #~ msgid "CPU" #~ msgstr "Procesor" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 34dde6bb10..cb7bfc1ec5 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -297,8 +297,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Если вы не выберите эту опцию, то будет создана дополнительная сеть." +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1572,12 +1572,12 @@ msgstr "Требуется Java Script!" msgid "Join Network" msgstr "Подключение к сети" -msgid "Join Network: Settings" -msgstr "Подключение к сети: настройки" - msgid "Join Network: Wireless Scan" msgstr "Подключение к сети: сканирование" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Сохранить настройки" @@ -2318,7 +2318,7 @@ msgstr "" "Предполагать, что узел недоступен после указанного количества ошибок " "получения эхо-пакета LCP, введите 0 для игнорирования ошибок" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3701,6 +3701,13 @@ msgstr "да" msgid "« Back" msgstr "« Назад" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "" +#~ "Если вы не выберите эту опцию, то будет создана дополнительная сеть." + +#~ msgid "Join Network: Settings" +#~ msgstr "Подключение к сети: настройки" + #~ msgid "CPU" #~ msgstr "ЦП" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index 0d87051247..a715a59e10 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -270,7 +270,7 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." +msgid "An additional network will be created if you leave this checked." msgstr "" msgid "Annex" @@ -1483,10 +1483,10 @@ msgstr "" msgid "Join Network" msgstr "" -msgid "Join Network: Settings" +msgid "Join Network: Wireless Scan" msgstr "" -msgid "Join Network: Wireless Scan" +msgid "Joining Network: %q" msgstr "" msgid "Keep settings" @@ -2207,7 +2207,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 73a88b8616..4c08e4e1e8 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -276,7 +276,7 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." +msgid "An additional network will be created if you leave this checked." msgstr "" msgid "Annex" @@ -1489,10 +1489,10 @@ msgstr "" msgid "Join Network" msgstr "" -msgid "Join Network: Settings" +msgid "Join Network: Wireless Scan" msgstr "" -msgid "Join Network: Wireless Scan" +msgid "Joining Network: %q" msgstr "" msgid "Keep settings" @@ -2213,7 +2213,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index df2892b88f..a10dbea5c9 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -263,7 +263,7 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." +msgid "An additional network will be created if you leave this checked." msgstr "" msgid "Annex" @@ -1476,10 +1476,10 @@ msgstr "" msgid "Join Network" msgstr "" -msgid "Join Network: Settings" +msgid "Join Network: Wireless Scan" msgstr "" -msgid "Join Network: Wireless Scan" +msgid "Joining Network: %q" msgstr "" msgid "Keep settings" @@ -2200,7 +2200,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index a5a5338979..d674f5154c 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -283,7 +283,7 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." +msgid "An additional network will be created if you leave this checked." msgstr "" msgid "Annex" @@ -1496,10 +1496,10 @@ msgstr "" msgid "Join Network" msgstr "" -msgid "Join Network: Settings" +msgid "Join Network: Wireless Scan" msgstr "" -msgid "Join Network: Wireless Scan" +msgid "Joining Network: %q" msgstr "" msgid "Keep settings" @@ -2220,7 +2220,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index 95c686e282..b1fe0e7937 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -307,8 +307,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "Якщо ви залишите це невибраним, буде створена додаткова мережа." +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1579,12 +1579,12 @@ msgstr "Потрібен Java Script!" msgid "Join Network" msgstr "Підключення до мережі" -msgid "Join Network: Settings" -msgstr "Підключення до мережі: Настройки" - msgid "Join Network: Wireless Scan" msgstr "Підключення до мережі: Сканування бездротових мереж" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "Зберегти настройки" @@ -2329,7 +2329,7 @@ msgstr "" "Вважати вузол недоступним після визначеної кількості невдач отримання ехо-" "пакета LCP, використовуйте 0, щоб ігнорувати невдачі" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3716,6 +3716,12 @@ msgstr "так" msgid "« Back" msgstr "« Назад" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "Якщо ви залишите це невибраним, буде створена додаткова мережа." + +#~ msgid "Join Network: Settings" +#~ msgstr "Підключення до мережі: Настройки" + #~ msgid "CPU" #~ msgstr "ЦП" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index 0e378565ae..0160c97f36 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -277,7 +277,7 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." +msgid "An additional network will be created if you leave this checked." msgstr "" msgid "Annex" @@ -1511,10 +1511,10 @@ msgstr "" msgid "Join Network" msgstr "" -msgid "Join Network: Settings" +msgid "Join Network: Wireless Scan" msgstr "" -msgid "Join Network: Wireless Scan" +msgid "Joining Network: %q" msgstr "" msgid "Keep settings" @@ -2243,7 +2243,7 @@ msgid "" "ignore failures" msgstr "" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index dbc4df8091..a2d1e47132 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -283,8 +283,8 @@ msgstr "" msgid "Always announce default router" msgstr "总是广播默认路由" -msgid "An additional network will be created if you leave this unchecked." -msgstr "取消选中将会另外创建一个新网络，而不会覆盖当前网络设置" +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1508,12 +1508,12 @@ msgstr "需要Java Script！" msgid "Join Network" msgstr "加入网络" -msgid "Join Network: Settings" -msgstr "加入网络:设置" - msgid "Join Network: Wireless Scan" msgstr "加入网络:搜索无线" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "保留配置" @@ -2233,7 +2233,7 @@ msgid "" "ignore failures" msgstr "在指定数量的LCP响应故障后假定链路已断开，0为忽略故障" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3556,6 +3556,12 @@ msgstr "是" msgid "« Back" msgstr "« 后退" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "取消选中将会另外创建一个新网络，而不会覆盖当前网络设置" + +#~ msgid "Join Network: Settings" +#~ msgstr "加入网络:设置" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index d1d17ad916..2845c9999d 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -280,8 +280,8 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this unchecked." -msgstr "取消選取將會另外建立一個新網路，而不會覆蓋目前的網路設定" +msgid "An additional network will be created if you leave this checked." +msgstr "" msgid "Annex" msgstr "" @@ -1519,12 +1519,12 @@ msgstr "需要Java腳本" msgid "Join Network" msgstr "加入網路" -msgid "Join Network: Settings" -msgstr "加入網路的設定" - msgid "Join Network: Wireless Scan" msgstr "加入網路:無線網路掃描" +msgid "Joining Network: %q" +msgstr "" + msgid "Keep settings" msgstr "保持設定值" @@ -2248,7 +2248,7 @@ msgid "" "ignore failures" msgstr "假若在給于多次的 LCP 呼叫失敗後終點將死, 使用0忽略失敗" -msgid "Prevent listening on thise interfaces." +msgid "Prevent listening on these interfaces." msgstr "" msgid "Prevents client-to-client communication" @@ -3582,6 +3582,12 @@ msgstr "是的" msgid "« Back" msgstr "« 倒退" +#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgstr "取消選取將會另外建立一個新網路，而不會覆蓋目前的網路設定" + +#~ msgid "Join Network: Settings" +#~ msgstr "加入網路的設定" + #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/root/etc/config/luci b/modules/luci-base/root/etc/config/luci index a443742f93..baa3ac5d1e 100644 --- a/modules/luci-base/root/etc/config/luci +++ b/modules/luci-base/root/etc/config/luci @@ -22,8 +22,3 @@ config internal ccache option enable 1 config internal themes - -config internal 'diag' - option ping 'dev.openwrt.org' - option route 'dev.openwrt.org' - option dns 'dev.openwrt.org' diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua index aaf045ca2c..10636a491a 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua @@ -251,7 +251,7 @@ o:depends("nonwildcard", true) o = s:taboption("general", DynamicList, "notinterface", translate("Exclude interfaces"), - translate("Prevent listening on thise interfaces.")) + translate("Prevent listening on these interfaces.")) o.optional = true o:depends("nonwildcard", true) diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua index 96b8b4d740..05b27a9f0c 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua @@ -16,7 +16,7 @@ if not iw then return end -m = SimpleForm("network", translate("Join Network: Settings")) +m = SimpleForm("network", translate("Joining Network: %q", http.formvalue("join"))) m.cancel = translate("Back to scan results") m.reset = false @@ -44,9 +44,9 @@ m.hidden = { if iw and iw.mbssid_support then replace = m:field(Flag, "replace", translate("Replace wireless configuration"), - translate("An additional network will be created if you leave this unchecked.")) + translate("An additional network will be created if you leave this checked.")) - function replace.cfgvalue() return "1" end + function replace.cfgvalue() return "0" end else replace = m:field(DummyValue, "replace", translate("Replace wireless configuration")) replace.default = translate("The hardware is not multi-SSID capable and the existing " .. diff --git a/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full b/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full new file mode 100755 index 0000000000..372eb15122 --- /dev/null +++ b/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full @@ -0,0 +1,22 @@ +#!/bin/sh + +if [ "$(uci -q get luci.diag)" != "internal" ]; then + host="" + + if [ -s /etc/os-release ]; then + . /etc/os-release + host="${HOME_URL:-${BUG_URL:-$LEDE_DEVICE_MANUFACTURER_URL}}" + host="${host#*://}" + host="${host%%/*}" + fi + + uci -q batch <<-EOF >/dev/null + set luci.diag=internal + set luci.diag.dns='${host:-openwrt.org}' + set luci.diag.ping='${host:-openwrt.org}' + set luci.diag.route='${host:-openwrt.org}' + commit luci + EOF +fi + +exit 0 |