Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: fix weblate conflicts

Browse source 
Merge remote-tracking branch 'weblate/master'

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2023-06-21 17:44:25 +03:00
commit 3b9adf800f
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
applications/luci-app-nut/po/vi/nut.po
View file

@ -1,7 +1,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2023-06-21 08:30+0000\n" "PO-Revision-Date: 2023-06-21 09:05+0000\n"
"Last-Translator: Mashiro <michio.haiyaku@gmail.com>\n" "Last-Translator: Mashiro <michio.haiyaku@gmail.com>\n"
"Language-Team: Vietnamese <https://hosted.weblate.org/projects/openwrt/" "Language-Team: Vietnamese <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsnut/vi/>\n" "luciapplicationsnut/vi/>\n"
@ -408,7 +408,7 @@ msgstr "Thông báo tần suất khảo sát"
#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:197 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:197
msgid "Polling Frequency(s)" msgid "Polling Frequency(s)"
msgstr "Tần suất khảo sát" msgstr "Tần suất (các) khảo sát"
#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:27 #: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:27
#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:195 #: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:195
@ -503,7 +503,7 @@ msgstr "Thông báo tắt máy"
#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:33 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:33
msgid "Slave" msgid "Slave"
msgstr "Đồng bộ" msgstr "Phục vụ"
#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106
#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244
@ -527,7 +527,7 @@ msgstr ""
#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:183 #: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:183
msgid "UPS Master" msgid "UPS Master"
msgstr "UPS Master" msgstr "UPS Chủ"
#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:51 #: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:51
msgid "UPS Server Global Settings" msgid "UPS Server Global Settings"
@ -535,7 +535,7 @@ msgstr "Cài đặt toàn cầu của máy chủ UPS"
#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:212 #: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:212
msgid "UPS Slave" msgid "UPS Slave"
msgstr "UPS Slave" msgstr "UPS Phục vụ"
#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20 #: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20
msgid "UPS name" msgid "UPS name"

4
applications/luci-app-olsr/po/vi/olsr.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-08-16 06:58+0200\n" "POT-Creation-Date: 2009-08-16 06:58+0200\n"
"PO-Revision-Date: 2023-06-21 08:48+0000\n" "PO-Revision-Date: 2023-06-21 09:05+0000\n"
"Last-Translator: Quy <haonguyen93056@gmail.com>\n" "Last-Translator: Quy <haonguyen93056@gmail.com>\n"
"Language-Team: Vietnamese <https://hosted.weblate.org/projects/openwrt/" "Language-Team: Vietnamese <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsolsr/vi/>\n" "luciapplicationsolsr/vi/>\n"
@ -315,7 +315,7 @@ msgid ""
msgstr "" msgstr ""
"Hysteresis cho cảm biến liên kết (chỉ áp dụng cho độ đo hopcount). " "Hysteresis cho cảm biến liên kết (chỉ áp dụng cho độ đo hopcount). "
"Hysteresis giúp tăng tính ổn định của cảm biến liên kết nhưng làm chậm quá " "Hysteresis giúp tăng tính ổn định của cảm biến liên kết nhưng làm chậm quá "
"trình đăng ký hàng xóm. Mặc định là \"yes\"." "trình đăng ký hàng xóm. Mặc định là \"yes\""
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217

6
applications/luci-app-statistics/po/vi/statistics.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-08-16 06:58+0200\n" "POT-Creation-Date: 2009-08-16 06:58+0200\n"
"PO-Revision-Date: 2023-06-21 08:49+0000\n" "PO-Revision-Date: 2023-06-21 09:05+0000\n"
"Last-Translator: Mashiro <michio.haiyaku@gmail.com>\n" "Last-Translator: Mashiro <michio.haiyaku@gmail.com>\n"
"Language-Team: Vietnamese <https://hosted.weblate.org/projects/openwrt/" "Language-Team: Vietnamese <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsstatistics/vi/>\n" "luciapplicationsstatistics/vi/>\n"
@ -333,7 +333,7 @@ msgstr "Kích Hoạt"
#: applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/entropy.js:10 #: applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/entropy.js:10
#: applications/luci-app-statistics/root/usr/share/luci/statistics/plugins/entropy.json:2 #: applications/luci-app-statistics/root/usr/share/luci/statistics/plugins/entropy.json:2
msgid "Entropy" msgid "Entropy"
msgstr "Nhiễu" msgstr "Ngẫu nhiên"
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/entropy.js:6 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/entropy.js:6
msgid "Entropy Plugin Configuration" msgid "Entropy Plugin Configuration"
@ -1068,7 +1068,7 @@ msgstr "Thiết lập mức ghi nhật ký syslog."
#: applications/luci-app-statistics/root/usr/share/luci/menu.d/luci-app-statistics.json:24 #: applications/luci-app-statistics/root/usr/share/luci/menu.d/luci-app-statistics.json:24
msgid "Setup" msgid "Setup"
msgstr "Cài đặt" msgstr "Thiết lập"
#: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/graphs.js:185 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/graphs.js:185
msgid "Setup collectd" msgid "Setup collectd"

8
applications/luci-app-travelmate/po/vi/travelmate.po
View file

@ -1,7 +1,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"PO-Revision-Date: 2023-06-21 08:44+0000\n" "PO-Revision-Date: 2023-06-21 09:05+0000\n"
"Last-Translator: Quy <haonguyen93056@gmail.com>\n" "Last-Translator: Mashiro <michio.haiyaku@gmail.com>\n"
"Language-Team: Vietnamese <https://hosted.weblate.org/projects/openwrt/" "Language-Team: Vietnamese <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationstravelmate/vi/>\n" "luciapplicationstravelmate/vi/>\n"
"Language: vi\n" "Language: vi\n"
@ -275,12 +275,12 @@ msgid ""
"logins." "logins."
msgstr "" msgstr ""
"Tài liệu kịch bản ngoại vi sẽ được gọi cho đăng nhập tự động vào cổng điều " "Tài liệu kịch bản ngoại vi sẽ được gọi cho đăng nhập tự động vào cổng điều "
"khiển" "khiển."
#: applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js:407 #: applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js:407
#: applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js:967 #: applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js:967
msgid "FAST" msgid "FAST"
msgstr "Nhanh" msgstr "NHANH"
#: applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/overview.js:294 #: applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/overview.js:294
msgid "General Settings" msgid "General Settings"