diff options
Diffstat (limited to 'applications/luci-app-travelmate')
10 files changed, 379 insertions, 243 deletions
diff --git a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua index 775831d9d0..0c5890810e 100644 --- a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua +++ b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua @@ -27,7 +27,6 @@ function index() entry({"admin", "services", "travelmate", "logread"}, call("logread"), nil).leaf = true entry({"admin", "services", "travelmate", "status"}, call("status_update"), nil).leaf = true entry({"admin", "services", "travelmate", "action"}, call("trm_action"), nil).leaf = true - entry({"admin", "services", "travelmate", "apqr"}, template("travelmate/ap_qr")).leaf = true entry({"admin", "services", "travelmate", "wifiscan"}, template("travelmate/wifi_scan")).leaf = true entry({"admin", "services", "travelmate", "wifiadd"}, form("travelmate/wifi_add", {hideresetbtn=true, hidesavebtn=true})).leaf = true entry({"admin", "services", "travelmate", "wifiedit"}, form("travelmate/wifi_edit", {hideresetbtn=true, hidesavebtn=true})).leaf = true diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua index a1a7ed72c3..9ba4cf3bf2 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -56,7 +56,7 @@ end s = m:section(NamedSection, "global", "travelmate") -o1 = s:option(Flag, "trm_enabled", translate("Enable travelmate")) +o1 = s:option(Flag, "trm_enabled", translate("Enable Travelmate")) o1.default = o1.disabled o1.rmempty = false @@ -78,18 +78,6 @@ end o3.default = trmiface o3.rmempty = false -if fs.access("/usr/bin/qrencode") then - btn = s:option(Button, "btn", translate("View AP QR-Codes"), - translate("Connect your Android or iOS devices to your router's WiFi using the shown QR code.")) - btn.inputtitle = translate("QR-Codes") - btn.inputstyle = "apply" - btn.disabled = false - - function btn.write() - luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate", "apqr")) - end -end - -- Runtime information ds = s:option(DummyValue, "_dummy") @@ -97,16 +85,15 @@ ds.template = "travelmate/runtime" -- Extra options -e = m:section(NamedSection, "global", "travelmate", translate("Extra options"), +e = m:section(NamedSection, "global", "travelmate", translate("Extra Options"), translate("Options for further tweaking in case the defaults are not suitable for you.")) -e1 = e:option(Flag, "trm_debug", translate("Enable verbose debug logging")) +e1 = e:option(Flag, "trm_debug", translate("Enable Verbose Debug Logging")) e1.default = e1.disabled e1.rmempty = false -e2 = e:option(Value, "trm_radio", translate("Radio selection"), - translate("Restrict travelmate to a dedicated radio, e.g. 'radio0'.")) -e2.datatype = "and(uciname,rangelength(6,6))" +e2 = e:option(Value, "trm_radio", translate("Radio Selection / Order"), + translate("Restrict travelmate to a single radio (e.g. 'radio1') or change the overall scanning order (e.g. 'radio1 radio2 radio0').")) e2.rmempty = true e3 = e:option(Value, "trm_triggerdelay", translate("Trigger Delay"), diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/ap_qr.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/ap_qr.htm deleted file mode 100644 index 3f01a81e35..0000000000 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/ap_qr.htm +++ /dev/null @@ -1,66 +0,0 @@ -<%# -Copyright 2018 Dirk Brenken (dev@brenken.org) -This is free software, licensed under the Apache License, Version 2.0 --%> - -<%+header%> - -<div class="cbi-map"> - <div class="cbi-map-descr"> - <%=translate("Here you'll find the QR codes from all of your configured Access Points. It allows you to connect your Android or iOS devices to your router's WiFi using the QR code shown below.")%> - </div> - <%- local uci = require("luci.model.uci").cursor() - - uci:foreach("wireless", "wifi-iface", function(s) - local device = s.device or "" - local mode = s.mode or "" - local ssid = s.ssid or "" - local enc = s.encryption or "" - local key = s.key or "" - local hidden = s.hidden or "false" - local disabled = s.disabled or "" - local wep_slots = {s.key1 or "", s.key2 or "", s.key3 or "", s.key4 or ""} - - if device and mode == "ap" and disabled ~= "1" then - if string.match(enc, '^psk') then - enc = "WPA" - elseif string.match(enc, '^wep') then - enc = "WEP" - if tonumber(key) then - key = wep_slots[tonumber(key)] - end - elseif enc == "none" then - enc = "nopass" - key = "nokey" - else - enc = "" - end - - if hidden == "1" then - hidden = "true" - end - - if ssid and enc and key then - local e_ssid = string.gsub(ssid,"[\"\\';:, ]",[[\\\%1]]) - local e_key = string.gsub(key,"[\"\\';:, ]",[[\\\%1]]) - local qrcode = "" - - qrcode = luci.sys.exec("/usr/bin/qrencode --inline --8bit --type=SVG --output=- 'WIFI:S:\"'" .. e_ssid .. "'\";T:'" .. enc .. "';P:\"'" .. e_key .. "'\";H:'" .. hidden .. "';'") - -%> - <div class="cbi-section"> - <h3>AP on <%=device%> with SSID "<%=ssid%>"</h3> - <h3><%=qrcode%></h3> - </div> - <%- - end - end - end) - -%> -</div> -<div class="cbi-page-actions right"> - <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/tab_from_cbi')%>" method="post"> - <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>" /> - </form> -</div> - -<%+footer%> diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm index 272612600c..1a53b577d1 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm @@ -75,6 +75,15 @@ This is free software, licensed under the Apache License, Version 2.0 } } + function toggle_qrcode() { + var view = document.getElementById("qrcode"); + if (view.style.display === "none") { + view.style.display = "block"; + } else { + view.style.display = "none"; + } + } + XHR.get('<%=luci.dispatcher.build_url("admin", "services", "travelmate", "status")%>', null, function(x, json_info) { @@ -142,3 +151,74 @@ This is free software, licensed under the Apache License, Version 2.0 <span id="btn1_running" style="display:inline-block; width:16px; height:16px; margin:0 5px"></span> </div> </div> +<div class="cbi-value" id="button_2"> + <label class="cbi-value-title" for="button_2"><%:View AP QR-Codes%></label> + <div class="cbi-value-field"> + <input class="cbi-button cbi-button-apply" type="button" value="<%:Show/Hide QR-Codes%>" onclick="toggle_qrcode()" /> + </div> +</div> +<div class="cbi-value" style="margin-bottom: 0px"> + <span class="cbi-value" style="display: none" id="qrcode"> +<%- + local fs = require("nixio.fs") + local uci = require("luci.model.uci").cursor() + local qrcode + + uci:foreach("wireless", "wifi-iface", function(s) + local device = s.device or "" + local mode = s.mode or "" + local ssid = s.ssid or "" + local enc = s.encryption or "" + local key = s.key or "" + local hidden = s.hidden or "false" + local disabled = s.disabled or "" + local wep_slots = {s.key1 or "", s.key2 or "", s.key3 or "", s.key4 or ""} + + if device and mode == "ap" and disabled ~= "1" then + if string.match(enc, '^psk') then + enc = "WPA" + elseif string.match(enc, '^wep') then + enc = "WEP" + if tonumber(key) then + key = wep_slots[tonumber(key)] + end + elseif enc == "none" then + enc = "nopass" + key = "nokey" + else + enc = "" + end + + if hidden == "1" then + hidden = "true" + end + + if ssid and enc and key then + local e_ssid = string.gsub(ssid,"[\"\\';:, ]",[[\\\%1]]) + local e_key = string.gsub(key,"[\"\\';:, ]",[[\\\%1]]) + + if fs.access("/usr/bin/qrencode") then + qrcode = luci.sys.exec("/usr/bin/qrencode --inline --8bit --type=SVG --output=- 'WIFI:S:\"'" .. e_ssid .. "'\";T:'" .. enc .. "';P:\"'" .. e_key .. "'\";H:'" .. hidden .. "';'") +-%> + <div class="cbi-value" style="border-bottom: 0px; margin-bottom: 0px; padding: 0.25em 0.6em; text-align: left"> + <%=qrcode%> + </div> + <div class="cbi-value" style="border-bottom: 0px; margin-bottom: 0px; padding: 0.25em 0.6em; text-align: left"> + <em><%:AP on %><%=device%><%: with SSID %>"<%=ssid%>"</em> + <hr /> + </div> +<%- + end + end + end + end) + if not qrcode then +-%> + <div class="cbi-value" style="border-bottom: 0px; margin-bottom: 0px; padding: 0.25em 0.6em; text-align: left"> + <em><%:For QR-Code support please install package 'qrencode'!%></em> + </div> +<%- + end +-%> + </span> +</div> diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po index f608a2aa9a..ee081d62d2 100644 --- a/applications/luci-app-travelmate/po/ja/travelmate.po +++ b/applications/luci-app-travelmate/po/ja/travelmate.po @@ -12,6 +12,9 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "Language: ja\n" +msgid "AP on" +msgstr "" + msgid "Action" msgstr "" @@ -59,12 +62,6 @@ msgid "" msgstr "" "トラベル ルーター機能を有効化するための、 Travelmate パッケージの設定です。" -msgid "" -"Connect your Android or iOS devices to your router's WiFi using the shown QR " -"code." -msgstr "" -"Android や iOS デバイスを、表示される QR コードを使用して WiFi に接続します。" - msgid "Connection Limit" msgstr "接続制限" @@ -113,16 +110,16 @@ msgstr "無線アップリンク設定の編集" msgid "Edit this Uplink" msgstr "このアップリンクを編集" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "Travelmate の有効化" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "詳細なデバッグ ログの有効化" msgid "Encryption" msgstr "暗号化" -msgid "Extra options" +msgid "Extra Options" msgstr "拡張オプション" msgid "Faulty Stations" @@ -131,6 +128,9 @@ msgstr "" msgid "Find and join network on" msgstr "ネットワークの検索と参加:" +msgid "For QR-Code support please install package 'qrencode'!" +msgstr "" + msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" @@ -148,15 +148,6 @@ msgid "Force TKIP and CCMP (AES)" msgstr "TKIP と CCMP (AES)" msgid "" -"Here you'll find the QR codes from all of your configured Access Points. It " -"allows you to connect your Android or iOS devices to your router's WiFi " -"using the QR code shown below." -msgstr "" -"ここには、構成済みの全アクセスポイントの QR コードを表示しています。以下の " -"QR コードを使用して、 Android または iOS デバイスをルータの WiFi に接続するこ" -"とができます。" - -msgid "" "How long should travelmate wait for a successful wlan uplink connection." msgstr "Travelmate が無線アップリンクへの接続成功を待つ時間です。" @@ -237,11 +228,8 @@ msgid "" "one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -msgid "QR-Codes" -msgstr "QR-コード" - -msgid "Radio selection" -msgstr "無線の選択" +msgid "Radio Selection / Order" +msgstr "" msgid "Repeat scan" msgstr "再スキャン" @@ -252,8 +240,10 @@ msgstr "" msgid "Restart Travelmate" msgstr "" -msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." -msgstr "Travelmate が指定された無線に接続するよう制御します。（例: 'radio0'）" +msgid "" +"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall " +"scanning order (e.g. 'radio1 radio2 radio0')." +msgstr "" msgid "Retry limit to connect to an uplink." msgstr "アップリンクへの接続を試行する回数です。" @@ -273,6 +263,9 @@ msgstr "保存" msgid "Scan" msgstr "スキャン:" +msgid "Show/Hide QR-Codes" +msgstr "" + msgid "Signal Quality Threshold" msgstr "シグナル品質閾値" @@ -388,6 +381,35 @@ msgstr "" msgid "hidden" msgstr "（ステルス）" +msgid "with SSID" +msgstr "" + +#~ msgid "" +#~ "Connect your Android or iOS devices to your router's WiFi using the shown " +#~ "QR code." +#~ msgstr "" +#~ "Android や iOS デバイスを、表示される QR コードを使用して WiFi に接続しま" +#~ "す。" + +#~ msgid "" +#~ "Here you'll find the QR codes from all of your configured Access Points. " +#~ "It allows you to connect your Android or iOS devices to your router's " +#~ "WiFi using the QR code shown below." +#~ msgstr "" +#~ "ここには、構成済みの全アクセスポイントの QR コードを表示しています。以下" +#~ "の QR コードを使用して、 Android または iOS デバイスをルータの WiFi に接続" +#~ "することができます。" + +#~ msgid "QR-Codes" +#~ msgstr "QR-コード" + +#~ msgid "Radio selection" +#~ msgstr "無線の選択" + +#~ msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." +#~ msgstr "" +#~ "Travelmate が指定された無線に接続するよう制御します。（例: 'radio0'）" + #~ msgid "Last rundate" #~ msgstr "最終実行日時" diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po index 5079c5bc8b..4bc72fe25a 100644 --- a/applications/luci-app-travelmate/po/pt-br/travelmate.po +++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po @@ -114,16 +114,16 @@ msgstr "Editar Configurações da Rede sem fio de saída" msgid "Edit this Uplink" msgstr "Editar Configurações da Rede de saída" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "Habilitar o Travelmate" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "Habilitar os registros de depuração detalhados" msgid "Encryption" msgstr "Cifragem" -msgid "Extra options" +msgid "Extra Options" msgstr "Opções adicionais" msgid "Faulty Stations" diff --git a/applications/luci-app-travelmate/po/ru/travelmate.po b/applications/luci-app-travelmate/po/ru/travelmate.po index b97e76dd05..8d03cfebda 100644 --- a/applications/luci-app-travelmate/po/ru/travelmate.po +++ b/applications/luci-app-travelmate/po/ru/travelmate.po @@ -15,6 +15,9 @@ msgstr "" "Project-Info: Это технический перевод, не дословный. Главное-удобный русский " "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n" +msgid "AP on" +msgstr "" + msgid "Action" msgstr "" @@ -59,11 +62,6 @@ msgid "" "functionality." msgstr "Настройка утилиты TravelMate - помощника путешественника. " -msgid "" -"Connect your Android or iOS devices to your router's WiFi using the shown QR " -"code." -msgstr "" - msgid "Connection Limit" msgstr "Ограничение соединений" @@ -112,16 +110,16 @@ msgstr "Редактировать настройки беспроводной msgid "Edit this Uplink" msgstr "Редактировать настройки сети" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "Включить Travelmate" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "Включить подробное ведение журнала отладки" msgid "Encryption" msgstr "Шифрование" -msgid "Extra options" +msgid "Extra Options" msgstr "Дополнительные настройки" msgid "Faulty Stations" @@ -130,6 +128,9 @@ msgstr "" msgid "Find and join network on" msgstr "Найти сеть для подключения используя" +msgid "For QR-Code support please install package 'qrencode'!" +msgstr "" + msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" @@ -147,12 +148,6 @@ msgid "Force TKIP and CCMP (AES)" msgstr "Назначить TKIP и CCMP (AES)" msgid "" -"Here you'll find the QR codes from all of your configured Access Points. It " -"allows you to connect your Android or iOS devices to your router's WiFi " -"using the QR code shown below." -msgstr "" - -msgid "" "How long should travelmate wait for a successful wlan uplink connection." msgstr "" @@ -233,12 +228,9 @@ msgid "" "one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -msgid "QR-Codes" +msgid "Radio Selection / Order" msgstr "" -msgid "Radio selection" -msgstr "Выбор Wi-Fi устройства" - msgid "Repeat scan" msgstr "Повторить поиск" @@ -248,8 +240,10 @@ msgstr "" msgid "Restart Travelmate" msgstr "" -msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." -msgstr "Выделить TravelMate-у конкретное Wi-Fi устройство, например 'radio0'." +msgid "" +"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall " +"scanning order (e.g. 'radio1 radio2 radio0')." +msgstr "" msgid "Retry limit to connect to an uplink." msgstr "" @@ -269,6 +263,9 @@ msgstr "Сохранить" msgid "Scan" msgstr "Поиск" +msgid "Show/Hide QR-Codes" +msgstr "" + msgid "Signal Quality Threshold" msgstr "" @@ -382,6 +379,16 @@ msgstr "" msgid "hidden" msgstr "скрытый" +msgid "with SSID" +msgstr "" + +#~ msgid "Radio selection" +#~ msgstr "Выбор Wi-Fi устройства" + +#~ msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." +#~ msgstr "" +#~ "Выделить TravelMate-у конкретное Wi-Fi устройство, например 'radio0'." + #~ msgid "Last rundate" #~ msgstr "Дата последнего запуска" diff --git a/applications/luci-app-travelmate/po/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot index b8c235ff48..c712c10658 100644 --- a/applications/luci-app-travelmate/po/templates/travelmate.pot +++ b/applications/luci-app-travelmate/po/templates/travelmate.pot @@ -1,6 +1,9 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" +msgid "AP on" +msgstr "" + msgid "Action" msgstr "" @@ -45,11 +48,6 @@ msgid "" "functionality." msgstr "" -msgid "" -"Connect your Android or iOS devices to your router's WiFi using the shown QR " -"code." -msgstr "" - msgid "Connection Limit" msgstr "" @@ -96,16 +94,16 @@ msgstr "" msgid "Edit this Uplink" msgstr "" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "" msgid "Encryption" msgstr "" -msgid "Extra options" +msgid "Extra Options" msgstr "" msgid "Faulty Stations" @@ -114,6 +112,9 @@ msgstr "" msgid "Find and join network on" msgstr "" +msgid "For QR-Code support please install package 'qrencode'!" +msgstr "" + msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" @@ -129,12 +130,6 @@ msgid "Force TKIP and CCMP (AES)" msgstr "" msgid "" -"Here you'll find the QR codes from all of your configured Access Points. It " -"allows you to connect your Android or iOS devices to your router's WiFi " -"using the QR code shown below." -msgstr "" - -msgid "" "How long should travelmate wait for a successful wlan uplink connection." msgstr "" @@ -213,10 +208,7 @@ msgid "" "one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -msgid "QR-Codes" -msgstr "" - -msgid "Radio selection" +msgid "Radio Selection / Order" msgstr "" msgid "Repeat scan" @@ -228,7 +220,9 @@ msgstr "" msgid "Restart Travelmate" msgstr "" -msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." +msgid "" +"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall " +"scanning order (e.g. 'radio1 radio2 radio0')." msgstr "" msgid "Retry limit to connect to an uplink." @@ -249,6 +243,9 @@ msgstr "" msgid "Scan" msgstr "" +msgid "Show/Hide QR-Codes" +msgstr "" + msgid "Signal Quality Threshold" msgstr "" @@ -353,3 +350,6 @@ msgstr "" msgid "hidden" msgstr "" + +msgid "with SSID" +msgstr "" diff --git a/applications/luci-app-travelmate/po/zh-cn/travelmate.po b/applications/luci-app-travelmate/po/zh-cn/travelmate.po index e52d8e8546..6bfa3532f4 100644 --- a/applications/luci-app-travelmate/po/zh-cn/travelmate.po +++ b/applications/luci-app-travelmate/po/zh-cn/travelmate.po @@ -11,6 +11,12 @@ msgstr "" "PO-Revision-Date: 2018-08-17 17:06+0800\n" "X-Generator: Gtranslator 2.91.7\n" +msgid "AP on" +msgstr "" + +msgid "Action" +msgstr "" + msgid "Add Uplink" msgstr "添加上行连接" @@ -52,11 +58,6 @@ msgid "" "functionality." msgstr "配置 travelmate 包，以启用旅行路由器功能。" -msgid "" -"Connect your Android or iOS devices to your router's WiFi using the shown QR " -"code." -msgstr "使用显示的 QR 码，将您的 Android 或 iOS 设备连接到路由器 WiFi。" - msgid "Connection Limit" msgstr "连接限制" @@ -103,21 +104,27 @@ msgstr "编辑无线上行连接配置" msgid "Edit this Uplink" msgstr "编辑此上行连接" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "启用 travelmate" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "启用详细调试日志" msgid "Encryption" msgstr "加密" -msgid "Extra options" +msgid "Extra Options" msgstr "额外选项" +msgid "Faulty Stations" +msgstr "" + msgid "Find and join network on" msgstr "查找并加入网络" +msgid "For QR-Code support please install package 'qrencode'!" +msgstr "" + msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" @@ -133,14 +140,6 @@ msgid "Force TKIP and CCMP (AES)" msgstr "强制 TKIP 和 CCMP（AES）" msgid "" -"Here you'll find the QR codes from all of your configured Access Points. It " -"allows you to connect your Android or iOS devices to your router's WiFi " -"using the QR code shown below." -msgstr "" -"在这里，您可以找到所有已配置的接入点的 QR 码。您可以使用下面显示的 QR 码，使 " -"Android 或 iOS 设备连接到路由器 WiFi。" - -msgid "" "How long should travelmate wait for a successful wlan uplink connection." msgstr "travelmate 等待 wlan 上行连接成功最长时间。" @@ -159,8 +158,11 @@ msgstr "接口超时" msgid "Interface Wizard" msgstr "接口向导" -msgid "Last rundate" -msgstr "最后运行时间" +msgid "Last Run" +msgstr "" + +msgid "Loading" +msgstr "" msgid "" "Minimum signal quality threshold as percent for conditional uplink (dis-) " @@ -213,22 +215,25 @@ msgstr "私钥路径" msgid "" "Provides an overview of all configured uplinks for the travelmate interface " "(%s). You can edit, delete or re-order existing uplinks or scan for a new " -"one. The currently used uplink is emphasized in blue." +"one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -"此处显示 travelmate 接口（%s）所有已配置上行连接的概述。您可以编辑、删除或重" -"新排序现有连接，或扫描新上行连接。当前使用的上行连接以蓝色突出显示。" - -msgid "QR-Codes" -msgstr "QR 码" -msgid "Radio selection" -msgstr "无线选择" +msgid "Radio Selection / Order" +msgstr "" msgid "Repeat scan" msgstr "重新扫描" -msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." -msgstr "将 travelmate 限制在专用无线电中，如“radio0”。" +msgid "Restart" +msgstr "" + +msgid "Restart Travelmate" +msgstr "" + +msgid "" +"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall " +"scanning order (e.g. 'radio1 radio2 radio0')." +msgstr "" msgid "Retry limit to connect to an uplink." msgstr "连接到上行连接的重试限制。" @@ -248,25 +253,28 @@ msgstr "保存" msgid "Scan" msgstr "扫描" +msgid "Show/Hide QR-Codes" +msgstr "" + msgid "Signal Quality Threshold" msgstr "信号质量阈值" msgid "Signal strength" msgstr "信号强度" -msgid "Station ID (SSID/BSSID)" -msgstr "站点 ID（SSID/BSSID）" +msgid "Station ID (RADIO/SSID/BSSID)" +msgstr "" msgid "Station Interface" msgstr "站点接口" -msgid "Station Radio" -msgstr "站点无线" - msgid "" "The BSSID information '%s' is optional and only required for hidden networks" msgstr "BSSID 信息“%s”是可选的，仅对隐藏网络必需" +msgid "The syslog output, pre-filtered for travelmate related messages only." +msgstr "" + msgid "" "This form allows you to modify the content of the main firewall " "configuration file (/etc/config/firewall)." @@ -287,20 +295,12 @@ msgid "" "configuration file (/etc/config/wireless)." msgstr "此表单允许您修改主无线配置文件（/etc/config/wireless）的内容。" -msgid "" -"This form shows the syslog output, pre-filtered for travelmate related " -"messages only." -msgstr "此表单显示 syslog 输出，仅针对 travelmate 相关消息进行预过滤。" - msgid "This step has only to be done once." msgstr "此步骤只需执行一次。" msgid "Travelmate" msgstr "Travelmate" -msgid "Travelmate Logfile" -msgstr "Travelmate 日志文件" - msgid "Travelmate Status (Quality)" msgstr "Travelmate 状态（质量）" @@ -355,11 +355,64 @@ msgstr "无线扫描" msgid "Wireless Stations" msgstr "无线站点" -msgid "add it to the wan zone of the firewall.<br />" -msgstr "将其添加到防火墙的 wan 区域。<br />" +msgid "add it to the wan zone of the firewall." +msgstr "" msgid "hidden" msgstr "隐藏" -msgid "n/a" -msgstr "n/a" +msgid "with SSID" +msgstr "" + +#~ msgid "" +#~ "Connect your Android or iOS devices to your router's WiFi using the shown " +#~ "QR code." +#~ msgstr "使用显示的 QR 码，将您的 Android 或 iOS 设备连接到路由器 WiFi。" + +#~ msgid "" +#~ "Here you'll find the QR codes from all of your configured Access Points. " +#~ "It allows you to connect your Android or iOS devices to your router's " +#~ "WiFi using the QR code shown below." +#~ msgstr "" +#~ "在这里，您可以找到所有已配置的接入点的 QR 码。您可以使用下面显示的 QR 码，" +#~ "使 Android 或 iOS 设备连接到路由器 WiFi。" + +#~ msgid "Last rundate" +#~ msgstr "最后运行时间" + +#~ msgid "" +#~ "Provides an overview of all configured uplinks for the travelmate " +#~ "interface (%s). You can edit, delete or re-order existing uplinks or scan " +#~ "for a new one. The currently used uplink is emphasized in blue." +#~ msgstr "" +#~ "此处显示 travelmate 接口（%s）所有已配置上行连接的概述。您可以编辑、删除或" +#~ "重新排序现有连接，或扫描新上行连接。当前使用的上行连接以蓝色突出显示。" + +#~ msgid "QR-Codes" +#~ msgstr "QR 码" + +#~ msgid "Radio selection" +#~ msgstr "无线选择" + +#~ msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." +#~ msgstr "将 travelmate 限制在专用无线电中，如“radio0”。" + +#~ msgid "Station ID (SSID/BSSID)" +#~ msgstr "站点 ID（SSID/BSSID）" + +#~ msgid "Station Radio" +#~ msgstr "站点无线" + +#~ msgid "" +#~ "This form shows the syslog output, pre-filtered for travelmate related " +#~ "messages only." +#~ msgstr "此表单显示 syslog 输出，仅针对 travelmate 相关消息进行预过滤。" + +#~ msgid "Travelmate Logfile" +#~ msgstr "Travelmate 日志文件" + +#~ msgid "add it to the wan zone of the firewall.<br />" +#~ msgstr "将其添加到防火墙的 wan 区域。<br />" + +#~ msgid "n/a" +#~ msgstr "n/a" diff --git a/applications/luci-app-travelmate/po/zh-tw/travelmate.po b/applications/luci-app-travelmate/po/zh-tw/travelmate.po index aa4612b6d0..529bbbdb07 100644 --- a/applications/luci-app-travelmate/po/zh-tw/travelmate.po +++ b/applications/luci-app-travelmate/po/zh-tw/travelmate.po @@ -11,6 +11,12 @@ msgstr "" "PO-Revision-Date: 2018-08-17 17:06+0800\n" "X-Generator: Gtranslator 2.91.7\n" +msgid "AP on" +msgstr "" + +msgid "Action" +msgstr "" + msgid "Add Uplink" msgstr "新增上行連線" @@ -42,7 +48,8 @@ msgstr "強制門戶檢測" msgid "" "Check the internet availability, log captive portal redirections and keep " "the uplink connection 'alive'." -msgstr "檢查網際網路可用性，記錄強制網路門戶重定向，並保持上行連線為“活動”狀態。" +msgstr "" +"檢查網際網路可用性，記錄強制網路門戶重定向，並保持上行連線為“活動”狀態。" msgid "Cipher" msgstr "密碼" @@ -52,11 +59,6 @@ msgid "" "functionality." msgstr "配置 travelmate 包，以啟用旅行路由器功能。" -msgid "" -"Connect your Android or iOS devices to your router's WiFi using the shown QR " -"code." -msgstr "使用顯示的 QR 碼，將您的 Android 或 iOS 裝置連線到路由器 WiFi。" - msgid "Connection Limit" msgstr "連線限制" @@ -103,21 +105,27 @@ msgstr "編輯無線上行連線配置" msgid "Edit this Uplink" msgstr "編輯此上行連線" -msgid "Enable travelmate" +msgid "Enable Travelmate" msgstr "啟用 travelmate" -msgid "Enable verbose debug logging" +msgid "Enable Verbose Debug Logging" msgstr "啟用詳細除錯日誌" msgid "Encryption" msgstr "加密" -msgid "Extra options" +msgid "Extra Options" msgstr "額外選項" +msgid "Faulty Stations" +msgstr "" + msgid "Find and join network on" msgstr "查詢並加入網路" +msgid "For QR-Code support please install package 'qrencode'!" +msgstr "" + msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" @@ -133,14 +141,6 @@ msgid "Force TKIP and CCMP (AES)" msgstr "強制 TKIP 和 CCMP（AES）" msgid "" -"Here you'll find the QR codes from all of your configured Access Points. It " -"allows you to connect your Android or iOS devices to your router's WiFi " -"using the QR code shown below." -msgstr "" -"在這裡，您可以找到所有已配置的接入點的 QR 碼。您可以使用下面顯示的 QR 碼，使 " -"Android 或 iOS 裝置連線到路由器 WiFi。" - -msgid "" "How long should travelmate wait for a successful wlan uplink connection." msgstr "travelmate 等待 wlan 上行連線成功最長時間。" @@ -159,8 +159,11 @@ msgstr "介面超時" msgid "Interface Wizard" msgstr "介面嚮導" -msgid "Last rundate" -msgstr "最後執行時間" +msgid "Last Run" +msgstr "" + +msgid "Loading" +msgstr "" msgid "" "Minimum signal quality threshold as percent for conditional uplink (dis-) " @@ -213,22 +216,25 @@ msgstr "私鑰路徑" msgid "" "Provides an overview of all configured uplinks for the travelmate interface " "(%s). You can edit, delete or re-order existing uplinks or scan for a new " -"one. The currently used uplink is emphasized in blue." +"one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -"此處顯示 travelmate 介面（%s）所有已配置上行連線的概述。您可以編輯、刪除或重" -"新排序現有連線，或掃描新上行連線。當前使用的上行連線以藍色突出顯示。" - -msgid "QR-Codes" -msgstr "QR 碼" -msgid "Radio selection" -msgstr "無線選擇" +msgid "Radio Selection / Order" +msgstr "" msgid "Repeat scan" msgstr "重新掃描" -msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." -msgstr "將 travelmate 限制在專用無線電中，如“radio0”。" +msgid "Restart" +msgstr "" + +msgid "Restart Travelmate" +msgstr "" + +msgid "" +"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall " +"scanning order (e.g. 'radio1 radio2 radio0')." +msgstr "" msgid "Retry limit to connect to an uplink." msgstr "連線到上行連線的重試限制。" @@ -248,25 +254,28 @@ msgstr "儲存" msgid "Scan" msgstr "掃描" +msgid "Show/Hide QR-Codes" +msgstr "" + msgid "Signal Quality Threshold" msgstr "訊號質量閾值" msgid "Signal strength" msgstr "訊號強度" -msgid "Station ID (SSID/BSSID)" -msgstr "站點 ID（SSID/BSSID）" +msgid "Station ID (RADIO/SSID/BSSID)" +msgstr "" msgid "Station Interface" msgstr "站點介面" -msgid "Station Radio" -msgstr "站點無線" - msgid "" "The BSSID information '%s' is optional and only required for hidden networks" msgstr "BSSID 資訊“%s”是可選的，僅對隱藏網路必需" +msgid "The syslog output, pre-filtered for travelmate related messages only." +msgstr "" + msgid "" "This form allows you to modify the content of the main firewall " "configuration file (/etc/config/firewall)." @@ -287,20 +296,12 @@ msgid "" "configuration file (/etc/config/wireless)." msgstr "此表單允許您修改主無線配置檔案（/etc/config/wireless）的內容。" -msgid "" -"This form shows the syslog output, pre-filtered for travelmate related " -"messages only." -msgstr "此表單顯示 syslog 輸出，僅針對 travelmate 相關訊息進行預過濾。" - msgid "This step has only to be done once." msgstr "此步驟只需執行一次。" msgid "Travelmate" msgstr "Travelmate" -msgid "Travelmate Logfile" -msgstr "Travelmate 日誌檔案" - msgid "Travelmate Status (Quality)" msgstr "Travelmate 狀態（質量）" @@ -355,11 +356,64 @@ msgstr "無線掃描" msgid "Wireless Stations" msgstr "無線站點" -msgid "add it to the wan zone of the firewall.<br />" -msgstr "將其新增到防火牆的 wan 區域。<br />" +msgid "add it to the wan zone of the firewall." +msgstr "" msgid "hidden" msgstr "隱藏" -msgid "n/a" -msgstr "n/a" +msgid "with SSID" +msgstr "" + +#~ msgid "" +#~ "Connect your Android or iOS devices to your router's WiFi using the shown " +#~ "QR code." +#~ msgstr "使用顯示的 QR 碼，將您的 Android 或 iOS 裝置連線到路由器 WiFi。" + +#~ msgid "" +#~ "Here you'll find the QR codes from all of your configured Access Points. " +#~ "It allows you to connect your Android or iOS devices to your router's " +#~ "WiFi using the QR code shown below." +#~ msgstr "" +#~ "在這裡，您可以找到所有已配置的接入點的 QR 碼。您可以使用下面顯示的 QR 碼，" +#~ "使 Android 或 iOS 裝置連線到路由器 WiFi。" + +#~ msgid "Last rundate" +#~ msgstr "最後執行時間" + +#~ msgid "" +#~ "Provides an overview of all configured uplinks for the travelmate " +#~ "interface (%s). You can edit, delete or re-order existing uplinks or scan " +#~ "for a new one. The currently used uplink is emphasized in blue." +#~ msgstr "" +#~ "此處顯示 travelmate 介面（%s）所有已配置上行連線的概述。您可以編輯、刪除或" +#~ "重新排序現有連線，或掃描新上行連線。當前使用的上行連線以藍色突出顯示。" + +#~ msgid "QR-Codes" +#~ msgstr "QR 碼" + +#~ msgid "Radio selection" +#~ msgstr "無線選擇" + +#~ msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." +#~ msgstr "將 travelmate 限制在專用無線電中，如“radio0”。" + +#~ msgid "Station ID (SSID/BSSID)" +#~ msgstr "站點 ID（SSID/BSSID）" + +#~ msgid "Station Radio" +#~ msgstr "站點無線" + +#~ msgid "" +#~ "This form shows the syslog output, pre-filtered for travelmate related " +#~ "messages only." +#~ msgstr "此表單顯示 syslog 輸出，僅針對 travelmate 相關訊息進行預過濾。" + +#~ msgid "Travelmate Logfile" +#~ msgstr "Travelmate 日誌檔案" + +#~ msgid "add it to the wan zone of the firewall.<br />" +#~ msgstr "將其新增到防火牆的 wan 區域。<br />" + +#~ msgid "n/a" +#~ msgstr "n/a" |