From b1d8d39ee81ff274ed4c962f3937cc2d494e48f2 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 12 Oct 2020 20:47:08 +0200 Subject: [PATCH 01/22] Remove some firmware --- openmptcprouter-full/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index 55325a354..49d9984d8 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -79,7 +79,7 @@ MY_DEPENDS := \ kmod-rt2800-usb kmod-rtl8xxxu kmod-rtl8192cu kmod-net-rtl8192su \ !TARGET_mvebu:luci-proto-qmi wpad-basic kmod-mt7601u kmod-rtl8187 \ luci-app-mlvpn mlvpn 464xlat !TARGET_mvebu:kmod-usb-net-smsc75xx kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang iptables-mod-ipopt igmpproxy ss iptraf-ng \ - luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware (TARGET_x86||TARGET_x86_64):r8169-firmware (TARGET_x86||TARGET_x86_64):rtl8188eu-firmware (TARGET_x86||TARGET_x86_64):rtl8192ce-firmware (TARGET_x86||TARGET_x86_64):rtl8192cu-firmware kmod-usb2 + luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware kmod-usb2 # luci-theme-bootstrap luci-theme-openwrt-2020 luci-theme-openwrt luci-app-status # luci-proto-bonding luci-app-statistics luci-proto-gre # softethervpn5-client softethervpn5-server luci-app-nginx-ha From bbcaf4bf3d79f36e50b859e139c551542d1595cf Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 12 Oct 2020 20:47:36 +0200 Subject: [PATCH 02/22] Add od as depends for rpi firmware --- bcm27xx-eeprom/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bcm27xx-eeprom/Makefile b/bcm27xx-eeprom/Makefile index 14f3d8ead..fe77996c8 100644 --- a/bcm27xx-eeprom/Makefile +++ b/bcm27xx-eeprom/Makefile @@ -21,7 +21,7 @@ TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) define Package/bcm27xx-eeprom SECTION:=utils CATEGORY:=Utilities - DEPENDS:=bcm27xx-userland +blkid +pciutils +python3-light + DEPENDS:=bcm27xx-userland +blkid +pciutils +python3-light +coreutils-od TITLE:=BCM27xx EEPROM tools endef From a8346e375fd39afba251c9258108e9e80784da20 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 12 Oct 2020 20:47:53 +0200 Subject: [PATCH 03/22] Try to fix mptcp graph --- luci-app-mptcp/luasrc/controller/mptcp.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/luci-app-mptcp/luasrc/controller/mptcp.lua b/luci-app-mptcp/luasrc/controller/mptcp.lua index d40078b17..fb69ac06b 100644 --- a/luci-app-mptcp/luasrc/controller/mptcp.lua +++ b/luci-app-mptcp/luasrc/controller/mptcp.lua @@ -100,7 +100,9 @@ function multipath_bandwidth() res[key][1]=temp1[1] for i=2,60 do res[key][i]={} - res[key][i]=(string.gsub(temp1[i], "%[", " ")) + if temp1[i] ~= nil then + res[key][i]=(string.gsub(temp1[i], "%[", " ")) + end end for i=1,60 do res[key][i] = string.split(res[key][i], ",") From c208a2087a3c528c91be2a45f9b5f8dc602d554a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Oct 2020 08:08:56 +0200 Subject: [PATCH 04/22] Free some disk space --- .github/workflows/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c7626472e..8c96a565a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - OMR_TARGET: [bpi-r2, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64] + OMR_TARGET: [bpi-r2, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64] runs-on: ubuntu-latest continue-on-error: true @@ -25,6 +25,12 @@ jobs: run: | sudo apt-get update sudo apt-get install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler + - name: Free disk space + run: | + sudo apt-get autoremove -y >/dev/null 2>&1 + sudo apt-get autoclean -y >/dev/null 2>&1 + sudo rm -rf /usr/local/lib/android >/dev/null 2>&1 + docker rmi $(docker image ls -aq) >/dev/null 2>&1 - name: Clone source code working-directory: ../../ env: From 2818456b92120ec502e910ca22ee665b4a56efde Mon Sep 17 00:00:00 2001 From: Weblate Admin Date: Wed, 7 Oct 2020 08:05:51 +0000 Subject: [PATCH 05/22] Translated using Weblate (French) Currently translated at 100.0% (30 of 30 strings) Translation: OpenMPTCProuter/LuCI/applications/glorytun Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsglorytun/fr/ --- luci-app-glorytun/po/fr/glorytun.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/luci-app-glorytun/po/fr/glorytun.po b/luci-app-glorytun/po/fr/glorytun.po index 150668013..7b6b678ee 100644 --- a/luci-app-glorytun/po/fr/glorytun.po +++ b/luci-app-glorytun/po/fr/glorytun.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-10-02 08:44+0000\n" +"PO-Revision-Date: 2020-10-07 10:57+0000\n" "Last-Translator: Weblate Admin \n" "Language-Team: French \n" @@ -23,7 +23,7 @@ msgid "Bind address" msgstr "Adresse mappée" msgid "Bind backup" -msgstr "" +msgstr "Lier la sauvegarde" msgid "Bind port" msgstr "Port de connexion" From 419108c35aabcbcdaa256853db19e15d88d01205 Mon Sep 17 00:00:00 2001 From: Weblate Admin Date: Wed, 7 Oct 2020 08:04:16 +0000 Subject: [PATCH 06/22] Translated using Weblate (French) Currently translated at 100.0% (16 of 16 strings) Translation: OpenMPTCProuter/LuCI/applications/mlvpn Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsmlvpn/fr/ --- luci-app-mlvpn/po/fr/mlvpn.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/luci-app-mlvpn/po/fr/mlvpn.po b/luci-app-mlvpn/po/fr/mlvpn.po index 045ef28b2..af2708373 100644 --- a/luci-app-mlvpn/po/fr/mlvpn.po +++ b/luci-app-mlvpn/po/fr/mlvpn.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-09-30 08:50+0000\n" +"PO-Revision-Date: 2020-10-07 10:57+0000\n" "Last-Translator: Weblate Admin \n" "Language-Team: French \n" @@ -26,7 +26,7 @@ msgid "Interface name" msgstr "Nom de l'interface" msgid "Interface will increase port used beginning with this" -msgstr "" +msgstr "L'interface augmentera le port utilisé à partir de celui ci" msgid "Interfaces" msgstr "Interfaces" @@ -35,13 +35,13 @@ msgid "Invalid" msgstr "Invalide" msgid "Loss tolerance" -msgstr "" +msgstr "Tolérance aux pertes" msgid "MLVPN" -msgstr "" +msgstr "MLVPN" msgid "Mode" -msgstr "" +msgstr "Mode" msgid "Password" msgstr "Mot de passe" @@ -53,7 +53,7 @@ msgid "Remote/Bind port" msgstr "Port de connexion distant" msgid "Reorder buffer size" -msgstr "" +msgstr "Taille du tampon de réordonnancement" msgid "Settings" msgstr "Paramètres" From d5e4fe695e835c37c22f9d54e8aa5ba5d1777ce2 Mon Sep 17 00:00:00 2001 From: Weblate Admin Date: Wed, 7 Oct 2020 08:07:37 +0000 Subject: [PATCH 07/22] Translated using Weblate (French) Currently translated at 100.0% (42 of 42 strings) Translation: OpenMPTCProuter/LuCI/applications/mptcp Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsmptcp/fr/ --- luci-app-mptcp/po/fr/mptcp.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/luci-app-mptcp/po/fr/mptcp.po b/luci-app-mptcp/po/fr/mptcp.po index bf4c84adb..f8a44eee9 100644 --- a/luci-app-mptcp/po/fr/mptcp.po +++ b/luci-app-mptcp/po/fr/mptcp.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-10-02 08:44+0000\n" +"PO-Revision-Date: 2020-10-07 10:57+0000\n" "Last-Translator: Weblate Admin \n" "Language-Team: French \n" @@ -101,7 +101,7 @@ msgid "backup" msgstr "remplaçant" msgid "binder" -msgstr "" +msgstr "lier" msgid "default" msgstr "Défaut" @@ -119,10 +119,10 @@ msgid "enabled" msgstr "Activé" msgid "fullmesh" -msgstr "" +msgstr "fullmesh" msgid "handover" -msgstr "" +msgstr "relais" msgid "kB/s" msgstr "Ko/s" From eb7cb7373316b863ee2f5c2b487292307af3761e Mon Sep 17 00:00:00 2001 From: antrouter Date: Tue, 13 Oct 2020 02:29:52 +0000 Subject: [PATCH 08/22] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (237 of 237 strings) Translation: OpenMPTCProuter/LuCI/applications/openmptcprouter Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsopenmptcprouter/zh_Hans/ --- .../po/zh_Hans/openmptcprouter.po | 334 +++++++----------- 1 file changed, 130 insertions(+), 204 deletions(-) diff --git a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po index 15cf61fb0..020a814c3 100644 --- a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-09-02 05:14+0000\n" +"PO-Revision-Date: 2020-10-13 07:30+0000\n" "Last-Translator: antrouter \n" "Language-Team: Chinese (Simplified) \n" @@ -24,17 +24,15 @@ msgstr "简单VPN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:83 msgid "API username to retrieve personnalized settings from the server." -msgstr "API用户名，以从服务器检索个性化设置." +msgstr "API用户名，以从蚂蚁聚合服务器检索个性化设置." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:639 msgid "APN" -msgstr "" +msgstr "APN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:128 -#, fuzzy -#| msgid "Add server" msgid "Add a new server" -msgstr "添加服务器" +msgstr "添加一个新蚂蚁聚合服务器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:790 msgid "Add an interface" @@ -47,7 +45,7 @@ msgstr "高级设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:135 msgid "Advanced settings" -msgstr "高级设置" +msgstr "高级设置-官网55860.com" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:339 msgid "" @@ -67,11 +65,11 @@ msgstr "处理器中集成了高级加密标准（AES）指令集." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:665 msgid "Authentication Type" -msgstr "" +msgstr "认证类型" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:700 msgid "Backup" -msgstr "" +msgstr "备份(商业版55860.com)" #: luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua:22 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm:8 @@ -80,7 +78,7 @@ msgstr "在服务器上备份" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:282 msgid "Balancing" -msgstr "" +msgstr "均衡" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:20 msgid "Beta" @@ -88,70 +86,60 @@ msgstr "测试版" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:288 msgid "Big time difference between the server and the router" -msgstr "" +msgstr "服务器和路由器之间的时间差距很大" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:463 msgid "Bridge" -msgstr "" +msgstr "桥接" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:245 msgid "By default VPN is used for any traffic that is not TCP." msgstr "默认情况下，VPN用于非TCP的任何流量." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:180 -#, fuzzy -#| msgid "By default VPN is used for any traffic that is not TCP." msgid "" "By default proxy is used for any traffic that is TCP (and UDP for V2Ray)." -msgstr "默认情况下，VPN用于非TCP的任何流量." +msgstr "默认情况下，代理用于任何TCP（对于V2Ray是UDP）流量。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:670 msgid "CHAP" -msgstr "" +msgstr "CHAP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:252 -#, fuzzy -#| msgid "Can't access and use server part" msgid "Can\\'t access and use server part" -msgstr "Impossible d'accéder et d'utiliser la partie serveur" +msgstr "无法访问和使用蚂蚁聚合服务器部分服务" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:275 -#, fuzzy -#| msgid "Can't contact Server Admin Script" msgid "Can\\'t contact Server Admin Script" -msgstr "Impossible de contacter le script d'administration du serveur" +msgstr "无法联系蚂蚁聚合服务器管理脚本" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:268 -#, fuzzy -#| msgid "Can't get public IP address from ShadowSocks" msgid "Can\\'t get public IP address from ShadowSocks" -msgstr "Pas d'adresse IP publique récupérée via ShadowSocks" +msgstr "无法从ShadowSocks获取公共蚂蚁聚合IP地址" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:265 -#, fuzzy -#| msgid "Can't ping server" msgid "Can\\'t ping server" -msgstr "Pas de réponse du serveur" +msgstr "无法ping蚂蚁聚合服务器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:467 msgid "" "Choose MacVLAN if you want to create a virtual interface based on a physical " "interface." -msgstr "" +msgstr "如果要基于物理接口创建虚拟接口，请选择MacVLAN。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:404 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:487 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:533 msgid "Choose physical interface." -msgstr "" +msgstr "选择物理接口。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:133 msgid "Common server settings" -msgstr "通用服务器设置蚂蚁聚合" +msgstr "通用蚂蚁聚合服务器设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:130 msgid "Core temp:" -msgstr "Température du cœur :" +msgstr "核心温度:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:373 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:498 @@ -159,20 +147,16 @@ msgid "DHCP" msgstr "DHCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:183 -#, fuzzy -#| msgid "DNS issue: can't resolve hostname" msgid "DNS issue: can\\'t resolve hostname" -msgstr "Soucis DNS : impossible de résoudre le domaine" +msgstr "DNS问题：无法解析主机名" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:266 msgid "Debug" -msgstr "" +msgstr "调试模式" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:182 -#, fuzzy -#| msgid "Default VPN" msgid "Default Proxy" -msgstr "默认VPN" +msgstr "默认代理" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:295 msgid "Default VPN" @@ -187,7 +171,7 @@ msgstr "删除" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:592 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:613 msgid "Device" -msgstr "" +msgstr "设备" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:196 msgid "Disable TCP Fast Open" @@ -198,14 +182,12 @@ msgid "Disable TCP Fast Open on Linux and Shadowsocks configuration" msgstr "在Linux和Shadowsocks配置上禁用TCP快速打开" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:236 -#, fuzzy -#| msgid "Disable gateway ping" msgid "Disable default gateway" -msgstr "禁用网关ping" +msgstr "关闭默认网关" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:241 msgid "Disable default gateway, no internet if VPS are down" -msgstr "" +msgstr "禁用默认网关,如果VPS关闭,则没办法链接互联网" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:186 msgid "Disable external check" @@ -221,7 +203,7 @@ msgstr "禁用网关ping状态检查" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:261 msgid "Disable multipath test using tracebox" -msgstr "" +msgstr "禁止使用tracebox多路径测试" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:57 msgid "" @@ -229,10 +211,8 @@ msgid "" msgstr "禁用防火墙中定义的从服务器到此路由器的端口重定向" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:116 -#, fuzzy -#| msgid "Disable server ping" msgid "Disable server" -msgstr "禁用服务器ping" +msgstr "关闭禁用聚合服务器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:246 msgid "Disable server ping" @@ -243,16 +223,12 @@ msgid "Disable server ping status check" msgstr "禁用服务器ping状态检查" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:256 -#, fuzzy -#| msgid "Disable external check" msgid "Disable tracebox test" -msgstr "禁用外部检查" +msgstr "禁用跟蚂蚁跟踪测试" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:698 -#, fuzzy -#| msgid "Disable IPv6" msgid "Disabled" -msgstr "Désactiver IPv6" +msgstr "关闭" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:741 msgid "Download speed (Kb/s)" @@ -276,55 +252,45 @@ msgid "Enable ShadowSocks Obfuscating" msgstr "启用ShadowSocks混淆" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:206 -#, fuzzy -#| msgid "Disable TCP Fast Open" msgid "Enable TCP Low Latency" -msgstr "禁用TCP Fast Open" +msgstr "启用TCP低延迟" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:271 msgid "Enable debug logs" -msgstr "" +msgstr "启用调试日志" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:697 -#, fuzzy -#| msgid "Enable SQM" msgid "Enabled" -msgstr "开启 SQM" +msgstr "开启" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:217 msgid "Encryption" msgstr "加密" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:238 -#, fuzzy -#| msgid "Encryption method is also used for Glorytun." msgid "Encryption method is used for Shadowsocks, V2Ray, Glorytun and OpenVPN." -msgstr "加密方法也用于Glorytun." +msgstr "加密方法用于Shadowsocks，V2Ray，Glorytun和OpenVPN。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:171 msgid "Filesystem is readonly" msgstr "Système de fichiers en lecture seule" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:150 -#, fuzzy -#| msgid "API username to retrieve personnalized settings from the server." msgid "Force retrieve all keys from server." -msgstr "API用户名，以从服务器检索个性化设置." +msgstr "强制从服务器检索所有密钥。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:145 -#, fuzzy -#| msgid "Server settings" msgid "Force retrieve settings" -msgstr "蚂蚁聚合服务器设定" +msgstr "强制检索设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:659 msgid "GPRS only" -msgstr "" +msgstr "仅GPRS" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:496 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:657 msgid "Gateway DOWN" -msgstr "La passerelle ne répond pas" +msgstr "网关不通" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:253 msgid "Glorytun TCP is used by default for UDP and ICMP" @@ -337,15 +303,15 @@ msgstr "Glorytun密钥" #: luci-app-openmptcprouter/root/usr/share/rpcd/acl.d/luci-app-openmptcprouter.json:3 msgid "Grant UCI access for luci-app-openmptcprouter" -msgstr "" +msgstr "授予UCI访问luci-app-openmptcprouter的权限" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:123 msgid "How often TCP sends out keepalive messages when keepalive is enabled." -msgstr "" +msgstr "启用keepalive时,TCP多久发送一次keepalive消息." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:174 msgid "IPv4 IP default TTL" -msgstr "" +msgstr "IPv4 IP默认TTL" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:128 msgid "IPv4 TCP FIN timeout" @@ -364,16 +330,12 @@ msgid "IPv4 TCP SYN retries" msgstr "IPv4 TCP SYN重试" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:148 -#, fuzzy -#| msgid "IPv4 TCP SYN retries" msgid "IPv4 TCP SYN retries1" -msgstr "IPv4 TCP SYN重试" +msgstr "IPv4 TCP SYN重试1" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:158 -#, fuzzy -#| msgid "IPv4 TCP SYN retries" msgid "IPv4 TCP SYN retries2" -msgstr "IPv4 TCP SYN重试" +msgstr "IPv4 TCP SYN重试2" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:409 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:539 @@ -391,24 +353,20 @@ msgstr "IPv4网络掩码" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:168 msgid "IPv6 Prefix" -msgstr "" +msgstr "IPv6前缀" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:536 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:697 msgid "IPv6 route received" -msgstr "Route IPv6 reçue" +msgstr "经过的IPv6路由" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:156 -#, fuzzy -#| msgid "VPN settings" msgid "IPv6 settings" -msgstr "VPN设置" +msgstr "IPv6设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:204 -#, fuzzy -#| msgid "VPN IPv6 tunnel DOWN" msgid "IPv6 tunnel DOWN" -msgstr "Le tunnel IPv6 ne répond pas" +msgstr "IPv6隧道DOWN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:328 msgid "IPv6:" @@ -425,7 +383,7 @@ msgstr "接口设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:277 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:289 msgid "Key is retrieved from server API by default." -msgstr "" +msgstr "默认情况下，密钥是从服务器API检索的." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:93 msgid "" @@ -434,14 +392,12 @@ msgid "" msgstr "用于服务器配置密钥以及设置的密钥." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:346 -#, fuzzy -#| msgid "Interfaces settings" msgid "LAN interfaces settings" -msgstr "接口设置" +msgstr "局域网接口设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:657 msgid "LTE" -msgstr "" +msgstr "LTE" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:357 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:448 @@ -465,7 +421,7 @@ msgstr "Dernière version disponible" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:125 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:311 msgid "Load:" -msgstr "Charge :" +msgstr "负载:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:277 msgid "MLVPN can replace Glorytun with connections with same latency" @@ -478,11 +434,11 @@ msgstr "MLVPN密码" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:284 msgid "MPTCP is not enabled on the server" -msgstr "MPTCP n'est pas activé sur le serveur" +msgstr "服务器上未启用MPTCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:322 msgid "MPTCP may not be enabled on the server" -msgstr "MPTCP semble ne pas être activé sur le serveur" +msgstr "服务器上可能未启用MPTCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:721 msgid "MPTCP over VPN" @@ -490,11 +446,11 @@ msgstr "通过MPTCP的VPN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:462 msgid "MacVLAN" -msgstr "" +msgstr "Macvlan" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:699 msgid "Master" -msgstr "" +msgstr "主" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:276 msgid "Master interface selection" @@ -510,53 +466,53 @@ msgstr "最小扩展CPU频率" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:654 msgid "Modem default" -msgstr "" +msgstr "调制解调器默认" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:688 msgid "Modem init timeout" -msgstr "" +msgstr "调制解调器初始化超时" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:499 msgid "ModemManager" -msgstr "" +msgstr "调制解调器管理器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:175 msgid "More than one default VPN is enabled" -msgstr "" +msgstr "启用了多个默认VPN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:694 msgid "Multipath TCP" -msgstr "" +msgstr "多路径TCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:519 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:525 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:680 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:686 msgid "Multipath current state is" -msgstr "Multipath est actuellement" +msgstr "多路径当前状态为" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:514 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:675 msgid "Multipath master already defined" -msgstr "Maître multipath déjà défini" +msgstr "已定义多路径主机" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:499 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:660 msgid "Multipath seems to be blocked on the connection" -msgstr "Multipath semble bloquer sur la connexion" +msgstr "多路径似乎在连接上被阻止" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:500 msgid "NCM" -msgstr "" +msgstr "NCM" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:668 msgid "NONE" -msgstr "" +msgstr "无" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:531 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:692 msgid "Network interface duplicated" -msgstr "Interface réseau dupliquée" +msgstr "网络接口重复" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:792 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:794 @@ -570,20 +526,20 @@ msgstr "网络设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:489 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:650 msgid "No IP defined" -msgstr "Aucune IP définie" +msgstr "未定义IP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:207 msgid "No IPv6 access" -msgstr "Pas d'accès IPv6" +msgstr "没有IPv6地址" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:503 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:664 msgid "No Server ping response after 1 second" -msgstr "Pas de réponse du serveur après 1 seconde" +msgstr "1秒后无服务器ping响应" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:271 msgid "No WAN IP address detected in less than 1 second" -msgstr "Aucune adresse IP WAN détectée en moins d'une seconde" +msgstr "不到1秒内未检测到WAN IP地址" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm:24 msgid "No available backup on server." @@ -595,31 +551,25 @@ msgstr "没变" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:712 msgid "No data" -msgstr "Pas de données" +msgstr "没有数据" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:493 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:654 msgid "No gateway defined" -msgstr "Aucune passerelle définie" +msgstr "未定义网关" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:243 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:244 -#, fuzzy -#| msgid "Direct output" msgid "No output" -msgstr "Sortie directe" +msgstr "无输出" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:248 -#, fuzzy -#| msgid "No VPS IP address, No WAN IP address" msgid "No server IP address, No WAN IP address" -msgstr "Pas d'adresse IP du serveur, pas d'adresse IP WAN" +msgstr "没有服务器IP地址，没有WAN IP地址" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:261 -#, fuzzy -#| msgid "No IP defined" msgid "No server defined" -msgstr "Aucune IP définie" +msgstr "未定义蚂蚁聚合服务器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:223 msgid "None" @@ -627,13 +577,13 @@ msgstr "没有" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:461 msgid "Normal" -msgstr "" +msgstr "正常" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:143 msgid "" "Number of times initial SYNs for an active TCP connection attempt will be " "retransmitted." -msgstr "" +msgstr "活动TCP连接尝试的初始SYN的次数将被重新传输." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:83 msgid "Obfuscating plugin" @@ -658,15 +608,15 @@ msgstr "只能将一台服务器作为主服务器，否则将所有服务器都 #: luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua:14 #: luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json:3 msgid "OpenMPTCProuter" -msgstr "多路径TCP路由器" +msgstr "蚂蚁聚合路由器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:339 msgid "OpenVPN can't be used in multi VPS configuration." -msgstr "" +msgstr "OpenVPN不能用于多VPS配置." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:211 msgid "Optimize for latency instead of bandwidth" -msgstr "" +msgstr "优化延迟而不是带宽" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:374 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:503 @@ -675,45 +625,41 @@ msgstr "其他" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:669 msgid "PAP" -msgstr "" +msgstr "PAP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:671 msgid "PAP/CHAP" -msgstr "" +msgstr "PAP/CHAP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:682 -#, fuzzy -#| msgid "MLVPN password" msgid "PAP/CHAP password" -msgstr "MLVPN密码" +msgstr "PAP/CHAP 密码" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:676 msgid "PAP/CHAP username" -msgstr "" +msgstr "PAP/CHAP 账号" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:645 msgid "PIN code" -msgstr "" +msgstr "PIN码" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:501 msgid "PPPoE" -msgstr "" +msgstr "PPPoE拨号" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:383 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:472 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:512 -#, fuzzy -#| msgid "Dynamic master interface" msgid "Physical interface" -msgstr "Interface maître dynamique" +msgstr "物理接口" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:655 msgid "Prefer LTE" -msgstr "" +msgstr "首选LTE" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:656 msgid "Prefer UMTS" -msgstr "" +msgstr "首选 UMTS" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:368 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:493 @@ -721,24 +667,20 @@ msgid "Protocol" msgstr "协议" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:194 -#, fuzzy -#| msgid "ShadowSocks is DISABLED" msgid "Proxy is DISABLED" -msgstr "ShadowSocks est désactivé" +msgstr "代理已禁用" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:179 -#, fuzzy -#| msgid "VPN settings" msgid "Proxy settings" -msgstr "VPN设置" +msgstr "代理设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:333 msgid "Proxy traffic:" -msgstr "" +msgstr "代理流量：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:502 msgid "QMI" -msgstr "" +msgstr "QMI" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:50 msgid "Redirects all ports from server to this router" @@ -749,10 +691,8 @@ msgid "Restore backup" msgstr "恢复备份" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:143 -#, fuzzy -#| msgid "API username to retrieve personnalized settings from the server." msgid "Retrieve settings from server" -msgstr "API用户名，以从服务器检索个性化设置." +msgstr "从服务器检索设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:324 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:799 @@ -785,10 +725,8 @@ msgid "Server IP" msgstr "服务器IP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:72 -#, fuzzy -#| msgid "Server IP will be set for ShadowSocks, Glorytun and MLVPN" msgid "Server IP will be set for proxy and VPN" -msgstr "L'IP du serveur sera configuré pour ShadowSocks, Glorytun et MLVPN" +msgstr "将为代理和VPN设置服务器IP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:88 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:90 @@ -805,10 +743,8 @@ msgid "Server username" msgstr "服务器用户名" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:651 -#, fuzzy -#| msgid "Server key" msgid "Service Type" -msgstr "服务器密钥" +msgstr "服务类型" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:544 msgid "Set an IP in the same network as the modem" @@ -823,16 +759,10 @@ msgid "Set server as master" msgstr "将服务器设置为主服务器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:191 -#, fuzzy -#| msgid "" -#| "Set the default VPN used for UDP and ICMP when ShadowSocks is enabled, " -#| "for all traffic if ShadowSocks is disabled." msgid "" "Set the default Proxy used for TCP when ShadowSocks is enabled, for TCP and " "UDP when V2Ray is enabled." -msgstr "" -"启用ShadowSocks时，为所有流量设置默认的VPN，用于UDP和ICMP，如果禁用" -"ShadowSocks." +msgstr "设置启用ShadowSocks时用于TCP的默认代理，启用V2Ray时设置用于TCP和UDP的默认代理." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:339 msgid "" @@ -854,7 +784,7 @@ msgstr "设置为最大上传速度链接的80-95％之间的值。 0禁用SQM / #: luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua:15 msgid "Settings Wizard" -msgstr "设置向导(蚂蚁聚合)" +msgstr "蚂蚁聚合设置向导" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:153 msgid "ShadowSocks is not running" @@ -891,7 +821,7 @@ msgid "" "The length of time an orphaned (no longer referenced by any application) " "connection will remain in the FIN_WAIT_2 state before it is aborted at the " "local end." -msgstr "" +msgstr "孤立的（不再被任何应用程序引用）连接在本地端中止之前将保持FIN_WAIT_2状态的时间。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:236 msgid "" @@ -904,21 +834,21 @@ msgid "" "This value influences the time, after which TCP decides, that something is " "wrong due to unacknowledged RTO retransmissions, and reports this suspicion " "to the network layer." -msgstr "" +msgstr "此值会影响延时，在此时间之前，TCP决定由于未确认的RTO重传而出了问题，并将这种错误报告给网络层。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:163 msgid "" "This value influences the timeout of an alive TCP connection, when RTO " "retransmissions remain unacknowledged." -msgstr "" +msgstr "当未确认RTO重传时，此值会影响有效TCP连接的超时。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:343 msgid "Total traffic:" -msgstr "" +msgstr "总流量：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:458 msgid "Type" -msgstr "" +msgstr "类型" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:289 msgid "UBOND can replace Glorytun with connections with same latency" @@ -931,7 +861,7 @@ msgstr "UBOND密码" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:658 msgid "UMTS/GPRS" -msgstr "" +msgstr "UMTS/GPRS" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:27 msgid "Update" @@ -956,7 +886,7 @@ msgstr "上传速度 (Kb/s)" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:136 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:317 msgid "Uptime:" -msgstr "Durée de fonctionnement :" +msgstr "运行时间:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:746 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:762 @@ -964,24 +894,20 @@ msgid "Used by Glorytun UDP and SQM/QoS if enabled. 0 to use default value." msgstr "如果启用，则由Glorytun UDP和使用SQM / QoS, 默认值0." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:165 -#, fuzzy -#| msgid "VPN is not running" msgid "V2Ray is not running" -msgstr "Le VPN n'est pas lancé" +msgstr "V2Ray没有运行" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:212 -#, fuzzy -#| msgid "Glorytun is used for UDP and ICMP" msgid "V2Ray is used for TCP and UDP." -msgstr "Glorytun est utilisé pour UDP et ICMP" +msgstr "V2Ray用于TCP和UDP。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:209 msgid "V2Ray user" -msgstr "" +msgstr "V2Ray用户" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:207 msgid "V2Ray user id" -msgstr "" +msgstr "V2Ray用户ID" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:179 msgid "VPN is not running" @@ -993,11 +919,11 @@ msgstr "VPN设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:338 msgid "VPN traffic:" -msgstr "" +msgstr "VPN流量：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:198 msgid "VPN tunnel DOWN" -msgstr "Le VPN ne répond pas" +msgstr "VPN隧道关闭" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:41 msgid "VPS settings" @@ -1005,12 +931,12 @@ msgstr "VPS设定" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:298 msgid "Version" -msgstr "" +msgstr "版本" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:507 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:668 msgid "Wan IP and gateway are identical" -msgstr "La passerelle et l'adresse IP du WAN sont identiques" +msgstr "WAN IP和网关相同" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:191 msgid "" @@ -1025,7 +951,7 @@ msgstr "蚂蚁聚合向导" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:75 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:80 msgid "You" -msgstr "Vous" +msgstr "你" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:726 msgid "You can enable MPTCP over VPN if your provider filter Multipath TCP." @@ -1033,7 +959,7 @@ msgstr "如果提供商过滤多路径TCP，则可以启用VPN上的MPTCP." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:378 msgid "You can use DHCP if you have multiple real ethernet ports." -msgstr "" +msgstr "如果您有多个真实的以太网端口，则可以使用DHCP。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:507 msgid "" @@ -1045,7 +971,7 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:173 msgid "You can use a public IPv6 prefix only if you set only one server." -msgstr "" +msgstr "仅当您仅设置一台服务器时，才能使用公共IPv6前缀。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:429 msgid "You must disable DHCP on your modems and set IP in different networks." @@ -1061,29 +987,29 @@ msgstr "您应该为LTE或任何变速接口禁用SQM." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:78 msgid "Your IP was not leased by this router" -msgstr "Votre IP n'a pas été attribuée par ce routeur" +msgstr "您的IP未通过此路由器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:144 msgid "address:" -msgstr "adresse :" +msgstr "地址:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:660 msgid "auto" -msgstr "" +msgstr "自动" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:156 msgid "empty key" -msgstr "clef vide" +msgstr "空键" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:439 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:630 msgid "ip address:" -msgstr "adresse ip :" +msgstr "IP地址:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:451 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:642 msgid "latency:" -msgstr "latence :" +msgstr "延迟:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:455 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:646 @@ -1092,11 +1018,11 @@ msgstr "mtu :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:543 msgid "multipath:" -msgstr "" +msgstr "多路径：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:459 msgid "operator:" -msgstr "" +msgstr "操作者：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:227 msgid "other" @@ -1104,30 +1030,30 @@ msgstr "其他" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:463 msgid "phone number:" -msgstr "" +msgstr "电话号码:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:145 msgid "range:" -msgstr "plage :" +msgstr "范围:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:467 msgid "state:" -msgstr "" +msgstr "位置:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:546 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:702 msgid "traffic control:" -msgstr "" +msgstr "流量控制:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:443 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:634 msgid "wan address:" -msgstr "adresse WAN :" +msgstr "互联网地址 :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:447 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:638 msgid "whois:" -msgstr "whois :" +msgstr "whois查询 :" #~ msgid "By default ShadowSocks is used for TCP traffic." #~ msgstr "默认情况下，ShadowSocks用于TCP通信." From 13eb8780525efd151349b73839ddf43252280b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20PAG=C3=88S?= Date: Tue, 13 Oct 2020 06:58:06 +0000 Subject: [PATCH 09/22] Translated using Weblate (Occitan) Currently translated at 48.5% (115 of 237 strings) Translation: OpenMPTCProuter/LuCI/applications/openmptcprouter Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsopenmptcprouter/oc/ --- .../po/oc/openmptcprouter.po | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/luci-app-openmptcprouter/po/oc/openmptcprouter.po b/luci-app-openmptcprouter/po/oc/openmptcprouter.po index 1e70d438d..2ff5e063e 100644 --- a/luci-app-openmptcprouter/po/oc/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/oc/openmptcprouter.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2020-08-31 17:15+0000\n" +"PO-Revision-Date: 2020-10-13 07:30+0000\n" "Last-Translator: Quentin PAGÈS \n" "Language-Team: Occitan \n" @@ -279,10 +279,8 @@ msgid "Enable debug logs" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:697 -#, fuzzy -#| msgid "Enable SQM" msgid "Enabled" -msgstr "Active SQM" +msgstr "Activat" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:217 msgid "Encryption" @@ -454,10 +452,8 @@ msgstr "Darrièra salvagarda disponibla sul servidor :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:119 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:305 -#, fuzzy -#| msgid "Last available backup on server:" msgid "Latest available version" -msgstr "Darrièra salvagarda disponibla sul servidor :" +msgstr "Darrièra salvagarda disponibla sul servidor" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:125 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:311 @@ -524,7 +520,7 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:694 msgid "Multipath TCP" -msgstr "" +msgstr "Multipath TCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:519 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:525 @@ -743,12 +739,8 @@ msgid "Restore backup" msgstr "Restauracion de la salvagarda" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:143 -#, fuzzy -#| msgid "API username to retrieve personnalized settings from the server." msgid "Retrieve settings from server" -msgstr "" -"Nom d’utilizaire per recuperar la configuracion personalizada del servidor " -"estant." +msgstr "Recuperar la configuracion personalizada del servidor estant" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:324 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:799 @@ -923,7 +915,7 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:458 msgid "Type" -msgstr "" +msgstr "Tipe" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:289 msgid "UBOND can replace Glorytun with connections with same latency" @@ -1078,10 +1070,8 @@ msgid "Your IP was not leased by this router" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:144 -#, fuzzy -#| msgid "IPv4 address" msgid "address:" -msgstr "Adreça IPv4" +msgstr "Adreça IPv4 :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:660 msgid "auto" @@ -1093,10 +1083,8 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:439 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:630 -#, fuzzy -#| msgid "Static address" msgid "ip address:" -msgstr "Adreça estatica" +msgstr "Adreça IP :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:451 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:642 @@ -1139,10 +1127,8 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:443 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:634 -#, fuzzy -#| msgid "Static address" msgid "wan address:" -msgstr "Adreça estatica" +msgstr "Adreça wan :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:447 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:638 From 4a21191201b24bd0e7259a360233c9cde7766d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20PAG=C3=88S?= Date: Tue, 13 Oct 2020 07:00:20 +0000 Subject: [PATCH 10/22] Translated using Weblate (Occitan) Currently translated at 100.0% (30 of 30 strings) Translation: OpenMPTCProuter/LuCI/applications/glorytun Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsglorytun/oc/ --- luci-app-glorytun/po/oc/glorytun.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/luci-app-glorytun/po/oc/glorytun.po b/luci-app-glorytun/po/oc/glorytun.po index 07af761ae..be34c778d 100644 --- a/luci-app-glorytun/po/oc/glorytun.po +++ b/luci-app-glorytun/po/oc/glorytun.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2020-08-31 17:15+0000\n" +"PO-Revision-Date: 2020-10-13 07:30+0000\n" "Last-Translator: Quentin PAGÈS \n" "Language-Team: Occitan \n" @@ -19,10 +19,10 @@ msgstr "" "Çai-jos una lista de las instàncias Glorytun configuradas e lor estat actual" msgid "Bind address" -msgstr "" +msgstr "Adreça mapada" msgid "Bind backup" -msgstr "" +msgstr "Associar la salvagarda" msgid "Bind port" msgstr "Pòrt de connexion" From beb13257e47f5d04532224e5cdc9876414f3a705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20PAG=C3=88S?= Date: Tue, 13 Oct 2020 07:01:02 +0000 Subject: [PATCH 11/22] Translated using Weblate (Occitan) Currently translated at 76.3% (42 of 55 strings) Translation: OpenMPTCProuter/LuCI/applications/mptcp Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsmptcp/oc/ --- luci-app-mptcp/po/oc/mptcp.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/luci-app-mptcp/po/oc/mptcp.po b/luci-app-mptcp/po/oc/mptcp.po index 7727ed030..15bd709fc 100644 --- a/luci-app-mptcp/po/oc/mptcp.po +++ b/luci-app-mptcp/po/oc/mptcp.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2020-08-31 17:15+0000\n" +"PO-Revision-Date: 2020-10-13 07:30+0000\n" "Last-Translator: Quentin PAGÈS \n" "Language-Team: Occitan \n" @@ -120,7 +120,7 @@ msgstr "" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:12 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:56 msgid "Multipath TCP" -msgstr "" +msgstr "Multipath TCP" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:36 msgid "Multipath TCP SYN retries" @@ -201,7 +201,7 @@ msgstr "subordinat" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:25 msgid "binder" -msgstr "" +msgstr "associar" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:22 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:30 @@ -232,7 +232,7 @@ msgstr "Activat" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:23 msgid "fullmesh" -msgstr "" +msgstr "fullmesh" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:61 msgid "handover" From 0850a18e7d0355eebe3bfd3c6b9bea23f60d491f Mon Sep 17 00:00:00 2001 From: Weblate Date: Tue, 13 Oct 2020 09:05:17 +0000 Subject: [PATCH 12/22] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: OpenMPTCProuter/LuCI/applications/openmptcprouter Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsopenmptcprouter/ --- .../po/zh_Hans/openmptcprouter.po | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po index 020a814c3..1e738659e 100644 --- a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po @@ -762,7 +762,9 @@ msgstr "将服务器设置为主服务器" msgid "" "Set the default Proxy used for TCP when ShadowSocks is enabled, for TCP and " "UDP when V2Ray is enabled." -msgstr "设置启用ShadowSocks时用于TCP的默认代理，启用V2Ray时设置用于TCP和UDP的默认代理." +msgstr "" +"设置启用ShadowSocks时用于TCP的默认代理，启用V2Ray时设置用于TCP和UDP的默认代" +"理." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:339 msgid "" @@ -821,7 +823,9 @@ msgid "" "The length of time an orphaned (no longer referenced by any application) " "connection will remain in the FIN_WAIT_2 state before it is aborted at the " "local end." -msgstr "孤立的（不再被任何应用程序引用）连接在本地端中止之前将保持FIN_WAIT_2状态的时间。" +msgstr "" +"孤立的（不再被任何应用程序引用）连接在本地端中止之前将保持FIN_WAIT_2状态的时" +"间。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:236 msgid "" @@ -834,7 +838,9 @@ msgid "" "This value influences the time, after which TCP decides, that something is " "wrong due to unacknowledged RTO retransmissions, and reports this suspicion " "to the network layer." -msgstr "此值会影响延时，在此时间之前，TCP决定由于未确认的RTO重传而出了问题，并将这种错误报告给网络层。" +msgstr "" +"此值会影响延时，在此时间之前，TCP决定由于未确认的RTO重传而出了问题，并将这种" +"错误报告给网络层。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:163 msgid "" From 1ccd2e65d34c268f244d2ea389b0e8ba702c2808 Mon Sep 17 00:00:00 2001 From: antrouter Date: Tue, 13 Oct 2020 09:08:55 +0000 Subject: [PATCH 13/22] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (237 of 237 strings) Translation: OpenMPTCProuter/LuCI/applications/openmptcprouter Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsopenmptcprouter/zh_Hans/ --- luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po index 1e738659e..6d104510f 100644 --- a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-10-13 07:30+0000\n" +"PO-Revision-Date: 2020-10-13 09:11+0000\n" "Last-Translator: antrouter \n" "Language-Team: Chinese (Simplified) \n" @@ -45,7 +45,7 @@ msgstr "高级设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:135 msgid "Advanced settings" -msgstr "高级设置-官网55860.com" +msgstr "高级设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:339 msgid "" @@ -69,7 +69,7 @@ msgstr "认证类型" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:700 msgid "Backup" -msgstr "备份(商业版55860.com)" +msgstr "备份" #: luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua:22 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm:8 From 0aebfab1fb322b56bca62098122bc8d7a1d69ebe Mon Sep 17 00:00:00 2001 From: openmptcprouter-translation <66313742+openmptcprouter-translation@users.noreply.github.com> Date: Tue, 13 Oct 2020 11:13:12 +0200 Subject: [PATCH 14/22] Translations update from Weblate (#22) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Translated using Weblate (French) Currently translated at 100.0% (30 of 30 strings) Translation: OpenMPTCProuter/LuCI/applications/glorytun Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsglorytun/fr/ * Translated using Weblate (French) Currently translated at 100.0% (16 of 16 strings) Translation: OpenMPTCProuter/LuCI/applications/mlvpn Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsmlvpn/fr/ * Translated using Weblate (French) Currently translated at 100.0% (42 of 42 strings) Translation: OpenMPTCProuter/LuCI/applications/mptcp Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsmptcp/fr/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (237 of 237 strings) Translation: OpenMPTCProuter/LuCI/applications/openmptcprouter Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsopenmptcprouter/zh_Hans/ * Translated using Weblate (Occitan) Currently translated at 48.5% (115 of 237 strings) Translation: OpenMPTCProuter/LuCI/applications/openmptcprouter Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsopenmptcprouter/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (30 of 30 strings) Translation: OpenMPTCProuter/LuCI/applications/glorytun Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsglorytun/oc/ * Translated using Weblate (Occitan) Currently translated at 76.3% (42 of 55 strings) Translation: OpenMPTCProuter/LuCI/applications/mptcp Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsmptcp/oc/ * Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: OpenMPTCProuter/LuCI/applications/openmptcprouter Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsopenmptcprouter/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (237 of 237 strings) Translation: OpenMPTCProuter/LuCI/applications/openmptcprouter Translate-URL: http://weblate.openmptcprouter.com/projects/omr/luciapplicationsopenmptcprouter/zh_Hans/ Co-authored-by: antrouter Co-authored-by: Quentin PAGÈS Co-authored-by: Weblate --- luci-app-glorytun/po/fr/glorytun.po | 4 +- luci-app-glorytun/po/oc/glorytun.po | 6 +- luci-app-mlvpn/po/fr/mlvpn.po | 12 +- luci-app-mptcp/po/fr/mptcp.po | 8 +- luci-app-mptcp/po/oc/mptcp.po | 8 +- .../po/oc/openmptcprouter.po | 32 +- .../po/zh_Hans/openmptcprouter.po | 332 +++++++----------- 7 files changed, 160 insertions(+), 242 deletions(-) diff --git a/luci-app-glorytun/po/fr/glorytun.po b/luci-app-glorytun/po/fr/glorytun.po index 150668013..7b6b678ee 100644 --- a/luci-app-glorytun/po/fr/glorytun.po +++ b/luci-app-glorytun/po/fr/glorytun.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-10-02 08:44+0000\n" +"PO-Revision-Date: 2020-10-07 10:57+0000\n" "Last-Translator: Weblate Admin \n" "Language-Team: French \n" @@ -23,7 +23,7 @@ msgid "Bind address" msgstr "Adresse mappée" msgid "Bind backup" -msgstr "" +msgstr "Lier la sauvegarde" msgid "Bind port" msgstr "Port de connexion" diff --git a/luci-app-glorytun/po/oc/glorytun.po b/luci-app-glorytun/po/oc/glorytun.po index 07af761ae..be34c778d 100644 --- a/luci-app-glorytun/po/oc/glorytun.po +++ b/luci-app-glorytun/po/oc/glorytun.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2020-08-31 17:15+0000\n" +"PO-Revision-Date: 2020-10-13 07:30+0000\n" "Last-Translator: Quentin PAGÈS \n" "Language-Team: Occitan \n" @@ -19,10 +19,10 @@ msgstr "" "Çai-jos una lista de las instàncias Glorytun configuradas e lor estat actual" msgid "Bind address" -msgstr "" +msgstr "Adreça mapada" msgid "Bind backup" -msgstr "" +msgstr "Associar la salvagarda" msgid "Bind port" msgstr "Pòrt de connexion" diff --git a/luci-app-mlvpn/po/fr/mlvpn.po b/luci-app-mlvpn/po/fr/mlvpn.po index 045ef28b2..af2708373 100644 --- a/luci-app-mlvpn/po/fr/mlvpn.po +++ b/luci-app-mlvpn/po/fr/mlvpn.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-09-30 08:50+0000\n" +"PO-Revision-Date: 2020-10-07 10:57+0000\n" "Last-Translator: Weblate Admin \n" "Language-Team: French \n" @@ -26,7 +26,7 @@ msgid "Interface name" msgstr "Nom de l'interface" msgid "Interface will increase port used beginning with this" -msgstr "" +msgstr "L'interface augmentera le port utilisé à partir de celui ci" msgid "Interfaces" msgstr "Interfaces" @@ -35,13 +35,13 @@ msgid "Invalid" msgstr "Invalide" msgid "Loss tolerance" -msgstr "" +msgstr "Tolérance aux pertes" msgid "MLVPN" -msgstr "" +msgstr "MLVPN" msgid "Mode" -msgstr "" +msgstr "Mode" msgid "Password" msgstr "Mot de passe" @@ -53,7 +53,7 @@ msgid "Remote/Bind port" msgstr "Port de connexion distant" msgid "Reorder buffer size" -msgstr "" +msgstr "Taille du tampon de réordonnancement" msgid "Settings" msgstr "Paramètres" diff --git a/luci-app-mptcp/po/fr/mptcp.po b/luci-app-mptcp/po/fr/mptcp.po index bf4c84adb..f8a44eee9 100644 --- a/luci-app-mptcp/po/fr/mptcp.po +++ b/luci-app-mptcp/po/fr/mptcp.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-10-02 08:44+0000\n" +"PO-Revision-Date: 2020-10-07 10:57+0000\n" "Last-Translator: Weblate Admin \n" "Language-Team: French \n" @@ -101,7 +101,7 @@ msgid "backup" msgstr "remplaçant" msgid "binder" -msgstr "" +msgstr "lier" msgid "default" msgstr "Défaut" @@ -119,10 +119,10 @@ msgid "enabled" msgstr "Activé" msgid "fullmesh" -msgstr "" +msgstr "fullmesh" msgid "handover" -msgstr "" +msgstr "relais" msgid "kB/s" msgstr "Ko/s" diff --git a/luci-app-mptcp/po/oc/mptcp.po b/luci-app-mptcp/po/oc/mptcp.po index 7727ed030..15bd709fc 100644 --- a/luci-app-mptcp/po/oc/mptcp.po +++ b/luci-app-mptcp/po/oc/mptcp.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2020-08-31 17:15+0000\n" +"PO-Revision-Date: 2020-10-13 07:30+0000\n" "Last-Translator: Quentin PAGÈS \n" "Language-Team: Occitan \n" @@ -120,7 +120,7 @@ msgstr "" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:12 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:56 msgid "Multipath TCP" -msgstr "" +msgstr "Multipath TCP" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:36 msgid "Multipath TCP SYN retries" @@ -201,7 +201,7 @@ msgstr "subordinat" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:25 msgid "binder" -msgstr "" +msgstr "associar" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:22 #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:30 @@ -232,7 +232,7 @@ msgstr "Activat" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:23 msgid "fullmesh" -msgstr "" +msgstr "fullmesh" #: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:61 msgid "handover" diff --git a/luci-app-openmptcprouter/po/oc/openmptcprouter.po b/luci-app-openmptcprouter/po/oc/openmptcprouter.po index 1e70d438d..2ff5e063e 100644 --- a/luci-app-openmptcprouter/po/oc/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/oc/openmptcprouter.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2020-08-31 17:15+0000\n" +"PO-Revision-Date: 2020-10-13 07:30+0000\n" "Last-Translator: Quentin PAGÈS \n" "Language-Team: Occitan \n" @@ -279,10 +279,8 @@ msgid "Enable debug logs" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:697 -#, fuzzy -#| msgid "Enable SQM" msgid "Enabled" -msgstr "Active SQM" +msgstr "Activat" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:217 msgid "Encryption" @@ -454,10 +452,8 @@ msgstr "Darrièra salvagarda disponibla sul servidor :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:119 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:305 -#, fuzzy -#| msgid "Last available backup on server:" msgid "Latest available version" -msgstr "Darrièra salvagarda disponibla sul servidor :" +msgstr "Darrièra salvagarda disponibla sul servidor" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:125 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:311 @@ -524,7 +520,7 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:694 msgid "Multipath TCP" -msgstr "" +msgstr "Multipath TCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:519 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:525 @@ -743,12 +739,8 @@ msgid "Restore backup" msgstr "Restauracion de la salvagarda" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:143 -#, fuzzy -#| msgid "API username to retrieve personnalized settings from the server." msgid "Retrieve settings from server" -msgstr "" -"Nom d’utilizaire per recuperar la configuracion personalizada del servidor " -"estant." +msgstr "Recuperar la configuracion personalizada del servidor estant" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:324 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:799 @@ -923,7 +915,7 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:458 msgid "Type" -msgstr "" +msgstr "Tipe" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:289 msgid "UBOND can replace Glorytun with connections with same latency" @@ -1078,10 +1070,8 @@ msgid "Your IP was not leased by this router" msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:144 -#, fuzzy -#| msgid "IPv4 address" msgid "address:" -msgstr "Adreça IPv4" +msgstr "Adreça IPv4 :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:660 msgid "auto" @@ -1093,10 +1083,8 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:439 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:630 -#, fuzzy -#| msgid "Static address" msgid "ip address:" -msgstr "Adreça estatica" +msgstr "Adreça IP :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:451 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:642 @@ -1139,10 +1127,8 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:443 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:634 -#, fuzzy -#| msgid "Static address" msgid "wan address:" -msgstr "Adreça estatica" +msgstr "Adreça wan :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:447 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:638 diff --git a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po index 15cf61fb0..6d104510f 100644 --- a/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2020-09-02 05:14+0000\n" +"PO-Revision-Date: 2020-10-13 09:11+0000\n" "Last-Translator: antrouter \n" "Language-Team: Chinese (Simplified) \n" @@ -24,17 +24,15 @@ msgstr "简单VPN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:83 msgid "API username to retrieve personnalized settings from the server." -msgstr "API用户名，以从服务器检索个性化设置." +msgstr "API用户名，以从蚂蚁聚合服务器检索个性化设置." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:639 msgid "APN" -msgstr "" +msgstr "APN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:128 -#, fuzzy -#| msgid "Add server" msgid "Add a new server" -msgstr "添加服务器" +msgstr "添加一个新蚂蚁聚合服务器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:790 msgid "Add an interface" @@ -67,11 +65,11 @@ msgstr "处理器中集成了高级加密标准（AES）指令集." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:665 msgid "Authentication Type" -msgstr "" +msgstr "认证类型" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:700 msgid "Backup" -msgstr "" +msgstr "备份" #: luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua:22 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm:8 @@ -80,7 +78,7 @@ msgstr "在服务器上备份" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:282 msgid "Balancing" -msgstr "" +msgstr "均衡" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:20 msgid "Beta" @@ -88,70 +86,60 @@ msgstr "测试版" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:288 msgid "Big time difference between the server and the router" -msgstr "" +msgstr "服务器和路由器之间的时间差距很大" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:463 msgid "Bridge" -msgstr "" +msgstr "桥接" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:245 msgid "By default VPN is used for any traffic that is not TCP." msgstr "默认情况下，VPN用于非TCP的任何流量." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:180 -#, fuzzy -#| msgid "By default VPN is used for any traffic that is not TCP." msgid "" "By default proxy is used for any traffic that is TCP (and UDP for V2Ray)." -msgstr "默认情况下，VPN用于非TCP的任何流量." +msgstr "默认情况下，代理用于任何TCP（对于V2Ray是UDP）流量。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:670 msgid "CHAP" -msgstr "" +msgstr "CHAP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:252 -#, fuzzy -#| msgid "Can't access and use server part" msgid "Can\\'t access and use server part" -msgstr "Impossible d'accéder et d'utiliser la partie serveur" +msgstr "无法访问和使用蚂蚁聚合服务器部分服务" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:275 -#, fuzzy -#| msgid "Can't contact Server Admin Script" msgid "Can\\'t contact Server Admin Script" -msgstr "Impossible de contacter le script d'administration du serveur" +msgstr "无法联系蚂蚁聚合服务器管理脚本" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:268 -#, fuzzy -#| msgid "Can't get public IP address from ShadowSocks" msgid "Can\\'t get public IP address from ShadowSocks" -msgstr "Pas d'adresse IP publique récupérée via ShadowSocks" +msgstr "无法从ShadowSocks获取公共蚂蚁聚合IP地址" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:265 -#, fuzzy -#| msgid "Can't ping server" msgid "Can\\'t ping server" -msgstr "Pas de réponse du serveur" +msgstr "无法ping蚂蚁聚合服务器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:467 msgid "" "Choose MacVLAN if you want to create a virtual interface based on a physical " "interface." -msgstr "" +msgstr "如果要基于物理接口创建虚拟接口，请选择MacVLAN。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:404 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:487 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:533 msgid "Choose physical interface." -msgstr "" +msgstr "选择物理接口。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:133 msgid "Common server settings" -msgstr "通用服务器设置蚂蚁聚合" +msgstr "通用蚂蚁聚合服务器设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:130 msgid "Core temp:" -msgstr "Température du cœur :" +msgstr "核心温度:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:373 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:498 @@ -159,20 +147,16 @@ msgid "DHCP" msgstr "DHCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:183 -#, fuzzy -#| msgid "DNS issue: can't resolve hostname" msgid "DNS issue: can\\'t resolve hostname" -msgstr "Soucis DNS : impossible de résoudre le domaine" +msgstr "DNS问题：无法解析主机名" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:266 msgid "Debug" -msgstr "" +msgstr "调试模式" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:182 -#, fuzzy -#| msgid "Default VPN" msgid "Default Proxy" -msgstr "默认VPN" +msgstr "默认代理" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:295 msgid "Default VPN" @@ -187,7 +171,7 @@ msgstr "删除" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:592 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:613 msgid "Device" -msgstr "" +msgstr "设备" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:196 msgid "Disable TCP Fast Open" @@ -198,14 +182,12 @@ msgid "Disable TCP Fast Open on Linux and Shadowsocks configuration" msgstr "在Linux和Shadowsocks配置上禁用TCP快速打开" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:236 -#, fuzzy -#| msgid "Disable gateway ping" msgid "Disable default gateway" -msgstr "禁用网关ping" +msgstr "关闭默认网关" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:241 msgid "Disable default gateway, no internet if VPS are down" -msgstr "" +msgstr "禁用默认网关,如果VPS关闭,则没办法链接互联网" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:186 msgid "Disable external check" @@ -221,7 +203,7 @@ msgstr "禁用网关ping状态检查" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:261 msgid "Disable multipath test using tracebox" -msgstr "" +msgstr "禁止使用tracebox多路径测试" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:57 msgid "" @@ -229,10 +211,8 @@ msgid "" msgstr "禁用防火墙中定义的从服务器到此路由器的端口重定向" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:116 -#, fuzzy -#| msgid "Disable server ping" msgid "Disable server" -msgstr "禁用服务器ping" +msgstr "关闭禁用聚合服务器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:246 msgid "Disable server ping" @@ -243,16 +223,12 @@ msgid "Disable server ping status check" msgstr "禁用服务器ping状态检查" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:256 -#, fuzzy -#| msgid "Disable external check" msgid "Disable tracebox test" -msgstr "禁用外部检查" +msgstr "禁用跟蚂蚁跟踪测试" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:698 -#, fuzzy -#| msgid "Disable IPv6" msgid "Disabled" -msgstr "Désactiver IPv6" +msgstr "关闭" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:741 msgid "Download speed (Kb/s)" @@ -276,55 +252,45 @@ msgid "Enable ShadowSocks Obfuscating" msgstr "启用ShadowSocks混淆" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:206 -#, fuzzy -#| msgid "Disable TCP Fast Open" msgid "Enable TCP Low Latency" -msgstr "禁用TCP Fast Open" +msgstr "启用TCP低延迟" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:271 msgid "Enable debug logs" -msgstr "" +msgstr "启用调试日志" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:697 -#, fuzzy -#| msgid "Enable SQM" msgid "Enabled" -msgstr "开启 SQM" +msgstr "开启" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:217 msgid "Encryption" msgstr "加密" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:238 -#, fuzzy -#| msgid "Encryption method is also used for Glorytun." msgid "Encryption method is used for Shadowsocks, V2Ray, Glorytun and OpenVPN." -msgstr "加密方法也用于Glorytun." +msgstr "加密方法用于Shadowsocks，V2Ray，Glorytun和OpenVPN。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:171 msgid "Filesystem is readonly" msgstr "Système de fichiers en lecture seule" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:150 -#, fuzzy -#| msgid "API username to retrieve personnalized settings from the server." msgid "Force retrieve all keys from server." -msgstr "API用户名，以从服务器检索个性化设置." +msgstr "强制从服务器检索所有密钥。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:145 -#, fuzzy -#| msgid "Server settings" msgid "Force retrieve settings" -msgstr "蚂蚁聚合服务器设定" +msgstr "强制检索设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:659 msgid "GPRS only" -msgstr "" +msgstr "仅GPRS" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:496 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:657 msgid "Gateway DOWN" -msgstr "La passerelle ne répond pas" +msgstr "网关不通" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:253 msgid "Glorytun TCP is used by default for UDP and ICMP" @@ -337,15 +303,15 @@ msgstr "Glorytun密钥" #: luci-app-openmptcprouter/root/usr/share/rpcd/acl.d/luci-app-openmptcprouter.json:3 msgid "Grant UCI access for luci-app-openmptcprouter" -msgstr "" +msgstr "授予UCI访问luci-app-openmptcprouter的权限" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:123 msgid "How often TCP sends out keepalive messages when keepalive is enabled." -msgstr "" +msgstr "启用keepalive时,TCP多久发送一次keepalive消息." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:174 msgid "IPv4 IP default TTL" -msgstr "" +msgstr "IPv4 IP默认TTL" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:128 msgid "IPv4 TCP FIN timeout" @@ -364,16 +330,12 @@ msgid "IPv4 TCP SYN retries" msgstr "IPv4 TCP SYN重试" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:148 -#, fuzzy -#| msgid "IPv4 TCP SYN retries" msgid "IPv4 TCP SYN retries1" -msgstr "IPv4 TCP SYN重试" +msgstr "IPv4 TCP SYN重试1" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:158 -#, fuzzy -#| msgid "IPv4 TCP SYN retries" msgid "IPv4 TCP SYN retries2" -msgstr "IPv4 TCP SYN重试" +msgstr "IPv4 TCP SYN重试2" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:409 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:539 @@ -391,24 +353,20 @@ msgstr "IPv4网络掩码" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:168 msgid "IPv6 Prefix" -msgstr "" +msgstr "IPv6前缀" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:536 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:697 msgid "IPv6 route received" -msgstr "Route IPv6 reçue" +msgstr "经过的IPv6路由" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:156 -#, fuzzy -#| msgid "VPN settings" msgid "IPv6 settings" -msgstr "VPN设置" +msgstr "IPv6设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:204 -#, fuzzy -#| msgid "VPN IPv6 tunnel DOWN" msgid "IPv6 tunnel DOWN" -msgstr "Le tunnel IPv6 ne répond pas" +msgstr "IPv6隧道DOWN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:328 msgid "IPv6:" @@ -425,7 +383,7 @@ msgstr "接口设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:277 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:289 msgid "Key is retrieved from server API by default." -msgstr "" +msgstr "默认情况下，密钥是从服务器API检索的." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:93 msgid "" @@ -434,14 +392,12 @@ msgid "" msgstr "用于服务器配置密钥以及设置的密钥." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:346 -#, fuzzy -#| msgid "Interfaces settings" msgid "LAN interfaces settings" -msgstr "接口设置" +msgstr "局域网接口设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:657 msgid "LTE" -msgstr "" +msgstr "LTE" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:357 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:448 @@ -465,7 +421,7 @@ msgstr "Dernière version disponible" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:125 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:311 msgid "Load:" -msgstr "Charge :" +msgstr "负载:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:277 msgid "MLVPN can replace Glorytun with connections with same latency" @@ -478,11 +434,11 @@ msgstr "MLVPN密码" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:284 msgid "MPTCP is not enabled on the server" -msgstr "MPTCP n'est pas activé sur le serveur" +msgstr "服务器上未启用MPTCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:322 msgid "MPTCP may not be enabled on the server" -msgstr "MPTCP semble ne pas être activé sur le serveur" +msgstr "服务器上可能未启用MPTCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:721 msgid "MPTCP over VPN" @@ -490,11 +446,11 @@ msgstr "通过MPTCP的VPN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:462 msgid "MacVLAN" -msgstr "" +msgstr "Macvlan" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:699 msgid "Master" -msgstr "" +msgstr "主" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:276 msgid "Master interface selection" @@ -510,53 +466,53 @@ msgstr "最小扩展CPU频率" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:654 msgid "Modem default" -msgstr "" +msgstr "调制解调器默认" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:688 msgid "Modem init timeout" -msgstr "" +msgstr "调制解调器初始化超时" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:499 msgid "ModemManager" -msgstr "" +msgstr "调制解调器管理器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:175 msgid "More than one default VPN is enabled" -msgstr "" +msgstr "启用了多个默认VPN" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:694 msgid "Multipath TCP" -msgstr "" +msgstr "多路径TCP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:519 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:525 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:680 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:686 msgid "Multipath current state is" -msgstr "Multipath est actuellement" +msgstr "多路径当前状态为" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:514 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:675 msgid "Multipath master already defined" -msgstr "Maître multipath déjà défini" +msgstr "已定义多路径主机" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:499 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:660 msgid "Multipath seems to be blocked on the connection" -msgstr "Multipath semble bloquer sur la connexion" +msgstr "多路径似乎在连接上被阻止" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:500 msgid "NCM" -msgstr "" +msgstr "NCM" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:668 msgid "NONE" -msgstr "" +msgstr "无" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:531 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:692 msgid "Network interface duplicated" -msgstr "Interface réseau dupliquée" +msgstr "网络接口重复" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:792 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:794 @@ -570,20 +526,20 @@ msgstr "网络设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:489 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:650 msgid "No IP defined" -msgstr "Aucune IP définie" +msgstr "未定义IP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:207 msgid "No IPv6 access" -msgstr "Pas d'accès IPv6" +msgstr "没有IPv6地址" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:503 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:664 msgid "No Server ping response after 1 second" -msgstr "Pas de réponse du serveur après 1 seconde" +msgstr "1秒后无服务器ping响应" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:271 msgid "No WAN IP address detected in less than 1 second" -msgstr "Aucune adresse IP WAN détectée en moins d'une seconde" +msgstr "不到1秒内未检测到WAN IP地址" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm:24 msgid "No available backup on server." @@ -595,31 +551,25 @@ msgstr "没变" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:712 msgid "No data" -msgstr "Pas de données" +msgstr "没有数据" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:493 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:654 msgid "No gateway defined" -msgstr "Aucune passerelle définie" +msgstr "未定义网关" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:243 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:244 -#, fuzzy -#| msgid "Direct output" msgid "No output" -msgstr "Sortie directe" +msgstr "无输出" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:248 -#, fuzzy -#| msgid "No VPS IP address, No WAN IP address" msgid "No server IP address, No WAN IP address" -msgstr "Pas d'adresse IP du serveur, pas d'adresse IP WAN" +msgstr "没有服务器IP地址，没有WAN IP地址" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:261 -#, fuzzy -#| msgid "No IP defined" msgid "No server defined" -msgstr "Aucune IP définie" +msgstr "未定义蚂蚁聚合服务器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:223 msgid "None" @@ -627,13 +577,13 @@ msgstr "没有" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:461 msgid "Normal" -msgstr "" +msgstr "正常" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:143 msgid "" "Number of times initial SYNs for an active TCP connection attempt will be " "retransmitted." -msgstr "" +msgstr "活动TCP连接尝试的初始SYN的次数将被重新传输." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:83 msgid "Obfuscating plugin" @@ -658,15 +608,15 @@ msgstr "只能将一台服务器作为主服务器，否则将所有服务器都 #: luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua:14 #: luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json:3 msgid "OpenMPTCProuter" -msgstr "多路径TCP路由器" +msgstr "蚂蚁聚合路由器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:339 msgid "OpenVPN can't be used in multi VPS configuration." -msgstr "" +msgstr "OpenVPN不能用于多VPS配置." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:211 msgid "Optimize for latency instead of bandwidth" -msgstr "" +msgstr "优化延迟而不是带宽" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:374 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:503 @@ -675,45 +625,41 @@ msgstr "其他" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:669 msgid "PAP" -msgstr "" +msgstr "PAP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:671 msgid "PAP/CHAP" -msgstr "" +msgstr "PAP/CHAP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:682 -#, fuzzy -#| msgid "MLVPN password" msgid "PAP/CHAP password" -msgstr "MLVPN密码" +msgstr "PAP/CHAP 密码" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:676 msgid "PAP/CHAP username" -msgstr "" +msgstr "PAP/CHAP 账号" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:645 msgid "PIN code" -msgstr "" +msgstr "PIN码" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:501 msgid "PPPoE" -msgstr "" +msgstr "PPPoE拨号" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:383 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:472 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:512 -#, fuzzy -#| msgid "Dynamic master interface" msgid "Physical interface" -msgstr "Interface maître dynamique" +msgstr "物理接口" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:655 msgid "Prefer LTE" -msgstr "" +msgstr "首选LTE" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:656 msgid "Prefer UMTS" -msgstr "" +msgstr "首选 UMTS" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:368 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:493 @@ -721,24 +667,20 @@ msgid "Protocol" msgstr "协议" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:194 -#, fuzzy -#| msgid "ShadowSocks is DISABLED" msgid "Proxy is DISABLED" -msgstr "ShadowSocks est désactivé" +msgstr "代理已禁用" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:179 -#, fuzzy -#| msgid "VPN settings" msgid "Proxy settings" -msgstr "VPN设置" +msgstr "代理设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:333 msgid "Proxy traffic:" -msgstr "" +msgstr "代理流量：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:502 msgid "QMI" -msgstr "" +msgstr "QMI" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:50 msgid "Redirects all ports from server to this router" @@ -749,10 +691,8 @@ msgid "Restore backup" msgstr "恢复备份" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:143 -#, fuzzy -#| msgid "API username to retrieve personnalized settings from the server." msgid "Retrieve settings from server" -msgstr "API用户名，以从服务器检索个性化设置." +msgstr "从服务器检索设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:324 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:799 @@ -785,10 +725,8 @@ msgid "Server IP" msgstr "服务器IP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:72 -#, fuzzy -#| msgid "Server IP will be set for ShadowSocks, Glorytun and MLVPN" msgid "Server IP will be set for proxy and VPN" -msgstr "L'IP du serveur sera configuré pour ShadowSocks, Glorytun et MLVPN" +msgstr "将为代理和VPN设置服务器IP" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:88 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:90 @@ -805,10 +743,8 @@ msgid "Server username" msgstr "服务器用户名" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:651 -#, fuzzy -#| msgid "Server key" msgid "Service Type" -msgstr "服务器密钥" +msgstr "服务类型" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:544 msgid "Set an IP in the same network as the modem" @@ -823,16 +759,12 @@ msgid "Set server as master" msgstr "将服务器设置为主服务器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:191 -#, fuzzy -#| msgid "" -#| "Set the default VPN used for UDP and ICMP when ShadowSocks is enabled, " -#| "for all traffic if ShadowSocks is disabled." msgid "" "Set the default Proxy used for TCP when ShadowSocks is enabled, for TCP and " "UDP when V2Ray is enabled." msgstr "" -"启用ShadowSocks时，为所有流量设置默认的VPN，用于UDP和ICMP，如果禁用" -"ShadowSocks." +"设置启用ShadowSocks时用于TCP的默认代理，启用V2Ray时设置用于TCP和UDP的默认代" +"理." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:339 msgid "" @@ -854,7 +786,7 @@ msgstr "设置为最大上传速度链接的80-95％之间的值。 0禁用SQM / #: luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua:15 msgid "Settings Wizard" -msgstr "设置向导(蚂蚁聚合)" +msgstr "蚂蚁聚合设置向导" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:153 msgid "ShadowSocks is not running" @@ -892,6 +824,8 @@ msgid "" "connection will remain in the FIN_WAIT_2 state before it is aborted at the " "local end." msgstr "" +"孤立的（不再被任何应用程序引用）连接在本地端中止之前将保持FIN_WAIT_2状态的时" +"间。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:236 msgid "" @@ -905,20 +839,22 @@ msgid "" "wrong due to unacknowledged RTO retransmissions, and reports this suspicion " "to the network layer." msgstr "" +"此值会影响延时，在此时间之前，TCP决定由于未确认的RTO重传而出了问题，并将这种" +"错误报告给网络层。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:163 msgid "" "This value influences the timeout of an alive TCP connection, when RTO " "retransmissions remain unacknowledged." -msgstr "" +msgstr "当未确认RTO重传时，此值会影响有效TCP连接的超时。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:343 msgid "Total traffic:" -msgstr "" +msgstr "总流量：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:458 msgid "Type" -msgstr "" +msgstr "类型" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:289 msgid "UBOND can replace Glorytun with connections with same latency" @@ -931,7 +867,7 @@ msgstr "UBOND密码" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:658 msgid "UMTS/GPRS" -msgstr "" +msgstr "UMTS/GPRS" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:27 msgid "Update" @@ -956,7 +892,7 @@ msgstr "上传速度 (Kb/s)" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:136 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:317 msgid "Uptime:" -msgstr "Durée de fonctionnement :" +msgstr "运行时间:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:746 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:762 @@ -964,24 +900,20 @@ msgid "Used by Glorytun UDP and SQM/QoS if enabled. 0 to use default value." msgstr "如果启用，则由Glorytun UDP和使用SQM / QoS, 默认值0." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:165 -#, fuzzy -#| msgid "VPN is not running" msgid "V2Ray is not running" -msgstr "Le VPN n'est pas lancé" +msgstr "V2Ray没有运行" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:212 -#, fuzzy -#| msgid "Glorytun is used for UDP and ICMP" msgid "V2Ray is used for TCP and UDP." -msgstr "Glorytun est utilisé pour UDP et ICMP" +msgstr "V2Ray用于TCP和UDP。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:209 msgid "V2Ray user" -msgstr "" +msgstr "V2Ray用户" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:207 msgid "V2Ray user id" -msgstr "" +msgstr "V2Ray用户ID" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:179 msgid "VPN is not running" @@ -993,11 +925,11 @@ msgstr "VPN设置" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:338 msgid "VPN traffic:" -msgstr "" +msgstr "VPN流量：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:198 msgid "VPN tunnel DOWN" -msgstr "Le VPN ne répond pas" +msgstr "VPN隧道关闭" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:41 msgid "VPS settings" @@ -1005,12 +937,12 @@ msgstr "VPS设定" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:298 msgid "Version" -msgstr "" +msgstr "版本" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:507 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:668 msgid "Wan IP and gateway are identical" -msgstr "La passerelle et l'adresse IP du WAN sont identiques" +msgstr "WAN IP和网关相同" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:191 msgid "" @@ -1025,7 +957,7 @@ msgstr "蚂蚁聚合向导" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:75 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:80 msgid "You" -msgstr "Vous" +msgstr "你" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:726 msgid "You can enable MPTCP over VPN if your provider filter Multipath TCP." @@ -1033,7 +965,7 @@ msgstr "如果提供商过滤多路径TCP，则可以启用VPN上的MPTCP." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:378 msgid "You can use DHCP if you have multiple real ethernet ports." -msgstr "" +msgstr "如果您有多个真实的以太网端口，则可以使用DHCP。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:507 msgid "" @@ -1045,7 +977,7 @@ msgstr "" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:173 msgid "You can use a public IPv6 prefix only if you set only one server." -msgstr "" +msgstr "仅当您仅设置一台服务器时，才能使用公共IPv6前缀。" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:429 msgid "You must disable DHCP on your modems and set IP in different networks." @@ -1061,29 +993,29 @@ msgstr "您应该为LTE或任何变速接口禁用SQM." #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:78 msgid "Your IP was not leased by this router" -msgstr "Votre IP n'a pas été attribuée par ce routeur" +msgstr "您的IP未通过此路由器" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:144 msgid "address:" -msgstr "adresse :" +msgstr "地址:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:660 msgid "auto" -msgstr "" +msgstr "自动" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:156 msgid "empty key" -msgstr "clef vide" +msgstr "空键" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:439 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:630 msgid "ip address:" -msgstr "adresse ip :" +msgstr "IP地址:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:451 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:642 msgid "latency:" -msgstr "latence :" +msgstr "延迟:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:455 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:646 @@ -1092,11 +1024,11 @@ msgstr "mtu :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:543 msgid "multipath:" -msgstr "" +msgstr "多路径：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:459 msgid "operator:" -msgstr "" +msgstr "操作者：" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:227 msgid "other" @@ -1104,30 +1036,30 @@ msgstr "其他" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:463 msgid "phone number:" -msgstr "" +msgstr "电话号码:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:145 msgid "range:" -msgstr "plage :" +msgstr "范围:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:467 msgid "state:" -msgstr "" +msgstr "位置:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:546 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:702 msgid "traffic control:" -msgstr "" +msgstr "流量控制:" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:443 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:634 msgid "wan address:" -msgstr "adresse WAN :" +msgstr "互联网地址 :" #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:447 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:638 msgid "whois:" -msgstr "whois :" +msgstr "whois查询 :" #~ msgid "By default ShadowSocks is used for TCP traffic." #~ msgstr "默认情况下，ShadowSocks用于TCP通信." From be8eafb85d738d481a4914083e85f93ef023dcf1 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Oct 2020 11:25:11 +0200 Subject: [PATCH 15/22] Fix omr-tracker with proxy settings --- luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua index da8d0039a..50b82fca9 100644 --- a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua +++ b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua @@ -4,14 +4,14 @@ local m, s, o m = Map("omr-tracker", translate("OMR-Tracker")) -s = m:section(TypedSection, "shadowsocks", translate("ShadowSocks tracker Settings"), translate("Detect if ShadowSocks is down and stop traffic redirection over it.")) +s = m:section(TypedSection, "proxy", translate("Proxy tracker Settings"), translate("Detect if Proxy is down and stop traffic redirection over it.")) s.anonymous = true s.addremove = false -local sdata = m:get('shadowsocks') +local sdata = m:get('proxy') if not sdata then - m:set('shadowsocks', nil, 'shadowsocks') - m:set('shadowsocks', 'enabled', "1") + m:set('proxy', nil, 'proxy') + m:set('proxy', 'enabled', "1") end o = s:option(Flag, "enabled", translate("Enable"), translate("When tracker is disabled, connection failover is also disabled")) From 84d36f1123c4126d9ff293864193e8c0784653c7 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Oct 2020 11:25:39 +0200 Subject: [PATCH 16/22] Fix wifi settings --- openmptcprouter/files/etc/uci-defaults/2091-omr-wifi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmptcprouter/files/etc/uci-defaults/2091-omr-wifi b/openmptcprouter/files/etc/uci-defaults/2091-omr-wifi index 0eab02257..f2e65c52e 100755 --- a/openmptcprouter/files/etc/uci-defaults/2091-omr-wifi +++ b/openmptcprouter/files/etc/uci-defaults/2091-omr-wifi @@ -1,5 +1,5 @@ #!/bin/sh -if [ "$(uci -q get wireless.radio0)" != "" ]; +if [ "$(uci -q get wireless.radio0)" != "" ]; then if [ "$(uci -q get wireless.radio0.country)" = "" ]; then uci -q batch <<-EOF >/dev/null set wireless.radio0.country='00' From 4f55f9fdcad22838333e68801ab4888f3efeb3c9 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Oct 2020 11:25:58 +0200 Subject: [PATCH 17/22] Fix SQM settings --- .../files/etc/uci-defaults/2040-omr-sqm | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm index 9ebecf471..f148a9916 100755 --- a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm +++ b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm @@ -16,8 +16,8 @@ if [ "$(uci -q get openmptcprouter.settings.version)" = "" ]; then set sqm.wan1.upload='0' set sqm.wan1.debug_logging='0' set sqm.wan1.verbosity='5' - set sqm.wan1.iqdisc_opts='autorate-ingress nat dual-dsthost' - set sqm.wan1.eqdisc_opts='nat dual-srchost' + set sqm.wan1.iqdisc_opts='autorate-ingress dual-dsthost' + set sqm.wan1.eqdisc_opts='dual-srchost' set sqm.wan2=queue set sqm.wan2.qdisc="fq_codel" set sqm.wan2.script="simple.qos" @@ -29,8 +29,8 @@ if [ "$(uci -q get openmptcprouter.settings.version)" = "" ]; then set sqm.wan2.upload='0' set sqm.wan2.debug_logging='0' set sqm.wan2.verbosity='5' - set sqm.wan2.iqdisc_opts='autorate-ingress nat dual-dsthost' - set sqm.wan2.eqdisc_opts='nat dual-srchost' + set sqm.wan2.iqdisc_opts='autorate-ingress dual-dsthost' + set sqm.wan2.eqdisc_opts='dual-srchost' commit sqm EOF if [ "$(uci -q get network.wan3)" != "" ]; then @@ -47,8 +47,8 @@ if [ "$(uci -q get openmptcprouter.settings.version)" = "" ]; then set sqm.wan3.upload='0' set sqm.wan3.debug_logging='0' set sqm.wan3.verbosity='5' - set sqm.wan3.iqdisc_opts='autorate-ingress nat dual-dsthost' - set sqm.wan3.eqdisc_opts='nat dual-srchost' + set sqm.wan3.iqdisc_opts='autorate-ingress dual-dsthost' + set sqm.wan3.eqdisc_opts='dual-srchost' commit sqm EOF fi @@ -66,8 +66,8 @@ if [ "$(uci -q get openmptcprouter.settings.version)" = "" ]; then set sqm.wan4.upload='0' set sqm.wan4.debug_logging='0' set sqm.wan4.verbosity='5' - set sqm.wan4.iqdisc_opts='autorate-ingress nat dual-dsthost' - set sqm.wan4.eqdisc_opts='nat dual-srchost' + set sqm.wan4.iqdisc_opts='autorate-ingress dual-dsthost' + set sqm.wan4.eqdisc_opts='dual-srchost' commit sqm EOF fi @@ -87,8 +87,8 @@ fi # set sqm.omrvpn.upload='0' # set sqm.omrvpn.debug_logging='0' # set sqm.omrvpn.verbosity='5' -# set sqm.omrvpn.iqdisc_opts='autorate-ingress nat dual-dsthost' -# set sqm.omrvpn.eqdisc_opts='nat dual-srchost' +# set sqm.omrvpn.iqdisc_opts='autorate-ingress dual-dsthost' +# set sqm.omrvpn.eqdisc_opts='dual-srchost' # commit sqm # EOF #fi From c396f073cd294eff6e2a1077b612a7d563a6db36 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Oct 2020 11:27:08 +0200 Subject: [PATCH 18/22] Fix omr-tracker config --- omr-tracker/files/etc/uci-defaults/omr-tracker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/omr-tracker/files/etc/uci-defaults/omr-tracker b/omr-tracker/files/etc/uci-defaults/omr-tracker index 0cdec9a37..3bbab839e 100755 --- a/omr-tracker/files/etc/uci-defaults/omr-tracker +++ b/omr-tracker/files/etc/uci-defaults/omr-tracker @@ -56,5 +56,6 @@ if [ "$(uci -q get omr-tracker.proxy.hosts | grep '103.224.182.242')" != "" ]; t add_list omr-tracker.proxy.hosts='74.82.42.42' add_list omr-tracker.proxy.hosts='176.103.130.130' EOF -fo +fi + exit 0 \ No newline at end of file From c16459ad348ece6f3557cf92fda319fe7afb17d3 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Oct 2020 11:27:49 +0200 Subject: [PATCH 19/22] Fix ss-tracker check --- .../share/omr/post-tracking.d/post-tracking | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking index 495bdf279..10fd6ba29 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking @@ -1,4 +1,3 @@ -# vim: set ft=sh noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 : SETROUTE=false set_route() { @@ -181,18 +180,18 @@ set_server_all_routes() { config_foreach set_routes_intf interface uintf="$(echo $routesintf | awk '{print $5}')" uintfb="$(echo $routesintfbackup | awk '{print $5}')" - [ -n "$routesintf" ] && ([ "$nbintf" -gt "1" ] && [ "$(ip r show $serverip metric 0 | tr -d '\t' | tr -d '\n')" != "$serverip $routesintf " ]) || ([ "$nbintf" = "1" ] && [ "$(ip r show $serverip metric 0 | grep $uintf)" = "" ]) && { + if [ -n "$routesintf" ] && ([ "$nbintf" -gt "1" ] && [ "$(ip r show $serverip metric 0 | tr -d '\t' | tr -d '\n')" != "$serverip $routesintf " ]) || ([ "$nbintf" = "1" ] && [ "$(ip r show $serverip metric 0 | grep $uintf)" = "" ]); then while [ "$(ip r show $serverip | grep -v nexthop | sed 's/ //g' | tr -d '\n')" != "$serverip" ] && [ "$(ip r show $serverip | grep -v nexthop | sed 's/ //g' | tr -d '\n')" != "" ]; do ip r del $serverip done [ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "Set server $server ($serverip) default route $serverip $routesintf" ip route replace $serverip scope global $routesintf [ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "New server route is $(ip r show $serverip metric 0 | tr -d '\t' | tr -d '\n')" - } - [ -n "$routesintfbackup" ] && ([ "$nbintfb" -gt "1" ] && [ "$(ip r show $serverip metric 999 | tr -d '\t' | tr -d '\n')" != "$serverip $routesintfbackup " ]) || ([ "$nbintfb" = "1" ] && [ "$(ip r show $serverip metric 999 | grep $uintfb)" = "" ]) && { + fi + if [ -n "$routesintfbackup" ] && ([ "$nbintfb" -gt "1" ] && [ "$(ip r show $serverip metric 999 | tr -d '\t' | tr -d '\n')" != "$serverip $routesintfbackup " ]) || ([ "$nbintfb" = "1" ] && [ "$(ip r show $serverip metric 999 | grep $uintfb)" = "" ]); then [ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "Set server $server ($serverip) backup default route $serverip $routesintfbackup nbintfb $nbintfb $OMR_TRACKER_DEVICE" ip route replace $serverip scope global metric 999 $routesintfbackup - } + fi fi } @@ -305,7 +304,7 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then if [ "$OMR_TRACKER_PREV_STATUS" = "$OMR_TRACKER_STATUS" ]; then exit 0 fi - [ "$multipath_status" = "off" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipathvpn)" != "1" ] || { + if [ "$multipath_status" != "off" ] || [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipathvpn)" = "1" ]; then if [ "$OMR_TRACKER_STATUS_MSG" = "" ]; then _log "$OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE) switched off" else @@ -333,7 +332,7 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then if [ "$(uci -q get openmptcprouter.settings.master)" = "balancing" ]; then config_foreach set_server_all_routes server fi - } + fi if ([ "$default_gw" = "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]) && [ "$(uci -q get openmptcprouter.settings.defaultgw)" != "0" ]; then config_load network @@ -439,7 +438,7 @@ if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "om ip link set dev $OMR_TRACKER_DEVICE mtu $mtu > /dev/null 2>&1 uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.lc=$(date +"%s") elif [ -z "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.mtu)" ]; then - [ -n "$serverip" ] && [ "$serverip" != "127.0.0.1" ] && { + if [ -n "$serverip" ] && [ "$serverip" != "127.0.0.1" ]; then local mtu=$(omr-mtu $OMR_TRACKER_DEVICE_IP $serverip) #local mtu=$(omr-mtu $OMR_TRACKER_DEVICE_IP 8.8.8.8) [ -n "$mtu" ] && { @@ -447,14 +446,14 @@ if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "om ip link set dev $OMR_TRACKER_DEVICE mtu $mtu > /dev/null 2>&1 uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.lc=$(date +"%s") } - } || { + else local mtu=$(omr-mtu $OMR_TRACKER_DEVICE_IP 1.1.1.1) [ -n "$mtu" ] && { uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.mtu=$mtu ip link set dev $OMR_TRACKER_DEVICE mtu $mtu > /dev/null 2>&1 uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.lc=$(date +"%s") } - } + fi else uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.lc=$(date +"%s") fi @@ -731,7 +730,7 @@ fi uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.latency="$OMR_TRACKER_LATENCY" #[ -z "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max)" ] && uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max="$OMR_TRACKER_LATENCY" #[ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max)" -lt "$OMR_TRACKER_LATENCY" ] && uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max="$OMR_TRACKER_LATENCY" - if [ "$multipath_config" = "on" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipath)" != "master" ] && ([ "$(uci -q get openmptcprouter.settings.master)" = "dynamic" ] || (([ "$(uci -q get openmptcprouter.settings.master)" = "change" ] || [ "$(uci -q get openmptcprouter.settings.master)" = "" ]) && [ "$(uci -q get openmptcprouter.settings.master_lcintf | grep $OMR_TRACKER_INTERFACE)" = "" ])); then + if [ "$multipath_config" = "on" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipath)" != "master" ] && ([ "$(uci -q get openmptcprouter.settings.master)" = "dynamic" ] || ( ( [ "$(uci -q get openmptcprouter.settings.master)" = "change" ] || [ "$(uci -q get openmptcprouter.settings.master)" = "" ] ) && [ "$(uci -q get openmptcprouter.settings.master_lcintf | grep $OMR_TRACKER_INTERFACE)" = "" ] ) ); then masterintf="$(uci -q show openmptcprouter | grep -m 1 multipath=\'master\' | cut -d'.' -f2)" [ -z "$masterintf" ] && masterintf="$(uci -q show network | grep -m 1 multipath=\'master\' | cut -d'.' -f2)" masterlatency="$(uci -q get openmptcprouter.$masterintf.latency | tr -d '\n')" @@ -739,7 +738,7 @@ fi masterlatency=1000 fi if [ -n "$masterintf" ] && ([ "$masterlatency" != "" ] || [ "$(uci -q get openmptcprouter.$masterintf.state)" = "down" ]); then - if (([ "$(uci -q get openmptcprouter.settings.master)" = "change" ] || [ "$(uci -q get openmptcprouter.settings.master)" = "" ]) && [ "$OMR_TRACKER_LATENCY" -lt $(awk "BEGIN {printf \"%i\",${masterlatency}/1.5}") ]) || ([ "$(uci -q get openmptcprouter.settings.master)" = "dynamic" ] && [ "$OMR_TRACKER_LATENCY" -lt "$((masterlatency/2))" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.latency_previous)" -lt "$((masterlatency/2))" ]); then + if ( ( [ "$(uci -q get openmptcprouter.settings.master)" = "change" ] || [ "$(uci -q get openmptcprouter.settings.master)" = "" ] ) && [ "$OMR_TRACKER_LATENCY" -lt $(awk "BEGIN {printf \"%i\",${masterlatency}/1.5}") ] ) || ( [ "$(uci -q get openmptcprouter.settings.master)" = "dynamic" ] && [ "$OMR_TRACKER_LATENCY" -lt "$((masterlatency/2))" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.latency_previous)" -lt "$((masterlatency/2))" ] ); then uci -q set network.$masterintf.multipath='on' uci -q set openmptcprouter.$masterintf.multipath='on' uci -q set network.$OMR_TRACKER_INTERFACE.multipath='master' @@ -808,7 +807,8 @@ if [ "$(pgrep v2ray)" = "" ] && [ "$(uci -q get v2ray.main.enabled)" = "1" ] && sleep 5 fi -if [ "$(uci -q get v2ray.main.enabled)" = "1" ] && [ -f /etc/init.d/v2ray ] && [ "$(pgrep omr-tracker-v2ray)" = "" ]; then +if [ "$(uci -q get v2ray.main.enabled)" = "1" ] && [ -f /etc/init.d/v2ray ] && [ "$(pgrep -f omr-tracker-v2ray)" = "" ]; then + _log "Can't find omr-tracker-v2ray, restart omr-tracker..." /etc/init.d/omr-tracker restart fi @@ -823,7 +823,8 @@ if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get uci -q commit openmptcprouter fi -if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ] && [ "$(pgrep omr-tracker-ss)" = "" ]; then +if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ]; then + _log "Can't find omr-tracker-ss, restart omr-tracker..." /etc/init.d/omr-tracker restart fi From 2d347acb901339cfbf9aecbf22ddd4055ccdff84 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Oct 2020 11:28:43 +0200 Subject: [PATCH 20/22] Add occitan translation support --- openmptcprouter-full/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index 49d9984d8..969125323 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -94,7 +94,7 @@ MY_DEPENDS := \ #OMR_SUPPORTED_LANGS := ar bg bn_BD ca en fi fr de el he hi hu it ja mr ms nb_NO pl pt_BR pt ro ru es sv uk vi zh_Hans zh_Hant #OMR_SUPPORTED_LANGS := ar bg ca cs de en fi fr de el he hi hu it ja ko mr ms no oc pl pt-br pt ro ru es sk sv tr uk vi zh-cn zh-tw -OMR_SUPPORTED_LANGS := ar bg ca cs de en fi fr de el he hi hu it ja ko mr ms no pl pt-br pt ro ru es sk sv tr uk vi zh-cn zh-tw +OMR_SUPPORTED_LANGS := ar bg ca cs de en fi fr de el he hi hu it ja ko mr ms no pl pt-br pt ro ru es sk sv tr uk vi zh-cn zh-tw oc define Package/$(PKG_NAME) SECTION:=OMR From 5a5c8d1971511514544b34a9f0ff61292294b856 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Oct 2020 11:29:19 +0200 Subject: [PATCH 21/22] Try to free some spaces --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8c96a565a..95262445e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,10 +27,12 @@ jobs: sudo apt-get install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler - name: Free disk space run: | + sudo swapoff -a >/dev/null 2>&1 + sudo rm -f /swapfile >/dev/null 2>&1 sudo apt-get autoremove -y >/dev/null 2>&1 sudo apt-get autoclean -y >/dev/null 2>&1 - sudo rm -rf /usr/local/lib/android >/dev/null 2>&1 docker rmi $(docker image ls -aq) >/dev/null 2>&1 + df -h - name: Clone source code working-directory: ../../ env: From 230cdef1efc410ab219d625c6d8acaefe4f96bc8 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 13 Oct 2020 12:33:15 +0200 Subject: [PATCH 22/22] Try to make free space work --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 95262445e..0b30a58b9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,11 +27,11 @@ jobs: sudo apt-get install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler - name: Free disk space run: | - sudo swapoff -a >/dev/null 2>&1 - sudo rm -f /swapfile >/dev/null 2>&1 - sudo apt-get autoremove -y >/dev/null 2>&1 - sudo apt-get autoclean -y >/dev/null 2>&1 - docker rmi $(docker image ls -aq) >/dev/null 2>&1 + sudo swapoff -a >/dev/null 2>&1 || true + sudo rm -f /swapfile >/dev/null 2>&1 || true + sudo apt-get autoremove -y >/dev/null 2>&1 || true + sudo apt-get autoclean -y >/dev/null 2>&1 || true + docker rmi $(docker image ls -aq) >/dev/null 2>&1 || true df -h - name: Clone source code working-directory: ../../