summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-dockerman
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2020-08-16 22:25:37 +0300
committerHannu Nyman <hannu.nyman@iki.fi>2020-08-16 22:25:37 +0300
commitb5fe582a81ce7aab4e0a2c35e15f0d6b4b86a22f (patch)
tree09bbc1f8701c0f9cbd1f172661660de201fc8f7e /applications/luci-app-dockerman
parent641c3b88aef42b0b2891fb3e6c17656e4ca25940 (diff)
treewide: i18n - sync translations
Sync translations. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications/luci-app-dockerman')
-rw-r--r--applications/luci-app-dockerman/po/ar/dockerman.po107
-rw-r--r--applications/luci-app-dockerman/po/bg/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/bn_BD/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/ca/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/cs/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/de/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/el/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/en/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/es/dockerman.po107
-rw-r--r--applications/luci-app-dockerman/po/fi/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/fr/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/he/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/hi/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/hu/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/id/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/it/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/ja/dockerman.po107
-rw-r--r--applications/luci-app-dockerman/po/ko/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/mr/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/ms/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/nb_NO/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/pl/dockerman.po107
-rw-r--r--applications/luci-app-dockerman/po/pt/dockerman.po107
-rw-r--r--applications/luci-app-dockerman/po/pt_BR/dockerman.po107
-rw-r--r--applications/luci-app-dockerman/po/ro/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/ru/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/sk/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/sv/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/templates/dockerman.pot102
-rw-r--r--applications/luci-app-dockerman/po/tr/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/uk/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/vi/dockerman.po102
-rw-r--r--applications/luci-app-dockerman/po/zh_Hans/dockerman.po107
-rw-r--r--applications/luci-app-dockerman/po/zh_Hant/dockerman.po102
34 files changed, 2612 insertions, 891 deletions
diff --git a/applications/luci-app-dockerman/po/ar/dockerman.po b/applications/luci-app-dockerman/po/ar/dockerman.po
index 22bc4bf5a..2eebfce28 100644
--- a/applications/luci-app-dockerman/po/ar/dockerman.po
+++ b/applications/luci-app-dockerman/po/ar/dockerman.po
@@ -15,6 +15,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr "قائمة قدرات kernel لإضافتها إلى الحاوية"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr "أضف الجهاز المضيف إلى الحاوية"
@@ -43,6 +47,10 @@ msgstr "إنشاء واجهة macvlan تلقائيًا في Openwrt"
msgid "Available"
msgstr "متاح"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr "ربط جبل (-v)"
@@ -66,6 +74,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr "يقبل وزن الكتلة IO (الوزن النسبي) قيمة الوزن بين 10 و 1000."
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -75,7 +91,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr "سهم وحدة المعالجة المركزية الوزن"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr "استخدام المعالج"
@@ -111,7 +127,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr "أمر"
@@ -154,19 +170,19 @@ msgstr "فحص الحاوية"
msgid "Container Logs"
msgstr "سجلات الحاوية"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr "اسم الحاوية"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr "تفاصيل الحاوية"
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -203,7 +219,7 @@ msgstr "الجهاز (- الجهاز)"
msgid "Disconnect"
msgstr "قطع الاتصال"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -252,7 +268,7 @@ msgid "Download"
msgstr "تنزيل"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr "تعريف"
@@ -328,12 +344,16 @@ msgid "Host Name"
msgstr "اسم المضيف"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr "معرف"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr "نطاق الاي بي"
@@ -351,7 +371,7 @@ msgid "IPv6 Subnet"
msgstr "الشبكة الفرعية IPv6"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr "صورة"
@@ -406,10 +426,18 @@ msgid "Ipvlan Mode"
msgstr "وضع Ipvlan"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr "أوقف"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr "الروابط"
@@ -435,16 +463,16 @@ msgstr "خيارات برنامج تشغيل السجل"
msgid "Logs"
msgstr "السجلات"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
-msgstr "وضع Macvlan"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
+msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:629
msgid "Memory"
msgstr "ذاكرة"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr "استخدام الذاكرة"
@@ -464,6 +492,10 @@ msgstr ""
"حد الذاكرة (التنسيق: <رقم> [<وحدة>]). الرقم عدد صحيح موجب. يمكن أن تكون "
"الوحدة واحدة من b أو k أو m أو g. الحد الأدنى هو 4 مليون."
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr "تعدد النقاط"
@@ -482,14 +514,18 @@ msgstr "ربط / حجم"
msgid "Name"
msgstr "اسم"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr "شبكة الاتصال"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr "اسم الشبكة"
@@ -500,7 +536,6 @@ msgstr "اسم الشبكة"
msgid "Networks"
msgstr "الشبكات"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr "جديد"
@@ -531,15 +566,22 @@ msgstr ""
msgid "Options"
msgstr "خيارات"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "نظرة عامة"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr "الواجهة الأم"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr "مسار"
@@ -561,10 +603,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr "إدخال Plese <docker إنشاء / تشغيل> سطر الأوامر:"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr "الموانئ"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr "ذو امتياز"
@@ -599,7 +645,7 @@ msgid "Remote Port"
msgstr "منفذ بعيد"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -624,7 +670,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -675,7 +721,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -683,19 +729,19 @@ msgstr ""
msgid "Start Time"
msgstr "وقت البدء"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr "الحالة"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -720,7 +766,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -796,12 +842,19 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
msgid "Volumes"
msgstr ""
+#~ msgid "Macvlan Mode"
+#~ msgstr "وضع Macvlan"
+
#~ msgid "Access Control"
#~ msgstr "صلاحية الدخول"
diff --git a/applications/luci-app-dockerman/po/bg/dockerman.po b/applications/luci-app-dockerman/po/bg/dockerman.po
index 92a8af65a..1e2fe6ed3 100644
--- a/applications/luci-app-dockerman/po/bg/dockerman.po
+++ b/applications/luci-app-dockerman/po/bg/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/bn_BD/dockerman.po b/applications/luci-app-dockerman/po/bn_BD/dockerman.po
index b2d4872e2..377f0d960 100644
--- a/applications/luci-app-dockerman/po/bn_BD/dockerman.po
+++ b/applications/luci-app-dockerman/po/bn_BD/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/ca/dockerman.po b/applications/luci-app-dockerman/po/ca/dockerman.po
index 56742889b..900660648 100644
--- a/applications/luci-app-dockerman/po/ca/dockerman.po
+++ b/applications/luci-app-dockerman/po/ca/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/cs/dockerman.po b/applications/luci-app-dockerman/po/cs/dockerman.po
index 450ffb59c..5d4798e76 100644
--- a/applications/luci-app-dockerman/po/cs/dockerman.po
+++ b/applications/luci-app-dockerman/po/cs/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/de/dockerman.po b/applications/luci-app-dockerman/po/de/dockerman.po
index 3cad48270..55f13c92b 100644
--- a/applications/luci-app-dockerman/po/de/dockerman.po
+++ b/applications/luci-app-dockerman/po/de/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -42,6 +46,10 @@ msgstr ""
msgid "Available"
msgstr "Verfügbar"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -65,6 +73,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -74,7 +90,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -106,7 +122,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr "Befehl"
@@ -149,19 +165,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -198,7 +214,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -245,7 +261,7 @@ msgid "Download"
msgstr "Herunterladen"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr "Treiber"
@@ -321,12 +337,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -344,7 +364,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -399,10 +419,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -428,8 +456,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -437,7 +465,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -453,6 +481,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -471,14 +503,18 @@ msgstr ""
msgid "Name"
msgstr "Name"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr "Netzwerk"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -489,7 +525,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -519,15 +554,22 @@ msgstr ""
msgid "Options"
msgstr "Optionen"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "Übersicht"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr "Pfad"
@@ -549,10 +591,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr "Ports"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -587,7 +633,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -612,7 +658,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -663,7 +709,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr "Start"
@@ -671,19 +717,19 @@ msgstr "Start"
msgid "Start Time"
msgstr "Startzeit"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr "Status"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr "Stopp"
@@ -708,7 +754,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -784,6 +830,10 @@ msgstr "Nutzer"
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/el/dockerman.po b/applications/luci-app-dockerman/po/el/dockerman.po
index c19396c89..023725efb 100644
--- a/applications/luci-app-dockerman/po/el/dockerman.po
+++ b/applications/luci-app-dockerman/po/el/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/en/dockerman.po b/applications/luci-app-dockerman/po/en/dockerman.po
index ae0b62d8f..150650c93 100644
--- a/applications/luci-app-dockerman/po/en/dockerman.po
+++ b/applications/luci-app-dockerman/po/en/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/es/dockerman.po b/applications/luci-app-dockerman/po/es/dockerman.po
index 5da0e45b9..9c01d28d9 100644
--- a/applications/luci-app-dockerman/po/es/dockerman.po
+++ b/applications/luci-app-dockerman/po/es/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr "Una lista de capacidades de kernel para agregar al contenedor"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr "Agregar dispositivo host al contenedor"
@@ -44,6 +48,10 @@ msgstr "Interfaz de creación automática de macvlan en Openwrt"
msgid "Available"
msgstr "Disponible"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr "Montaje de enlace (-v)"
@@ -70,6 +78,14 @@ msgstr ""
"El peso del bloque IO (peso relativo) acepta un valor de peso entre 10 y "
"1000."
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr "CAP-ADD(--cap-add)"
@@ -79,7 +95,7 @@ msgstr "CAP-ADD(--cap-add)"
msgid "CPU Shares Weight"
msgstr "Peso compartido de CPU"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr "Uso de CPU"
@@ -115,7 +131,7 @@ msgstr "Conexión del cliente"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr "Comando"
@@ -158,19 +174,19 @@ msgstr "Inspección de contenedores"
msgid "Container Logs"
msgstr "Registros de contenedores"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr "Nombre del contenedor"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr "Detalle del contenedor"
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -207,7 +223,7 @@ msgstr "Dispositivo(--device)"
msgid "Disconnect"
msgstr "Desconectar"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -256,7 +272,7 @@ msgid "Download"
msgstr "Descargar"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr "Controlador"
@@ -332,12 +348,16 @@ msgid "Host Name"
msgstr "Nombre de host"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr "ID"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr "Rango de IP"
@@ -355,7 +375,7 @@ msgid "IPv6 Subnet"
msgstr "Subred IPv6"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr "Imagen"
@@ -412,10 +432,18 @@ msgid "Ipvlan Mode"
msgstr "Modo Ipvlan"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr "Matar"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr "Enlaces"
@@ -441,16 +469,16 @@ msgstr "Opciones de controlador de registro"
msgid "Logs"
msgstr "Registros"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
-msgstr "Modo Macvlan"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
+msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:629
msgid "Memory"
msgstr "Memoria"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr "Uso de memoria"
@@ -470,6 +498,10 @@ msgstr ""
"Límite de memoria (formato: <número>[<unidad>]). El número es un entero "
"positivo. La unidad puede ser una de b, k, m o g. El mínimo es de 4M."
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr "Punto de montaje"
@@ -488,14 +520,18 @@ msgstr "Montaje/Volumen"
msgid "Name"
msgstr "Nombre"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr "Red"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr "Nombre de red"
@@ -506,7 +542,6 @@ msgstr "Nombre de red"
msgid "Networks"
msgstr "Redes"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr "Nuevo"
@@ -540,15 +575,22 @@ msgstr ""
msgid "Options"
msgstr "Opciones"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "Visión general"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr "Interfaz principal"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr "Ruta"
@@ -570,10 +612,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr "Por favor ingrese la línea de comandos <docker create/run>:"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr "Puertos"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr "Privilegiado"
@@ -608,7 +654,7 @@ msgid "Remote Port"
msgstr "Puerto remoto"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -633,7 +679,7 @@ msgid "Resources"
msgstr "Recursos"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr "Reiniciar"
@@ -686,7 +732,7 @@ msgstr ""
"cliente"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr "Iniciar"
@@ -694,19 +740,19 @@ msgstr "Iniciar"
msgid "Start Time"
msgstr "Hora de inicio"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr "Estadísticas"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr "Estado"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr "Detener"
@@ -731,7 +777,7 @@ msgstr "Sysctl(--sysctl)"
msgid "Sysctls (kernel parameters) options"
msgstr "Opciones de sysctls (parámetros del kernel)"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr "TOP"
@@ -809,12 +855,19 @@ msgstr "Usuario"
msgid "User(-u)"
msgstr "Usuario (-u)"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
msgid "Volumes"
msgstr "Volúmenes"
+#~ msgid "Macvlan Mode"
+#~ msgstr "Modo Macvlan"
+
#~ msgid "Access Control"
#~ msgstr "Control de acceso"
diff --git a/applications/luci-app-dockerman/po/fi/dockerman.po b/applications/luci-app-dockerman/po/fi/dockerman.po
index a36cc5e58..da8288014 100644
--- a/applications/luci-app-dockerman/po/fi/dockerman.po
+++ b/applications/luci-app-dockerman/po/fi/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -42,6 +46,10 @@ msgstr ""
msgid "Available"
msgstr "Saatavilla"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -65,6 +73,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -74,7 +90,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -106,7 +122,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr "Komento"
@@ -149,19 +165,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -198,7 +214,7 @@ msgstr ""
msgid "Disconnect"
msgstr "Irroita"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -245,7 +261,7 @@ msgid "Download"
msgstr "Lataa"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -321,12 +337,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -344,7 +364,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr "Levykuva"
@@ -399,10 +419,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr "Lopeta"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -428,8 +456,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -437,7 +465,7 @@ msgstr ""
msgid "Memory"
msgstr "Muisti"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -453,6 +481,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr "Liitoskohta"
@@ -471,14 +503,18 @@ msgstr ""
msgid "Name"
msgstr "Nimi"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr "Verkko"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -489,7 +525,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -519,15 +554,22 @@ msgstr ""
msgid "Options"
msgstr "Valinnat"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "Yleiskatsaus"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -549,10 +591,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr "Portit"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -587,7 +633,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -612,7 +658,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr "Käynnistä uudelleen"
@@ -663,7 +709,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr "Aloita"
@@ -671,19 +717,19 @@ msgstr "Aloita"
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr "Tila"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr "Pysäytä"
@@ -708,7 +754,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -784,6 +830,10 @@ msgstr "Käyttäjä"
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/fr/dockerman.po b/applications/luci-app-dockerman/po/fr/dockerman.po
index 188f787cd..ab5563380 100644
--- a/applications/luci-app-dockerman/po/fr/dockerman.po
+++ b/applications/luci-app-dockerman/po/fr/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -42,6 +46,10 @@ msgstr ""
msgid "Available"
msgstr "Disponible"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -65,6 +73,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -74,7 +90,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -106,7 +122,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -149,19 +165,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -198,7 +214,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -245,7 +261,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -321,12 +337,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -344,7 +364,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -399,10 +419,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr "Forcer l'arrêt"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -428,8 +456,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -437,7 +465,7 @@ msgstr ""
msgid "Memory"
msgstr "Mémoire"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -453,6 +481,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr "Point de montage"
@@ -471,14 +503,18 @@ msgstr ""
msgid "Name"
msgstr "Nom"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr "Réseau"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -489,7 +525,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -519,15 +554,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "Vue d’ensemble"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr "Chemin"
@@ -549,10 +591,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr "Ports"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -587,7 +633,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -612,7 +658,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr "Redémarrer"
@@ -663,7 +709,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr "Démarrer"
@@ -671,19 +717,19 @@ msgstr "Démarrer"
msgid "Start Time"
msgstr "Heure de début"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr "État"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr "Arrêter"
@@ -708,7 +754,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -784,6 +830,10 @@ msgstr "Utilisateur"
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/he/dockerman.po b/applications/luci-app-dockerman/po/he/dockerman.po
index b411cf5d6..38a8b5e60 100644
--- a/applications/luci-app-dockerman/po/he/dockerman.po
+++ b/applications/luci-app-dockerman/po/he/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/hi/dockerman.po b/applications/luci-app-dockerman/po/hi/dockerman.po
index 3ee778fe4..61339bfae 100644
--- a/applications/luci-app-dockerman/po/hi/dockerman.po
+++ b/applications/luci-app-dockerman/po/hi/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/hu/dockerman.po b/applications/luci-app-dockerman/po/hu/dockerman.po
index 3162fc363..c237349a8 100644
--- a/applications/luci-app-dockerman/po/hu/dockerman.po
+++ b/applications/luci-app-dockerman/po/hu/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/id/dockerman.po b/applications/luci-app-dockerman/po/id/dockerman.po
index b55352094..41e73ed41 100644
--- a/applications/luci-app-dockerman/po/id/dockerman.po
+++ b/applications/luci-app-dockerman/po/id/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr "Daftar kapabilitas kernel untuk ditambahkan ke wadah"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr "Tambahkan perangkat host ke wadah"
@@ -43,6 +47,10 @@ msgstr "Buat antarmuka macvlan otomatis di Openwrt"
msgid "Available"
msgstr "Tersedia"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr "Pasang Pengikat(-v)"
@@ -66,6 +74,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -75,7 +91,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -107,7 +123,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -150,19 +166,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -199,7 +215,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -246,7 +262,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -322,12 +338,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -345,7 +365,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -400,10 +420,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -429,8 +457,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -438,7 +466,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -454,6 +482,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -472,14 +504,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -490,7 +526,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -520,15 +555,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -550,10 +592,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -588,7 +634,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -613,7 +659,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -664,7 +710,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -672,19 +718,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -709,7 +755,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -785,6 +831,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/it/dockerman.po b/applications/luci-app-dockerman/po/it/dockerman.po
index 33500b2b0..161820719 100644
--- a/applications/luci-app-dockerman/po/it/dockerman.po
+++ b/applications/luci-app-dockerman/po/it/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/ja/dockerman.po b/applications/luci-app-dockerman/po/ja/dockerman.po
index 87a85956d..d9f6cf9ee 100644
--- a/applications/luci-app-dockerman/po/ja/dockerman.po
+++ b/applications/luci-app-dockerman/po/ja/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr "コンテナへホスト・デバイスを追加"
@@ -42,6 +46,10 @@ msgstr "OpenWrt で macvlan インターフェースを自動作成"
msgid "Available"
msgstr "利用可能"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -65,6 +73,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -74,7 +90,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr "CPU シェアの重み"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr "CPU 使用率"
@@ -106,7 +122,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr "コマンド"
@@ -149,19 +165,19 @@ msgstr ""
msgid "Container Logs"
msgstr "コンテナのログ"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr "コンテナ名"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr "コンテナの詳細"
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -198,7 +214,7 @@ msgstr "デバイス(--device)"
msgid "Disconnect"
msgstr "切断"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -247,7 +263,7 @@ msgid "Download"
msgstr "ダウンロード"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr "ドライバー"
@@ -323,12 +339,16 @@ msgid "Host Name"
msgstr "ホスト名"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr "IP 範囲"
@@ -346,7 +366,7 @@ msgid "IPv6 Subnet"
msgstr "IPv6 サブネット"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr "イメージ"
@@ -401,10 +421,18 @@ msgid "Ipvlan Mode"
msgstr "ipvlan モード"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr "強制終了"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr "リンク"
@@ -430,16 +458,16 @@ msgstr "ログドライバーオプション"
msgid "Logs"
msgstr "ログ"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
-msgstr "macvlan モード"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
+msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:629
msgid "Memory"
msgstr "メモリー"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr "メモリ使用量"
@@ -455,6 +483,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr "マウント・ポイント"
@@ -473,14 +505,18 @@ msgstr "マウント/ボリューム"
msgid "Name"
msgstr "名前"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr "ネットワーク"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr "ネットワーク名"
@@ -491,7 +527,6 @@ msgstr "ネットワーク名"
msgid "Networks"
msgstr "ネットワーク"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr "新規"
@@ -521,15 +556,22 @@ msgstr "CPU 数。 数値は小数です。 0.000 は無制限を意味します
msgid "Options"
msgstr "オプション"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "概要"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr "親インターフェース"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr "パス"
@@ -551,10 +593,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr "<docker create/run> コマンドラインを入力してください :"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr "ポート"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr "特権"
@@ -589,7 +635,7 @@ msgid "Remote Port"
msgstr "リモートポート"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -614,7 +660,7 @@ msgid "Resources"
msgstr "リソース"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr "再起動"
@@ -665,7 +711,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr "開始"
@@ -673,19 +719,19 @@ msgstr "開始"
msgid "Start Time"
msgstr "開始時刻"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr "統計"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr "ステータス"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr "停止"
@@ -710,7 +756,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr "Sysctl (カーネル・パラメータ) オプション"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -786,12 +832,19 @@ msgstr "ユーザー"
msgid "User(-u)"
msgstr "ユーザー(-u)"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
msgid "Volumes"
msgstr "ボリューム"
+#~ msgid "Macvlan Mode"
+#~ msgstr "macvlan モード"
+
#~ msgid "Access Control"
#~ msgstr "アクセス制御"
diff --git a/applications/luci-app-dockerman/po/ko/dockerman.po b/applications/luci-app-dockerman/po/ko/dockerman.po
index aad59facf..82285049b 100644
--- a/applications/luci-app-dockerman/po/ko/dockerman.po
+++ b/applications/luci-app-dockerman/po/ko/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -42,6 +46,10 @@ msgstr ""
msgid "Available"
msgstr "사용 가능"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -65,6 +73,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -74,7 +90,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -106,7 +122,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -149,19 +165,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -198,7 +214,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -245,7 +261,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -321,12 +337,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -344,7 +364,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -399,10 +419,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -428,8 +456,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -437,7 +465,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -453,6 +481,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -471,14 +503,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -489,7 +525,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -519,15 +554,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -549,10 +591,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -587,7 +633,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -612,7 +658,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -663,7 +709,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -671,19 +717,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -708,7 +754,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -784,6 +830,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/mr/dockerman.po b/applications/luci-app-dockerman/po/mr/dockerman.po
index 8e45582a8..ace99e648 100644
--- a/applications/luci-app-dockerman/po/mr/dockerman.po
+++ b/applications/luci-app-dockerman/po/mr/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/ms/dockerman.po b/applications/luci-app-dockerman/po/ms/dockerman.po
index fc9fe651c..3205c1daa 100644
--- a/applications/luci-app-dockerman/po/ms/dockerman.po
+++ b/applications/luci-app-dockerman/po/ms/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/nb_NO/dockerman.po b/applications/luci-app-dockerman/po/nb_NO/dockerman.po
index 125b5ab55..31e52c286 100644
--- a/applications/luci-app-dockerman/po/nb_NO/dockerman.po
+++ b/applications/luci-app-dockerman/po/nb_NO/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/pl/dockerman.po b/applications/luci-app-dockerman/po/pl/dockerman.po
index cd9abc153..105184e48 100644
--- a/applications/luci-app-dockerman/po/pl/dockerman.po
+++ b/applications/luci-app-dockerman/po/pl/dockerman.po
@@ -15,6 +15,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr "Lista możliwości jądra, które można dodać do kontenera"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr "Dodaj urządzenie hosta do kontenera"
@@ -45,6 +49,10 @@ msgstr "Automatyczne tworzenie interfejsu macvlan w Openwrt"
msgid "Available"
msgstr "Dostępne"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr "Montowane wiązania(-v)"
@@ -69,6 +77,14 @@ msgid ""
msgstr ""
"Waga we/wy bloku (waga względna) przyjmuje wartość wagi między 10 a 1000."
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr "CAP-ADD(--cap-add)"
@@ -78,7 +94,7 @@ msgstr "CAP-ADD(--cap-add)"
msgid "CPU Shares Weight"
msgstr "Waga udziałów CPU"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr "Wykorzystanie procesora"
@@ -114,7 +130,7 @@ msgstr "Połączenie klienta"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr "Polecenie"
@@ -157,19 +173,19 @@ msgstr "Kontrola kontenera"
msgid "Container Logs"
msgstr "Dzienniki kontenerów"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr "Nazwa kontenera"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr "Szczegóły kontenera"
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -206,7 +222,7 @@ msgstr "Urządzenie(--urządzenie)"
msgid "Disconnect"
msgstr "Rozłącz"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -255,7 +271,7 @@ msgid "Download"
msgstr "Pobieranie"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr "Sterownik"
@@ -331,12 +347,16 @@ msgid "Host Name"
msgstr "Nazwa hosta"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr "Identyfikator"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr "Zakres IP"
@@ -354,7 +374,7 @@ msgid "IPv6 Subnet"
msgstr "Podsieć IPv6"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr "Obraz"
@@ -409,10 +429,18 @@ msgid "Ipvlan Mode"
msgstr "Tryb Ipvlan"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr "Zabij"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr "Linki"
@@ -438,16 +466,16 @@ msgstr "Opcje sterownika dziennika"
msgid "Logs"
msgstr "Dzienniki"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
-msgstr "Tryb Macvlan"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
+msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:629
msgid "Memory"
msgstr "Pamięć"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr "Wykorzystanie pamięci"
@@ -467,6 +495,10 @@ msgstr ""
"Limit pamięci (format:<numer>[<jednostka>]). Liczba jest dodatnią liczbą "
"całkowitą. Jednostką może być b, k, m lub g. Minimum to 4M."
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr "Punkt montowania"
@@ -485,14 +517,18 @@ msgstr "Zamontowane/Ilość"
msgid "Name"
msgstr "Nazwa"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr "Sieć"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr "Nazwa Sieci"
@@ -503,7 +539,6 @@ msgstr "Nazwa Sieci"
msgid "Networks"
msgstr "Sieci"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr "Nowy"
@@ -535,15 +570,22 @@ msgstr ""
msgid "Options"
msgstr "Opcje"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "Przegląd"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr "Macierzysty Interfejs"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr "Ścieżka"
@@ -565,10 +607,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr "Proszę podać <docker Utwórz/Uruchom> w wierszu poleceń:"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr "Porty"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr "Uprawnienia"
@@ -603,7 +649,7 @@ msgid "Remote Port"
msgstr "Zdalny port"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -628,7 +674,7 @@ msgid "Resources"
msgstr "Zasoby"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr "Restart"
@@ -679,7 +725,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr "Określa, gdzie demon Docker będzie słuchał połączeń z klientami"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr "Uruchom"
@@ -687,19 +733,19 @@ msgstr "Uruchom"
msgid "Start Time"
msgstr "Czas rozpoczęcia"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr "Statystyki"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr "Status"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr "Zatrzymaj"
@@ -724,7 +770,7 @@ msgstr "Sysctl(--sysctl)"
msgid "Sysctls (kernel parameters) options"
msgstr "Opcje sysctls (parametry kernela)"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr "TOP"
@@ -802,12 +848,19 @@ msgstr "Użytkownik"
msgid "User(-u)"
msgstr "Użytkownik(-u)"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
msgid "Volumes"
msgstr "Wolumeny"
+#~ msgid "Macvlan Mode"
+#~ msgstr "Tryb Macvlan"
+
#~ msgid "Access Control"
#~ msgstr "Kontrola dostępu"
diff --git a/applications/luci-app-dockerman/po/pt/dockerman.po b/applications/luci-app-dockerman/po/pt/dockerman.po
index 7f4d2f8d2..21a7e63aa 100644
--- a/applications/luci-app-dockerman/po/pt/dockerman.po
+++ b/applications/luci-app-dockerman/po/pt/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr "Uma lista dos recursos do kernel que serão adicionados ao contentor"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr "Adicione o aparelho host ao contentor"
@@ -43,6 +47,10 @@ msgstr "Criar interface macvlan no Openwrt automaticamente"
msgid "Available"
msgstr "Disponível"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr "Montagem de Ligação(-v)"
@@ -68,6 +76,14 @@ msgid ""
msgstr ""
"Peso da ES do bloco (peso relativo) aceita um valor do peso entre 10 e 1000."
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr "CAP-ADD(--cap-add)"
@@ -77,7 +93,7 @@ msgstr "CAP-ADD(--cap-add)"
msgid "CPU Shares Weight"
msgstr "Peso do compartilhamento da CPU"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr "Utilização da CPU"
@@ -113,7 +129,7 @@ msgstr "Conexão com o cliente"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr "Comando"
@@ -156,19 +172,19 @@ msgstr "Inspecionar o Contentor"
msgid "Container Logs"
msgstr "Registos do Contentor"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr "Nome do Contentor"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr "Detalhe do contentor"
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -205,7 +221,7 @@ msgstr "Aparelho(--device)"
msgid "Disconnect"
msgstr "Desconectar"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -254,7 +270,7 @@ msgid "Download"
msgstr "Descarregar"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr "Driver"
@@ -330,12 +346,16 @@ msgid "Host Name"
msgstr "Nome do Host"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr "ID"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr "Faixa do IP"
@@ -353,7 +373,7 @@ msgid "IPv6 Subnet"
msgstr "Subrede IPv6"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr "Imagem"
@@ -409,10 +429,18 @@ msgid "Ipvlan Mode"
msgstr "Modo Ipvlan"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr "Matar"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr "Ligações"
@@ -438,16 +466,16 @@ msgstr "Opções do controlador do registo"
msgid "Logs"
msgstr "Registos"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
-msgstr "Modo Macvlan"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
+msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:629
msgid "Memory"
msgstr "Memória"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr "Utilização da Memória"
@@ -467,6 +495,10 @@ msgstr ""
"Limite da memória (formato: <número>[<unidade>]). O número é um inteiro "
"positivo. A unidade pode ser entre b, k, m, ou g. O mínimo é 4M."
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr "Ponto de Montagem"
@@ -485,14 +517,18 @@ msgstr "Montagem/Volume"
msgid "Name"
msgstr "Nome"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr "Rede"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr "Nome da Rede"
@@ -503,7 +539,6 @@ msgstr "Nome da Rede"
msgid "Networks"
msgstr "Redes"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr "Novo"
@@ -537,15 +572,22 @@ msgstr ""
msgid "Options"
msgstr "Opções"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "Visão Geral"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr "Pai da Interface"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr "Caminho"
@@ -567,10 +609,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr "Favor informar a linha de comando <docker create/run>:"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr "Portas"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr "Privilegiado"
@@ -605,7 +651,7 @@ msgid "Remote Port"
msgstr "Porta Remota"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -630,7 +676,7 @@ msgid "Resources"
msgstr "Recursos"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr "Reiniciar"
@@ -681,7 +727,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr "Especifica onde o daemon Docker irá ouvir por ligações dos clientes"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr "Iniciar"
@@ -689,19 +735,19 @@ msgstr "Iniciar"
msgid "Start Time"
msgstr "Hora do Início"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr "Estatísticas"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr "Estado"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr "Parar"
@@ -726,7 +772,7 @@ msgstr "Sysctl(--sysctl)"
msgid "Sysctls (kernel parameters) options"
msgstr "Sysctls (parâmetros do kernel ) opções"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr "TOPO"
@@ -804,12 +850,19 @@ msgstr "Utilizador"
msgid "User(-u)"
msgstr "Utilizador(-u)"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
msgid "Volumes"
msgstr "Volumes"
+#~ msgid "Macvlan Mode"
+#~ msgstr "Modo Macvlan"
+
#~ msgid "Access Control"
#~ msgstr "Controlo de Acesso"
diff --git a/applications/luci-app-dockerman/po/pt_BR/dockerman.po b/applications/luci-app-dockerman/po/pt_BR/dockerman.po
index f25770c5e..927e47dfb 100644
--- a/applications/luci-app-dockerman/po/pt_BR/dockerman.po
+++ b/applications/luci-app-dockerman/po/pt_BR/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr "Uma lista dos recursos do kernel que serão adicionados ao contêiner"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr "Adicione o dispositivo host ao contêiner"
@@ -43,6 +47,10 @@ msgstr "Criar automaticamente interface macvlan no Openwrt"
msgid "Available"
msgstr "Disponível"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr "Montagem da Ligação(-v)"
@@ -68,6 +76,14 @@ msgid ""
msgstr ""
"Peso da ES do bloco (peso relativo) aceita um valor do peso entre 10 e 1000."
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr "CAP-ADD(--cap-add)"
@@ -77,7 +93,7 @@ msgstr "CAP-ADD(--cap-add)"
msgid "CPU Shares Weight"
msgstr "A CPU Compartilha o Peso"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr "Utilização da CPU"
@@ -113,7 +129,7 @@ msgstr "Conexão do cliente"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr "Comando"
@@ -156,19 +172,19 @@ msgstr "Inspecione o Contêiner"
msgid "Container Logs"
msgstr "Logs do Contêiner"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr "Nome do Contêiner"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr "Detalhe do contêiner"
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -205,7 +221,7 @@ msgstr "Dispositivo(--device)"
msgid "Disconnect"
msgstr "Desconectar"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -254,7 +270,7 @@ msgid "Download"
msgstr "Download"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr "Controlador"
@@ -330,12 +346,16 @@ msgid "Host Name"
msgstr "Nome do Host"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr "ID"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr "Faixa do IP"
@@ -353,7 +373,7 @@ msgid "IPv6 Subnet"
msgstr "Subnet IPv6"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr "Imagem"
@@ -409,10 +429,18 @@ msgid "Ipvlan Mode"
msgstr "Modo Ipvlan"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr "Matar"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr "Links"
@@ -438,16 +466,16 @@ msgstr "Opções do controlador do log"
msgid "Logs"
msgstr "Logs"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
-msgstr "Modo Macvlan"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
+msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:629
msgid "Memory"
msgstr "Memória"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr "Utilização da Memória"
@@ -467,6 +495,10 @@ msgstr ""
"Limite da memória (formato: <número>[<unit>]). O número é um inteiro "
"positivo. A unidade pode ser entre b, k, m, ou g. O mínimo é 4M."
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr "Ponto de Montagem"
@@ -485,14 +517,18 @@ msgstr "Montagem/Volume"
msgid "Name"
msgstr "Nome"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr "Rede"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr "Nome da Rede"
@@ -503,7 +539,6 @@ msgstr "Nome da Rede"
msgid "Networks"
msgstr "Redes"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr "Novo"
@@ -537,15 +572,22 @@ msgstr ""
msgid "Options"
msgstr "Opções"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "Visão Geral"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr "Parente da Interface"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr "Caminho"
@@ -567,10 +609,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr "Favor informar a linha de comando <docker criar/executar>:"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr "Portas"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr "Privilegiado"
@@ -605,7 +651,7 @@ msgid "Remote Port"
msgstr "Porta Remota"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -630,7 +676,7 @@ msgid "Resources"
msgstr "Recursos"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr "Reiniciar"
@@ -681,7 +727,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr "Especifica onde o daemon do Docker escutará as conexões do cliente"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr "Início"
@@ -689,19 +735,19 @@ msgstr "Início"
msgid "Start Time"
msgstr "Hora do Início"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr "Estatísticas"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr "Condição Geral"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr "Parar"
@@ -726,7 +772,7 @@ msgstr "Sysctl(--sysctl)"
msgid "Sysctls (kernel parameters) options"
msgstr "Sysctls (parâmetros do kernel ) opções"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr "TOPO"
@@ -804,12 +850,19 @@ msgstr "Usuário"
msgid "User(-u)"
msgstr "Usuário(-u)"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
msgid "Volumes"
msgstr "Volumes"
+#~ msgid "Macvlan Mode"
+#~ msgstr "Modo Macvlan"
+
#~ msgid "Access Control"
#~ msgstr "Controle de Acesso"
diff --git a/applications/luci-app-dockerman/po/ro/dockerman.po b/applications/luci-app-dockerman/po/ro/dockerman.po
index 70dbac243..feff7ed22 100644
--- a/applications/luci-app-dockerman/po/ro/dockerman.po
+++ b/applications/luci-app-dockerman/po/ro/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/ru/dockerman.po b/applications/luci-app-dockerman/po/ru/dockerman.po
index d00daa714..ad055e133 100644
--- a/applications/luci-app-dockerman/po/ru/dockerman.po
+++ b/applications/luci-app-dockerman/po/ru/dockerman.po
@@ -15,6 +15,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -43,6 +47,10 @@ msgstr ""
msgid "Available"
msgstr "Доступно"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -66,6 +74,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -75,7 +91,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -107,7 +123,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr "Команда"
@@ -150,19 +166,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -199,7 +215,7 @@ msgstr ""
msgid "Disconnect"
msgstr "Отключить"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -246,7 +262,7 @@ msgid "Download"
msgstr "Скачать"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr "Драйвер"
@@ -322,12 +338,16 @@ msgid "Host Name"
msgstr "Имя хоста"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr "ID"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr "Диапазон IP"
@@ -345,7 +365,7 @@ msgid "IPv6 Subnet"
msgstr "IPv6 подсеть"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr "Образ"
@@ -400,10 +420,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr "Принудительно завершить"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr "Ссылки"
@@ -429,8 +457,8 @@ msgstr ""
msgid "Logs"
msgstr "Системный журнал"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -438,7 +466,7 @@ msgstr ""
msgid "Memory"
msgstr "Оперативная память (RAM)"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr "Использование памяти"
@@ -454,6 +482,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr "Точка монтирования"
@@ -472,14 +504,18 @@ msgstr ""
msgid "Name"
msgstr "Название"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr "Сеть"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr "Название сети"
@@ -490,7 +526,6 @@ msgstr "Название сети"
msgid "Networks"
msgstr "Сети"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr "Новая"
@@ -520,15 +555,22 @@ msgstr ""
msgid "Options"
msgstr "Опции"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "Обзор"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr "Путь"
@@ -550,10 +592,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr "Порты"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr "Привилегированный"
@@ -588,7 +634,7 @@ msgid "Remote Port"
msgstr "Удаленный порт"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -613,7 +659,7 @@ msgid "Resources"
msgstr "Ресурсы"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr "Перезапустить"
@@ -664,7 +710,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr "Запустить"
@@ -672,19 +718,19 @@ msgstr "Запустить"
msgid "Start Time"
msgstr "Время начала"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr "Состояние"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr "Остановить"
@@ -709,7 +755,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -785,6 +831,10 @@ msgstr "Пользователь"
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/sk/dockerman.po b/applications/luci-app-dockerman/po/sk/dockerman.po
index 095eff568..d5e94b8e3 100644
--- a/applications/luci-app-dockerman/po/sk/dockerman.po
+++ b/applications/luci-app-dockerman/po/sk/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -42,6 +46,10 @@ msgstr ""
msgid "Available"
msgstr "Dostupný"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -65,6 +73,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -74,7 +90,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -106,7 +122,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -149,19 +165,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -198,7 +214,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -245,7 +261,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -321,12 +337,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -344,7 +364,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -399,10 +419,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -428,8 +456,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -437,7 +465,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -453,6 +481,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -471,14 +503,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -489,7 +525,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -519,15 +554,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -549,10 +591,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -587,7 +633,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -612,7 +658,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -663,7 +709,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -671,19 +717,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -708,7 +754,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -784,6 +830,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/sv/dockerman.po b/applications/luci-app-dockerman/po/sv/dockerman.po
index 1580ef9b1..457a4ad9c 100644
--- a/applications/luci-app-dockerman/po/sv/dockerman.po
+++ b/applications/luci-app-dockerman/po/sv/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/templates/dockerman.pot b/applications/luci-app-dockerman/po/templates/dockerman.pot
index 37be95f59..adb3bb089 100644
--- a/applications/luci-app-dockerman/po/templates/dockerman.pot
+++ b/applications/luci-app-dockerman/po/templates/dockerman.pot
@@ -5,6 +5,10 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -33,6 +37,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -56,6 +64,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -65,7 +81,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -97,7 +113,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -140,19 +156,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -189,7 +205,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -236,7 +252,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -312,12 +328,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -335,7 +355,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -390,10 +410,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -419,8 +447,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -428,7 +456,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -444,6 +472,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -462,14 +494,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -480,7 +516,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -510,15 +545,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -540,10 +582,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -578,7 +624,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -603,7 +649,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -654,7 +700,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -662,19 +708,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -699,7 +745,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -775,6 +821,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/tr/dockerman.po b/applications/luci-app-dockerman/po/tr/dockerman.po
index c600c0c98..aef2c2f8d 100644
--- a/applications/luci-app-dockerman/po/tr/dockerman.po
+++ b/applications/luci-app-dockerman/po/tr/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -42,6 +46,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -65,6 +73,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -74,7 +90,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -106,7 +122,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -149,19 +165,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -198,7 +214,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -245,7 +261,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -321,12 +337,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -344,7 +364,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -399,10 +419,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -428,8 +456,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -437,7 +465,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -453,6 +481,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -471,14 +503,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -489,7 +525,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -519,15 +554,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "Genel bakış"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -549,10 +591,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -587,7 +633,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -612,7 +658,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -663,7 +709,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -671,19 +717,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -708,7 +754,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -784,6 +830,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/uk/dockerman.po b/applications/luci-app-dockerman/po/uk/dockerman.po
index df4be4a6f..67f477634 100644
--- a/applications/luci-app-dockerman/po/uk/dockerman.po
+++ b/applications/luci-app-dockerman/po/uk/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/vi/dockerman.po b/applications/luci-app-dockerman/po/vi/dockerman.po
index c3c3441d6..a97f05d09 100644
--- a/applications/luci-app-dockerman/po/vi/dockerman.po
+++ b/applications/luci-app-dockerman/po/vi/dockerman.po
@@ -8,6 +8,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -36,6 +40,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -59,6 +67,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -68,7 +84,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -100,7 +116,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -143,19 +159,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -192,7 +208,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -239,7 +255,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -315,12 +331,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -338,7 +358,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -393,10 +413,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -422,8 +450,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -431,7 +459,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -447,6 +475,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -465,14 +497,18 @@ msgstr ""
msgid "Name"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -483,7 +519,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -513,15 +548,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr ""
@@ -543,10 +585,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -581,7 +627,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -606,7 +652,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -657,7 +703,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr ""
@@ -665,19 +711,19 @@ msgstr ""
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr ""
@@ -702,7 +748,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -778,6 +824,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
diff --git a/applications/luci-app-dockerman/po/zh_Hans/dockerman.po b/applications/luci-app-dockerman/po/zh_Hans/dockerman.po
index 4c017e0ef..0cdbfd824 100644
--- a/applications/luci-app-dockerman/po/zh_Hans/dockerman.po
+++ b/applications/luci-app-dockerman/po/zh_Hans/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr "要添加到容器的内核功能列表"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr "将主机设备添加到容器"
@@ -42,6 +46,10 @@ msgstr "在 Openwrt 中自动创建 macvlan 界面"
msgid "Available"
msgstr "可用"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr "绑定挂载 (-v)"
@@ -65,6 +73,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr "块 IO 权重(相对权重)接受10到1000之间的数值。"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr "权限控制 (--cap-add)"
@@ -74,7 +90,7 @@ msgstr "权限控制 (--cap-add)"
msgid "CPU Shares Weight"
msgstr "CPU 共享权重"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr "CPU 使用率"
@@ -106,7 +122,7 @@ msgstr "客户端连接"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr "命令"
@@ -149,19 +165,19 @@ msgstr "检查容器"
msgid "Container Logs"
msgstr "容器日志"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr "容器名称"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr "容器详情"
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -198,7 +214,7 @@ msgstr "设备 (--device)"
msgid "Disconnect"
msgstr "断开连接"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -246,7 +262,7 @@ msgid "Download"
msgstr "下载"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr "驱动"
@@ -322,12 +338,16 @@ msgid "Host Name"
msgstr "主机名"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr "ID"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr "IP 范围"
@@ -345,7 +365,7 @@ msgid "IPv6 Subnet"
msgstr "IPv6 子网"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr "镜像"
@@ -400,10 +420,18 @@ msgid "Ipvlan Mode"
msgstr "Ipvlan 模式"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr "强制关闭"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr "链接"
@@ -429,16 +457,16 @@ msgstr "日志驱动选项"
msgid "Logs"
msgstr "日志"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
-msgstr "Macvlan 模式"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
+msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:629
msgid "Memory"
msgstr "内存"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr "内存使用率"
@@ -458,6 +486,10 @@ msgstr ""
"内存限制 (格式:<数字>[<单位>])。数字是正整数。单位可以是 b、k、m 或 g 之一。"
"最小值为 4M。"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr "挂载点"
@@ -476,14 +508,18 @@ msgstr "挂载/卷"
msgid "Name"
msgstr "名称"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr "网络"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr "网络名称"
@@ -494,7 +530,6 @@ msgstr "网络名称"
msgid "Networks"
msgstr "网络"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr "新建"
@@ -524,15 +559,22 @@ msgstr "CPU 数量。数字是小数。0.000 表示没有限制。"
msgid "Options"
msgstr "选项"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "概览"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr "父接口"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr "路径"
@@ -554,10 +596,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr "请输入 <docker 创建/运行> 的命令行:"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr "端口"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr "权限"
@@ -592,7 +638,7 @@ msgid "Remote Port"
msgstr "远程端口"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -617,7 +663,7 @@ msgid "Resources"
msgstr "资源"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr "重启"
@@ -668,7 +714,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr "指定Docker守护程序侦听客户端连接的位置"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr "启动"
@@ -676,19 +722,19 @@ msgstr "启动"
msgid "Start Time"
msgstr "开始时间"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr "状态"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr "状态"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr "停止"
@@ -713,7 +759,7 @@ msgstr "系统控制 (--sysctl)"
msgid "Sysctls (kernel parameters) options"
msgstr "系统控制(内核参数)选项"
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr "顶部"
@@ -789,12 +835,19 @@ msgstr "用户"
msgid "User(-u)"
msgstr "用户 (-u)"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187
msgid "Volumes"
msgstr "卷标"
+#~ msgid "Macvlan Mode"
+#~ msgstr "Macvlan 模式"
+
#~ msgid "Access Control"
#~ msgstr "访问控制"
diff --git a/applications/luci-app-dockerman/po/zh_Hant/dockerman.po b/applications/luci-app-dockerman/po/zh_Hant/dockerman.po
index d9757e0e5..e09516179 100644
--- a/applications/luci-app-dockerman/po/zh_Hant/dockerman.po
+++ b/applications/luci-app-dockerman/po/zh_Hant/dockerman.po
@@ -14,6 +14,10 @@ msgstr ""
msgid "A list of kernel capabilities to add to the container"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:181
+msgid "Add"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
msgid "Add host device to the container"
msgstr ""
@@ -42,6 +46,10 @@ msgstr ""
msgid "Available"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:39
+msgid "Base device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:538
msgid "Bind Mount(-v)"
msgstr ""
@@ -65,6 +73,14 @@ msgid ""
"Block IO weight (relative weight) accepts a weight value between 10 and 1000."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:51
+msgid "Bridge (Support direct communication between MAC VLANs)"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:34
+msgid "Bridge device"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
msgid "CAP-ADD(--cap-add)"
msgstr ""
@@ -74,7 +90,7 @@ msgstr ""
msgid "CPU Shares Weight"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:758
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
msgid "CPU Useage"
msgstr ""
@@ -106,7 +122,7 @@ msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:337
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:676
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:140
msgid "Command"
msgstr ""
@@ -149,19 +165,19 @@ msgstr ""
msgid "Container Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:458
msgid "Container Name"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:54
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:58
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:29
msgid "Container detail"
msgstr ""
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:35
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:106
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:105
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:107
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:137
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:87
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:133
@@ -198,7 +214,7 @@ msgstr ""
msgid "Disconnect"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:94
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:93
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:71
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:50
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:439
@@ -245,7 +261,7 @@ msgid "Download"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:77
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:30
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:32
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:85
msgid "Driver"
msgstr ""
@@ -321,12 +337,16 @@ msgid "Host Name"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:290
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:117
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:120
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:144
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:73
msgid "ID"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:36
+msgid "IP VLAN"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:101
msgid "IP range"
msgstr ""
@@ -344,7 +364,7 @@ msgid "IPv6 Subnet"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:294
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:134
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:137
#: applications/luci-app-dockerman/luasrc/view/dockerman/images_import.htm:54
msgid "Image"
msgstr ""
@@ -399,10 +419,18 @@ msgid "Ipvlan Mode"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:243
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:215
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:218
msgid "Kill"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:60
+msgid "L2 bridge"
+msgstr ""
+
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:61
+msgid "L3 bridge"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:349
msgid "Links"
msgstr ""
@@ -428,8 +456,8 @@ msgstr ""
msgid "Logs"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
-msgid "Macvlan Mode"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:35
+msgid "MAC VLAN"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:579
@@ -437,7 +465,7 @@ msgstr ""
msgid "Memory"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:762
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:772
msgid "Memory Useage"
msgstr ""
@@ -453,6 +481,10 @@ msgid ""
"can be one of b, k, m, or g. Minimum is 4M."
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:47
+msgid "Mode"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:90
msgid "Mount Point"
msgstr ""
@@ -471,14 +503,18 @@ msgstr ""
msgid "Name"
msgstr "分享名稱"
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:29
+msgid "Name of the network that can be selected during container creation"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:384
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:518
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:127
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
msgid "Network"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:75
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:27
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:28
msgid "Network Name"
msgstr ""
@@ -489,7 +525,6 @@ msgstr ""
msgid "Networks"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:178
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:99
msgid "New"
msgstr ""
@@ -519,15 +554,22 @@ msgstr ""
msgid "Options"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
+msgid "Overlay network"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:15
msgid "Overview"
msgstr "總覽"
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:79
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:37
msgid "Parent Interface"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:54
+msgid "Pass-through (Mirror physical device to single MAC VLAN)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/view/dockerman/container_file.htm:7
msgid "Path"
msgstr "路徑"
@@ -549,10 +591,14 @@ msgid "Plese input <docker create/run> command line:"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:345
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:130
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:133
msgid "Ports"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:52
+msgid "Private (Prevent communication between MAC VLANs)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
msgid "Privileged"
msgstr ""
@@ -587,7 +633,7 @@ msgid "Remote Port"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:270
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:224
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:227
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/images.lua:202
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/networks.lua:109
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:108
@@ -612,7 +658,7 @@ msgid "Resources"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:225
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:197
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:200
msgid "Restart"
msgstr ""
@@ -663,7 +709,7 @@ msgid "Specifies where the Docker daemon will listen for client connections"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:216
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:188
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:191
msgid "Start"
msgstr "啟動"
@@ -671,19 +717,19 @@ msgstr "啟動"
msgid "Start Time"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:768
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:769
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:778
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:779
#: applications/luci-app-dockerman/luasrc/view/dockerman/container.htm:5
msgid "Stats"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:298
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:123
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:126
msgid "Status"
msgstr ""
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:234
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:206
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:209
msgid "Stop"
msgstr "停止"
@@ -708,7 +754,7 @@ msgstr ""
msgid "Sysctls (kernel parameters) options"
msgstr ""
-#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:771
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:781
msgid "TOP"
msgstr ""
@@ -784,6 +830,10 @@ msgstr ""
msgid "User(-u)"
msgstr ""
+#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:53
+msgid "VEPA (Virtual Ethernet Port Aggregator)"
+msgstr ""
+
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:38
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/volumes.lua:73
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:187