aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-04-05 09:13:46 -0700
committerGerald Combs <gerald@wireshark.org>2015-04-05 16:13:53 +0000
commitd4c8dca5d3515d78138f878177b6945bb7a95e6d (patch)
tree45e1830cba9494eb6a65429d73501406969ae120
parent837948dc5c997fd5f986dd30ee31a974c6ee7842 (diff)
[Automatic update for 2015-04-05]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: If98edeab7a413c33e54fbd579e975da26993a380 Reviewed-on: https://code.wireshark.org/review/7922 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat
-rw-r--r--epan/dissectors/usb.c63
-rw-r--r--epan/enterprise-numbers188
-rw-r--r--epan/sminmpec.c48
-rw-r--r--manuf28
-rw-r--r--services1
-rw-r--r--ui/qt/wireshark_de.qmbin181710 -> 181716 bytes
-rw-r--r--ui/qt/wireshark_de.ts100
-rw-r--r--ui/qt/wireshark_en.ts48
-rw-r--r--ui/qt/wireshark_fr.ts48
-rw-r--r--ui/qt/wireshark_it.ts48
-rw-r--r--ui/qt/wireshark_ja_JP.ts48
-rw-r--r--ui/qt/wireshark_pl.ts48
-rw-r--r--ui/qt/wireshark_zh_CN.ts48
13 files changed, 496 insertions, 220 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index cdd70f9075..2eb0ffa383 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2331,7 +2331,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x1527, "Silicon Portals" },
{ 0x1529, "UBIQUAM Co., Ltd." },
{ 0x152a, "Thesycon Systemsoftware & Consulting GmbH" },
- { 0x152b, "FLYTECH Technology CO Ltd" },
+ { 0x152b, "MIR Srl" },
{ 0x152d, "JMicron Technology Corp. / JMicron USA Technology Corp." },
{ 0x152e, "LG (HLDS)" },
{ 0x1532, "Razer USA, Ltd" },
@@ -2392,7 +2392,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x162f, "WiQuest Communications, Inc." },
{ 0x1630, "2Wire, Inc." },
{ 0x1631, "Good Way Technology" },
- { 0x1645, "Cross Match Technologies GmbH" },
+ { 0x1645, "Entrega [hex]" },
{ 0x1649, "SofTec Microsystems" },
{ 0x164a, "ChipX" },
{ 0x164c, "Matrix Vision GmbH" },
@@ -2400,6 +2400,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x165b, "Frontier Design Group" },
{ 0x165c, "Kondo Kagaku" },
{ 0x1660, "Creatix Polymedia GmbH" },
+ { 0x1667, "GIGA-TMS INC." },
{ 0x1668, "Actiontec Electronics, Inc. [hex]" },
{ 0x1669, "PiKRON Ltd. [hex]" },
{ 0x166a, "Clipsal" },
@@ -2855,6 +2856,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x289b, "Dracal/Raphnet technologies" },
{ 0x2931, "Jolla Oy" },
{ 0x2a03, "dog hunter AG" },
+ { 0x2a45, "Meizu Corp." },
{ 0x2c02, "Planex Communications" },
{ 0x2c1a, "Dolphin Peripherals" },
{ 0x2fb2, "Fujitsu, Ltd" },
@@ -5895,6 +5897,7 @@ static const value_string usb_products_vals[] = {
{ 0x0480a009, "Stor.E Basics" },
{ 0x0480a00d, "STOR.E BASICS 500GB" },
{ 0x0480b001, "Stor.E Partner" },
+ { 0x0480d000, "External Disk 2TB Model DT01ABA200" },
{ 0x0480d010, "External Disk 3TB" },
{ 0x0480d011, "Canvio Desk" },
{ 0x0482000e, "FS-1020D Printer" },
@@ -5944,7 +5947,9 @@ static const value_string usb_products_vals[] = {
{ 0x0489e00f, "Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter]" },
{ 0x0489e016, "Ubee PXU1900 WiMAX Adapter [Beceem BCSM250]" },
{ 0x0489e02c, "Atheros AR5BBU12 Bluetooth Device" },
+ { 0x0489e032, "Broadcom BCM20702 Bluetooth" },
{ 0x0489e040, "Vizio VTAB1008" },
+ { 0x0489e042, "Broadcom BCM20702 Bluetooth" },
{ 0x0489e04d, "Atheros AR3012 Bluetooth" },
{ 0x048d1165, "IT1165 Flash Controller" },
{ 0x048d1336, "SD/MMC Cardreader" },
@@ -7105,7 +7110,7 @@ static const value_string usb_products_vals[] = {
{ 0x04b80881, "PX-404A [ME OFFICE 535]" },
{ 0x04b80883, "ME 340 Series/Stylus NX130 Series" },
{ 0x04b80884, "Stylus NX430W Series" },
- { 0x04b80885, "Stylus NX230 Series" },
+ { 0x04b80885, "Stylus NX230/SX235W Series" },
{ 0x04b8088f, "Stylus Office BX635FWD" },
{ 0x04b80890, "ME OFFICE 940FW Series/Stylus Office BX630FW Series" },
{ 0x04b80891, "Stylus Office BX535WD" },
@@ -8042,7 +8047,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f9017b, "Imagistics sx2100" },
{ 0x04f90180, "MFC-7420" },
{ 0x04f90181, "MFC-7820N Port(FaxModem)" },
- { 0x04f90182, "Composite Device" },
+ { 0x04f90182, "DCP-7010" },
{ 0x04f90183, "DCP-7020" },
{ 0x04f90184, "DCP-7025 Printer" },
{ 0x04f90185, "MFC-7220 Printer" },
@@ -13571,6 +13576,7 @@ static const value_string usb_products_vals[] = {
{ 0x0bda2831, "RTL2831U DVB-T" },
{ 0x0bda2832, "RTL2832U DVB-T" },
{ 0x0bda2838, "RTL2838 DVB-T" },
+ { 0x0bda5401, "RTL 8153 USB 3.0 hub with gigabit ethernet" },
{ 0x0bda5730, "HP 2.0MP High Definition Webcam" },
{ 0x0bda5775, "HP \"Truevision HD\" laptop camera" },
{ 0x0bda8150, "RTL8150 Fast Ethernet Adapter" },
@@ -14720,6 +14726,7 @@ static const value_string usb_products_vals[] = {
{ 0x0fce2137, "Xperia X10 mini (USB debug)" },
{ 0x0fce2138, "Xperia X10 mini pro (Debug)" },
{ 0x0fce2149, "Xperia X8 (debug)" },
+ { 0x0fce214e, "J108i Cedar (Windows-driver mode)" },
{ 0x0fce3137, "Xperia X10 mini" },
{ 0x0fce3138, "Xperia X10 mini pro" },
{ 0x0fce3149, "Xperia X8" },
@@ -14800,7 +14807,7 @@ static const value_string usb_products_vals[] = {
{ 0x0fced12a, "U100i Yari Phone" },
{ 0x0fced12e, "Xperia X10" },
{ 0x0fced144, "SonyEricsson j10i (Elm)" },
- { 0x0fced14e, "J108i Cedar" },
+ { 0x0fced14e, "J108i Cedar (modem mode)" },
{ 0x0fcee000, "SonyEricsson K550i" },
{ 0x0fcee039, "K800i (msc mode)" },
{ 0x0fcee042, "W810i Phone" },
@@ -14819,6 +14826,7 @@ static const value_string usb_products_vals[] = {
{ 0x0fcee112, "W995 Phone (Mass Storage)" },
{ 0x0fcee12e, "X10i Phone" },
{ 0x0fcee133, "Vivaz" },
+ { 0x0fcee14e, "J108i Cedar (mass-storage mode)" },
{ 0x0fcee14f, "Xperia Arc/X12" },
{ 0x0fcee15a, "Xperia Pro [Mass Storage Class]" },
{ 0x0fcee161, "Xperia Ray" },
@@ -15114,6 +15122,7 @@ static const value_string usb_products_vals[] = {
{ 0x106f000c, "Xchange" },
{ 0x10760031, "Bluetooth Device" },
{ 0x10760032, "Bluetooth Device" },
+ { 0x10768002, "LU150 LTE Modem [Yota LU150]" },
{ 0x107b3009, "eHome Infrared Transceiver" },
{ 0x107b55b2, "WBU-110 802.11b Wireless Adapter [Intersil PRISM 3]" },
{ 0x107b55f2, "WGU-210 802.11g Adapter [Intersil ISL3886]" },
@@ -15803,6 +15812,7 @@ static const value_string usb_products_vals[] = {
{ 0x13d33375, "Atheros AR3012 Bluetooth 4.0 Adapter" },
{ 0x13d33392, "Azurewave 43228+20702" },
{ 0x13d33394, "Bluetooth" },
+ { 0x13d33474, "Atheros AR3012 Bluetooth" },
{ 0x13d35070, "Webcam" },
{ 0x13d35111, "Integrated Webcam" },
{ 0x13d35115, "Integrated Webcam" },
@@ -16036,7 +16046,27 @@ static const value_string usb_products_vals[] = {
{ 0x152a8400, "INI DVS128" },
{ 0x152a840d, "INI DAViS" },
{ 0x152a841a, "INI DAViS FX3" },
- { 0x152b0003, "M.I.R. srl Minispir" },
+ { 0x152b0001, "spirobank II" },
+ { 0x152b0002, "spirolab III" },
+ { 0x152b0003, "MiniSpir" },
+ { 0x152b0004, "Oxi" },
+ { 0x152b0005, "spiros II" },
+ { 0x152b0006, "smiths spirobank II" },
+ { 0x152b0007, "smiths spirobank G-USB" },
+ { 0x152b0008, "smiths MiniSpir" },
+ { 0x152b0009, "spirobank G-USB" },
+ { 0x152b000a, "smiths Oxi" },
+ { 0x152b000b, "smiths spirolab III" },
+ { 0x152b000c, "chorus III" },
+ { 0x152b000d, "spirolab III Bw" },
+ { 0x152b000e, "spirolab III" },
+ { 0x152b000f, "easySpiro" },
+ { 0x152b0010, "Spirotel converter" },
+ { 0x152b0011, "spirobank" },
+ { 0x152b0012, "spiro3 Zimmer" },
+ { 0x152b0013, "spirotel serial" },
+ { 0x152b0014, "spirotel II" },
+ { 0x152b0015, "spirodoc" },
{ 0x152d0539, "JMS539/567 SuperSpeed SATA II/III 3.0G/6.0G Bridge" },
{ 0x152d0567, "JMS567 SATA 6.0Gb/s bridge" },
{ 0x152d0770, "Alienware Integrated Webcam" },
@@ -16048,6 +16078,10 @@ static const value_string usb_products_vals[] = {
{ 0x152d2339, "JM20339 SATA Bridge" },
{ 0x152d2352, "ATA/ATAPI Bridge" },
{ 0x152d2509, "JMS539 SuperSpeed SATA II 3.0G Bridge" },
+ { 0x152d2551, "JMS551 SATA 3Gb/s bridge" },
+ { 0x152d2566, "JMS566 SATA 3Gb/s bridge" },
+ { 0x152d3562, "JMS567 SATA 6.0Gb/s bridge" },
+ { 0x152d3569, "ATA/ATAPI Bridge [AdPlus SuperVer]" },
{ 0x152e2507, "PL-2507 IDE Controller" },
{ 0x152ee001, "GSA-5120D DVD-RW" },
{ 0x15320001, "RZ01-020300 Optical Mouse [Diamondback]" },
@@ -16068,14 +16102,19 @@ static const value_string usb_products_vals[] = {
{ 0x15320300, "RZ06-0063 Motion Sensing Controllers [Hydra]" },
{ 0x153b1181, "Cinergy S2 PCIe Dual Port 1" },
{ 0x153b1182, "Cinergy S2 PCIe Dual Port 2" },
+ { 0x154601a5, "NL-402U" },
{ 0x15471000, "SG-Lock[U2]" },
{ 0x154a8180, "CARD STAR/medic2" },
{ 0x154b0010, "USB 2.0 Flash Drive" },
{ 0x154b0048, "Flash Drive" },
{ 0x154b004d, "8 GB Flash Drive" },
+ { 0x154b0053, "Flash Drive" },
{ 0x154b0057, "32GB Micro Slide Attache Flash Drive" },
- { 0x154b007a, "8GB Classic Attache Flash Drive" },
+ { 0x154b005b, "Flash Drive" },
+ { 0x154b0062, "Flash Drive" },
+ { 0x154b007a, "Classic Attache Flash Drive" },
{ 0x154b6545, "FD Device" },
+ { 0x154bfa05, "Flash Drive" },
{ 0x154e3000, "Marantz RC9001 Remote Control" },
{ 0x15545010, "PV-D231U(RN)-F [PixelView PlayTV SBTVD Full-Seg]" },
{ 0x15570002, "model 01 WiFi interface" },
@@ -16116,6 +16155,7 @@ static const value_string usb_products_vals[] = {
{ 0x15a90006, "Wireless 11n USB Adapter" },
{ 0x15a90010, "802.11n USB Wireless Card" },
{ 0x15a90012, "WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870]" },
+ { 0x15a9002d, "WLTUBA-107 [Yota 4G LTE]" },
{ 0x15ba0003, "OpenOCD JTAG" },
{ 0x15ba0004, "OpenOCD JTAG TINY" },
{ 0x15ba002a, "ARM-USB-TINY-H JTAG interface" },
@@ -16306,6 +16346,7 @@ static const value_string usb_products_vals[] = {
{ 0x165b8101, "Tranzport Control Surface" },
{ 0x165bfad1, "Alphatrack Control Surface" },
{ 0x165c0002, "Serial Adapter" },
+ { 0x16670005, "PCR330A RFID Reader (125 kHz, keyboard emulation)" },
{ 0x16680009, "Gateway" },
{ 0x16680333, "Modem" },
{ 0x16680358, "InternetPhoneWizard" },
@@ -17740,6 +17781,14 @@ static const value_string usb_products_vals[] = {
{ 0x2a03803c, "Arduino Explora (CDC ACM)" },
{ 0x2a038041, "Arduino Yun (CDC ACM)" },
{ 0x2a03804d, "Arduino Zero Pro (CDC ACM)" },
+ { 0x2a450001, "MX Phone (BICR)" },
+ { 0x2a450c02, "MX Phone (MTP & ADB)" },
+ { 0x2a450c03, "MX Phone (BICR & ADB)" },
+ { 0x2a452008, "MX Phone (MTP)" },
+ { 0x2a45200a, "MX Phone (MTP & ACM & ADB)" },
+ { 0x2a45200b, "MX Phone (PTP)" },
+ { 0x2a45200c, "MX Phone (PTP & ADB)" },
+ { 0x2a452012, "MX Phone (MTP & ACM)" },
{ 0x2c0214ea, "GW-US11H WLAN" },
{ 0x2c1a0000, "Wireless Optical Mouse" },
{ 0x31250001, "TrackerPod Camera Stand" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 02233fe01d..a544471165 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2015-03-29)
+(last updated 2015-04-04)
SMI Network Management Private Enterprise Codes:
@@ -311,8 +311,8 @@ Decimal
mib_contact&bandit.ns.cs.boeing.com
74
AT&T
- Mark A. Horstman
- mark.horstman&att.com
+ Domain Administrator
+ att-domains&att.com
75
Ungermann-Bass
Didier Moretti
@@ -3942,9 +3942,9 @@ Decimal
Cynthia Beighley
maedeen&romulus.ncsc.mil
982
- Southwestern Bell Corporation
- Brian Bearden
- bb8840&swuts.sbc.com
+ Southwestern Bell Corporation (AT&T) (formerly "Southwestern Bell Corporation")
+ Jeremy Monroe
+ att-domains&att.com
983
Virtual Design Group, Inc.
Chip Standifer
@@ -37166,9 +37166,9 @@ Decimal
Piero Serini
p.serini&esi.it
9303
- PacketFront Sweden AB
+ PacketFront Network Products AB
Fredrik Nyman
- fredrik&packetfront.com
+ fredrik&packetfront.net
9304
Connection Technology Systems
Wesley Liao
@@ -94685,9 +94685,9 @@ Development Institute
Robert Lacroix
r.lacroix&asklepios.com
23780
- Freedomware UK
- Mark Bannister
- Freedomware&aol.com
+ Prose Consulting Ltd. (formerly "Freedomware UK")
+ Mark R. Bannister
+ mark&proseconsulting.co.uk
23781
Albertslund Ungdomsboliger
J. Martin Petersen
@@ -145770,7 +145770,7 @@ Decentralization / Helenic Public Administra
36547
Heimatverein Elte e.V.
Klaus Paradies
- info&heimatverein-elte.de
+ technik&heimatverein-elte.de
36548
Virtualmin Inc
Jamie Cameron
@@ -181736,9 +181736,9 @@ Decentralization / Helenic Public Administra
Sebastien DEON
sebastien.deon&pharmagest.com
45539
- private use - Domain fritze.org
+ Domain fritze.org
Stefan Fritze
- sf&fritze.org
+ info&fritze.org
45540
Rueval S.A.
Ricardo Arias
@@ -181923,6 +181923,166 @@ Decentralization / Helenic Public Administra
Space Imaging Middle East (SIME)
Spandan Kar
spandan&dsi.co.ae
+45586
+ Mythic Network
+ Ilya Kogan
+ ikogan&mythicnet.org
+45587
+ Software & Service Center,Sichuan Changhong Electric Co.,Ltd
+ Chuan Gu
+ chuan.gu&changhong.com
+45588
+ OLSPS
+ Rikus Combrinck
+ rikus&olsps.com
+45589
+ Doc-Soft Ltd.
+ Daniel KEKESI
+ daniel.kekesi&docsoft.hu
+45590
+ Mutesah General Investments ltd
+ Golan Mutesah
+ mutesah&yahoo.com
+45591
+ Shenzhen Sungreat Communication Co.,LTD
+ huangchuen
+ 1320798537&qq.com
+45592
+ Julius Clinical
+ Sander Böhm
+ admin&juliusclinical.com
+45593
+ OpenREM
+ Ed McDonagh
+ pen&openrem.org
+45594
+ Università Iuav di Venezia
+ Boeretto Marco
+ boeretto&iuav.it
+45595
+ Reaktor 23
+ Elias Bonauer
+ info&reaktor23.org
+45596
+ ICloud Innovation (Beijing) ltd.
+ Weihua Li
+ liweihua&icloudinno.com
+45597
+ TESA Assa Abloy
+ Julia Vila
+ j.vila&tesa.es
+45598
+ Mckinney Independent School District
+ Robert Foster
+ rfoster&mckinneyisd.net
+45599
+ Network RADIUS SARL
+ Alan DeKok
+ aland&networkradius.com
+45600
+ OX Service AG
+ Markus Ruefenacht
+ support&ors.ch
+45601
+ Wikimedia Deutschland e.V.
+ Silke Meyer
+ noc&wikimedia.de
+45602
+ Corvus Energy
+ Nick Erb
+ nerb&corvus-energy.com
+45603
+ Rieker, Inc.
+ Harry May
+ hmay&riekerinc.com
+45604
+ BeiJing SmartWell Info&Tech Co.,Ltd.
+ Fountain Hsiao
+ info&smartwell.cn
+45605
+ Wi-SUN Alliance, Inc
+ Phil Beecher
+ pbeecher&wi-sun.org
+45606
+ Carillon Federal Services Inc.
+ Patrick Turcotte
+ pturcotte&carillon.ca
+45607
+ Sysco Foods
+ Michael Germony
+ germony.michael&corp.sysco.com
+45608
+ Atlan dynamic group
+ Anton V. Sekretov
+ service&ahilles.name
+45609
+ Centralschweizerische Kraftwerke AG
+ Daniel Jud
+ oid-admin&ckw.ch
+45610
+ EAM GmbH & Co.KG
+ Uwe Scheller
+ it&eam.de
+45611
+ EOSPACE Inc.
+ William Dougherty
+ dougherty&eospace.com
+45612
+ Under Armour Connected Fitness
+ Stew Blanford
+ sblanford&underarmour.com
+45613
+ Universiti Malaysia Terengganu
+ Ahmad Nazir bin Haron
+ admin&umt.edu.my
+45614
+ RegEd Inc.
+ Yury Nemchin
+ yury.nemchin&ontarget-group.com
+45615
+ CityNet
+ Gubanov Dmitry
+ koloskovm&mail.citynet.ru
+45616
+ Healthcare Information and Management System Society (HIMSS)
+ Richard Delort
+ rdelort&himss.org
+45617
+ The Institute of Computational Technologies of the Siberian Branch of the Russian Academy of Sciences
+ Oleg Zhizhimov
+ zhizhim&mail.ru
+45618
+ Ferdinand Malcher
+ Ferdinand Malcher
+ mail&ferdinand-malcher.de
+45619
+ Oei Family Office
+ Chris Oei
+ admin&oei.io
+45620
+ Steampunk Island Inc
+ James N Riley Jr
+ webmaster&steampunkisland.com
+45621
+ Tycon Systems Inc.
+ Scott Parsons
+ scottp&tyconsystems.com
+45622
+ Netrix LLC.
+ Andrew Meyer
+ ameyer&netrixllc.com
+45623
+ Hughey & Phillips, LLC
+ Michael A. Forhan
+ mforhan&hugheyandphillips.com
+45624
+ Brain Sense
+ Haim Gabsow
+ haim&brain-sense.co.il
+45625
+ hahnefeld.net
+ Andreas Hahnefeld
+ info&hahnefeld.net
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 8c94f50090..9b58be9713 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -1002,7 +1002,7 @@ const value_string sminmpec_values[] = {
{ 979, "Digicom, SPA" },
{ 980, "Ark Telecom" },
{ 981, "National Security Agency (NSA)" },
- { 982, "Southwestern Bell Corporation" },
+ { 982, "Southwestern Bell Corporation (AT&T) (formerly \"Southwestern Bell Corporation\")" },
{ 983, "Virtual Design Group, Inc." },
{ 984, "Rhone Poulenc" },
{ 985, "Swiss Bank Corporation" },
@@ -9323,7 +9323,7 @@ const value_string sminmpec_values[] = {
{ 9300, "Hypostasis" },
{ 9301, "Spider Software" },
{ 9302, "ESI s.r.l." },
- { 9303, "PacketFront Sweden AB" },
+ { 9303, "PacketFront Network Products AB" },
{ 9304, "Connection Technology Systems" },
{ 9305, "Western Michigan University" },
{ 9306, "Octave Communications" },
@@ -23800,7 +23800,7 @@ const value_string sminmpec_values[] = {
{ 23777, "Elektrarny Opatovice a.s." },
{ 23778, "BEZ Systems, Inc." },
{ 23779, "Asklepios Group" },
- { 23780, "Freedomware UK" },
+ { 23780, "Prose Consulting Ltd. (formerly \"Freedomware UK\")" },
{ 23781, "Albertslund Ungdomsboliger" },
{ 23782, "ASN" },
{ 23783, "iTellus Holdings, Inc. (previous was 'Tellurian Networks, Inc.')" },
@@ -45559,7 +45559,7 @@ const value_string sminmpec_values[] = {
{ 45536, "Rheinmetall Defence Electronics GmbH" },
{ 45537, "NUAZ" },
{ 45538, "PHARMAGEST INTERACTIVE" },
- { 45539, "private use - Domain fritze.org" },
+ { 45539, "Domain fritze.org" },
{ 45540, "Rueval S.A." },
{ 45541, "Schneider Elektronik GmbH" },
{ 45542, "Orlando Utilities Commission" },
@@ -45606,6 +45606,46 @@ const value_string sminmpec_values[] = {
{ 45583, "Puminsoft Co.,Ltd." },
{ 45584, "OJSC \"RIRT\"" },
{ 45585, "Space Imaging Middle East (SIME)" },
+ { 45586, "Mythic Network" },
+ { 45587, "Software & Service Center,Sichuan Changhong Electric Co.,Ltd" },
+ { 45588, "OLSPS" },
+ { 45589, "Doc-Soft Ltd." },
+ { 45590, "Mutesah General Investments ltd" },
+ { 45591, "Shenzhen Sungreat Communication Co.,LTD" },
+ { 45592, "Julius Clinical" },
+ { 45593, "OpenREM" },
+ { 45594, "Universit\0303\0240 Iuav di Venezia" },
+ { 45595, "Reaktor 23" },
+ { 45596, "ICloud Innovation (Beijing) ltd." },
+ { 45597, "TESA Assa Abloy" },
+ { 45598, "Mckinney Independent School District" },
+ { 45599, "Network RADIUS SARL" },
+ { 45600, "OX Service AG" },
+ { 45601, "Wikimedia Deutschland e.V." },
+ { 45602, "Corvus Energy" },
+ { 45603, "Rieker, Inc." },
+ { 45604, "BeiJing SmartWell Info&Tech Co.,Ltd." },
+ { 45605, "Wi-SUN Alliance, Inc" },
+ { 45606, "Carillon Federal Services Inc." },
+ { 45607, "Sysco Foods" },
+ { 45608, "Atlan dynamic group" },
+ { 45609, "Centralschweizerische Kraftwerke AG" },
+ { 45610, "EAM GmbH & Co.KG" },
+ { 45611, "EOSPACE Inc." },
+ { 45612, "Under Armour Connected Fitness" },
+ { 45613, "Universiti Malaysia Terengganu" },
+ { 45614, "RegEd Inc." },
+ { 45615, "CityNet" },
+ { 45616, "Healthcare Information and Management System Society (HIMSS) " },
+ { 45617, "The Institute of Computational Technologies of the Siberian Branch of the Russian Academy of Sciences" },
+ { 45618, "Ferdinand Malcher" },
+ { 45619, "Oei Family Office" },
+ { 45620, "Steampunk Island Inc" },
+ { 45621, "Tycon Systems Inc." },
+ { 45622, "Netrix LLC." },
+ { 45623, "Hughey & Phillips, LLC" },
+ { 45624, "Brain Sense" },
+ { 45625, "hahnefeld.net" },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index 76bda39354..b9e91d8876 100644
--- a/manuf
+++ b/manuf
@@ -17998,6 +17998,7 @@
1C:83:B0 LinkedIp # Linked IP GmbH
1C:84:64 FormosaW # FORMOSA WIRELESS COMMUNICATION CORP.
1C:86:AD Mct # MCT CO., LTD.
+1C:87:2C Private
1C:8E:5C HuaweiTe # Huawei Technologies Co., Ltd
1C:8E:8E DbCommun # DB Communication & Systems Co., ltd.
1C:8F:8A PhaseMot # Phase Motion Control SpA
@@ -18582,6 +18583,7 @@
30:89:99 Guangdon # Guangdong East Power Co.,
30:89:D3 Hongkong # HONGKONG UCLOUDLINK NETWORK TECHNOLOGY LIMITED
30:8C:FB Dropcam
+30:8D:99 HewlettP # Hewlett Packard
30:90:AB Apple
30:91:8F Technico # Technicolor
30:92:F6 Shanghai # SHANGHAI SUNMON COMMUNICATION TECHNOGY CO.,LTD
@@ -18675,6 +18677,7 @@
34:78:77 O-NetCom # O-NET Communications(Shenzhen) Limited
34:7A:60 Pace # Pace plc
34:7E:39 NokiaDan # Nokia Danmark A/S
+34:80:B3 Xiaomi # XIAOMI INC
34:81:37 UnicardS # UNICARD SA
34:81:C4 Avm # AVM GmbH
34:82:DE KayoTech # Kayo Technology, Inc.
@@ -20078,7 +20081,7 @@
54:31:31 RasterVi # Raster Vision Ltd
54:35:30 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
54:35:DF Symeo # Symeo GmbH
-54:36:9B 1vergeNe # 1Verge Network Technology (Beijing) Co Ltd
+54:36:9B 1vergeIn # 1Verge Internet Technology (Beijing) Co., Ltd.
54:39:68 Edgewate # Edgewater Networks Inc
54:39:DF HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
54:3D:37 RuckusWi # Ruckus Wireless
@@ -20089,6 +20092,7 @@
54:4A:00 Cisco
54:4A:05 WenglorS # wenglor sensoric gmbh
54:4A:16 TexasIns # Texas Instruments
+54:4E:45 Private
54:51:46 Amg # AMG Systems Ltd.
54:53:ED Sony # Sony Corporation
54:54:14 DigitalR # Digital RF Corea, Inc
@@ -20269,6 +20273,7 @@
58:EB:14 ProteusD # Proteus Digital Health
58:EC:E1 Newport # Newport Corporation
58:EE:CE IconTime # Icon Time Systems
+58:F1:02 BluProdu # BLU Products Inc.
58:F3:87 Hccp
58:F3:9C Cisco
58:F6:7B XiaMenUn # Xia Men UnionCore Technology LTD.
@@ -21182,6 +21187,7 @@
70:B3:D5:45:F0:00/36 Cloud4wi
70:B3:D5:46:B0:00/36 Airborne # Airborne Engineering Limited
70:B3:D5:46:F0:00/36 ServaTra # serva transport systems GmbH
+70:B3:D5:47:00:00/36 KitronUa # KITRON UAB
70:B3:D5:47:20:00/36 QuadioDe # Quadio Devices Private Limited
70:B3:D5:48:C0:00/36 Integrat # Integrated Systems Engineering, Inc.
70:B3:D5:48:D0:00/36 OmegaBil # OMEGA BILANCE SRL SOCIETA' UNIPERSONALE
@@ -21278,6 +21284,7 @@
70:B3:D5:71:00:00/36 Guardian # Guardian Controls International Ltd
70:B3:D5:71:E0:00/36 MotecPty # Motec Pty Ltd
70:B3:D5:72:90:00/36 Emac # EMAC, Inc.
+70:B3:D5:72:D0:00/36 KronMedi # Kron Medidores
70:B3:D5:73:10:00/36 Phoniro # Phoniro Systems AB
70:B3:D5:73:20:00/36 Tofwerk # TOFWERK AG
70:B3:D5:73:E0:00/36 TridentR # Trident RFID Pty Ltd
@@ -21317,6 +21324,7 @@
70:B3:D5:82:00:00/36 BeckerNa # Becker Nachrichtentechnik GmbH
70:B3:D5:82:30:00/36 SpContro # SP Controls
70:B3:D5:82:C0:00/36 Nels # NELS Ltd.
+70:B3:D5:82:E0:00/36 Playaliv # PlayAlive A/S
70:B3:D5:83:80:00/36 Tofino
70:B3:D5:83:B0:00/36 Telefoni # Telefonix Incorporated
70:B3:D5:83:F0:00/36 LumineLi # Lumine Lighting Solutions Oy
@@ -21430,6 +21438,7 @@
70:B3:D5:B7:80:00/36 Hoermann # HOERMANN GmbH
70:B3:D5:B7:E0:00/36 ElbitOfA # Elbit Systems of America - FMF Operations
70:B3:D5:B8:20:00/36 LookoutP # Lookout Portable Security
+70:B3:D5:B8:50:00/36 Fenotech # Fenotech Inc.
70:B3:D5:B8:80:00/36 Arp # ARP Corporation
70:B3:D5:B8:A0:00/36 NexusTec # Nexus Tech. VN
70:B3:D5:B8:B0:00/36 Profound # Profound Medical Inc.
@@ -21657,6 +21666,7 @@
74:15:E2 Tri-Sen # Tri-Sen Systems Corporation
74:19:F8 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information.
74:1E:93 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd.
+74:1F:4A Hangzhou # Hangzhou H3C Technologies Co., Limited
74:25:8A Hangzhou # Hangzhou H3C Technologies Co., Limited
74:26:AC Cisco
74:27:3C Changyan # ChangYang Technology (Nanjing) Co., LTD
@@ -22016,6 +22026,7 @@
7C:C8:AB AcroAsso # Acro Associates, Inc.
7C:C8:D0 TianjinY # TIANJIN YAAN TECHNOLOGY CO., LTD.
7C:C8:D7 Damalisk
+7C:C9:5A Emc
7C:CB:0D AntairaT # Antaira Technologies, LLC
7C:CC:B8 IntelCor # Intel Corporate
7C:CD:11 Ms-Magne # MS-Magnet
@@ -22390,6 +22401,7 @@
88:C6:63 Apple
88:C9:D0 LgElectr # LG Electronics
88:CB:87 Apple
+88:CB:A5 SuzhouTo # Suzhou Torchstar Intelligent Technology Co.,Ltd
88:CE:FA HuaweiTe # Huawei Technologies Co., Ltd
88:D3:7B FirmtekL # FirmTek, LLC
88:D7:BC Dep # DEP Company
@@ -23355,6 +23367,7 @@ A8:D0:E5 JuniperN # Juniper Networks
A8:D2:36 Lightwar # Lightware Visual Engineering
A8:D3:C8 Wachendo # Wachendorff Elektronik GmbH & Co. KG
A8:D4:09 Usa111 # USA 111 Inc
+A8:D8:28 BayerHea # Bayer HealthCare
A8:D8:8A Wyconn
A8:E0:18 Nokia # Nokia Corporation
A8:E3:EE SonyComp # Sony Computer Entertainment Inc.
@@ -23555,6 +23568,7 @@ B0:77:AC ArrisGro # ARRIS Group, Inc.
B0:79:08 Cummings # Cummings Engineering
B0:79:3C Revolv # Revolv Inc
B0:79:94 Motorola # Motorola Mobility LLC
+B0:7D:47 Cisco # Cisco Systems
B0:7D:62 Dipl-Ing # Dipl.-Ing. H. Horstmann GmbH
B0:80:8C LaserLig # Laser Light Engines
B0:81:D8 I-Sys # I-sys Corp
@@ -23781,6 +23795,7 @@ B8:62:1F Cisco # CISCO SYSTEMS, INC.
B8:63:BC Robotis # ROBOTIS, Co, Ltd
B8:64:91 CkTeleco # CK Telecom Ltd
B8:65:3B Bolymin # Bolymin, Inc.
+B8:69:C2 SunitecE # Sunitec Enterprise Co., Ltd.
B8:6B:23 Toshiba
B8:6C:E8 SamsungE # Samsung Electronics Co.,Ltd
B8:70:F4 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD.
@@ -24099,6 +24114,7 @@ C0:DF:77 ConradEl # Conrad Electronic SE
C0:E4:22 TexasIns # Texas Instruments
C0:E5:4E DenxComp # DENX Computer Systems GmbH
C0:EA:E4 Sonicwal # Sonicwall
+C0:EE:40 LairdTec # Laird Technologies
C0:EE:FB OneplusT # OnePlus Tech (Shenzhen) Ltd
C0:F1:C4 Pacidal # Pacidal Corporation Ltd.
C0:F2:FB Apple
@@ -24386,6 +24402,7 @@ CC:33:BB Sagemcom # SAGEMCOM SAS
CC:34:29 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD.
CC:34:D7 GewissSP # GEWISS S.P.A.
CC:35:40 Technico # Technicolor USA Inc.
+CC:37:AB Edgecore # Edgecore Networks Corportation
CC:39:8C Shiningt # Shiningtek
CC:3A:61 SamsungE # SAMSUNG ELECTRO MECHANICS CO., LTD.
CC:3C:3F SaSSDate # SA.S.S. Datentechnik AG
@@ -24408,6 +24425,7 @@ CC:59:3E Toumaz # TOUMAZ LTD
CC:5C:75 Weightec # Weightech Com. Imp. Exp. Equip. Pesagem Ltda
CC:5D:4E ZyxelCom # ZyXEL Communications Corporation
CC:5D:57 Informat # Information System Research Institute,Inc.
+CC:5F:BF Topwise3 # Topwise 3G Communication Co., Ltd.
CC:60:BB EmpowerR # Empower RF Systems
CC:65:AD ArrisGro # ARRIS Group, Inc.
CC:69:B0 GlobalTr # Global Traffic Technologies, LLC
@@ -24965,6 +24983,7 @@ DC:E1:AD Shenzhen # Shenzhen Wintop Photoelectric Technology Co.,
DC:E2:AC LumensDi # Lumens Digital Optics Inc.
DC:E5:78 Experime # Experimental Factory of Scientific Engineering and Special Design Department
DC:E7:1C AugElekt # AUG Elektronik GmbH
+DC:EB:94 Cisco # Cisco Systems
DC:EC:06 HeimiNet # Heimi Network Technology Co., Ltd.
DC:F0:5D LettaTek # Letta Teknoloji
DC:F1:10 Nokia # Nokia Corporation
@@ -24994,6 +25013,7 @@ E0:26:30 Intrigue # Intrigue Technologies, Inc.
E0:26:36 NortelNe # Nortel Networks
E0:27:1A TtcNext- # TTC Next-generation Home Network System WG
E0:2A:82 Universa # Universal Global Scientific Industrial Co., Ltd.
+E0:2C:B2 LenovoMo # Lenovo Mobile Communication (Wuhan) Company Limited
E0:2F:6D Cisco
E0:30:05 Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd
E0:31:D0 SzTelsta # SZ Telstar CO., LTD
@@ -25443,6 +25463,7 @@ F0:07:86 Shandong # Shandong Bittel Electronics Co., Ltd
F0:08:F1 SamsungE # Samsung Electronics Co.,Ltd
F0:13:C3 Shenzhen # SHENZHEN FENDA TECHNOLOGY CO., LTD
F0:15:A0 Kyungdon # KyungDong One Co., Ltd.
+F0:18:2B LgChem # LG Chem
F0:1C:13 LgElectr # LG Electronics
F0:1C:2D JuniperN # Juniper Networks
F0:1E:34 OricoTec # ORICO Technologies Co., Ltd
@@ -25454,6 +25475,7 @@ F0:24:08 TalarisS # Talaris (Sweden) AB
F0:24:75 Apple
F0:25:72 Cisco # CISCO SYSTEMS, INC.
F0:25:B7 SamsungE # Samsung Electro Mechanics co., LTD.
+F0:26:24 WafaTech # WAFA TECHNOLOGIES CO., LTD.
F0:26:4C DrSigris # Dr. Sigrist AG
F0:27:65 MurataMa # Murata Manufactuaring Co.,Ltd.
F0:29:29 Cisco
@@ -25560,6 +25582,7 @@ F0:F8:42 Keebox # KEEBOX, Inc.
F0:F9:F7 Ies # IES GmbH & Co. KG
F0:FD:A0 AcurixNe # Acurix Networks LP
F0:FE:6B Shanghai # Shanghai High-Flying Electronics Technology Co., Ltd
+F4:03:04 Google
F4:03:21 BenextBV # BeNeXt B.V.
F4:03:2F Reduxio # Reduxio Systems
F4:04:4C Valencet # ValenceTech Limited
@@ -25611,6 +25634,7 @@ F4:5F:F7 DqTechno # DQ Technology Inc.
F4:60:0D Panoptic # Panoptic Technology, Inc
F4:63:49 Diffon # Diffon Corporation
F4:64:5D Toshiba
+F4:67:2D Shenzhen # ShenZhen Topstar Technology Company
F4:6A:92 Shenzhen # SHENZHEN FAST TECHNOLOGIES CO.,LTD
F4:6A:BC Adonit # Adonit Corp. Ltd.
F4:6D:04 AsustekC # ASUSTek COMPUTER INC.
@@ -25683,6 +25707,7 @@ F8:0B:BE ArrisGro # ARRIS Group, Inc.
F8:0B:D0 DatangTe # Datang Telecom communication terminal (Tianjin) Co., Ltd.
F8:0C:F3 LgElectr # LG Electronics
F8:0D:43 HonHaiPr # Hon Hai Precision Ind. Co., Ltd.
+F8:0D:60 Canon # CANON INC.
F8:0D:EA ZycastTe # ZyCast Technology Inc.
F8:0F:41 WistronI # Wistron InfoComm(ZhongShan) Corporation
F8:0F:84 NaturalS # Natural Security SAS
@@ -25803,6 +25828,7 @@ F8:F0:14 Rackware # RackWare Inc.
F8:F0:82 OrionNet # Orion Networks International, Inc
F8:F1:B6 Motorola # Motorola Mobility LLC
F8:F2:5A G-Lab # G-Lab GmbH
+F8:F4:64 RaweElec # Rawe Electonic GmbH
F8:F7:D3 Internat # International Communications Corporation
F8:F7:FF Syn-Tech # SYN-TECH SYSTEMS INC
F8:FB:2F Santur # Santur Corporation
diff --git a/services b/services
index f127ea4a40..a355bff8d2 100644
--- a/services
+++ b/services
@@ -9733,6 +9733,7 @@ sun-user-https 7677/tcp # Sun App Server - HTTPS [Abhijit_Kumar] [Abhijit_Kuma
sun-user-https 7677/udp # Sun App Server - HTTPS [Abhijit_Kumar] [Abhijit_Kumar] 2005-11
pando-pub 7680/tcp # Pando Media Public Distribution [Laird_Popkin] [Laird_Popkin] 2008-02-27
pando-pub 7680/udp # Pando Media Public Distribution [Laird_Popkin] [Laird_Popkin] 2008-02-27
+dmt 7683/tcp # Cleondris DMT [Cleondris_GmbH] [Christian_Plattner] 2015-03-31
collaber 7689/tcp # Collaber Network Service [Rajesh_Akkineni] [Rajesh_Akkineni] 2007-01
collaber 7689/udp # Collaber Network Service [Rajesh_Akkineni] [Rajesh_Akkineni] 2007-01
klio 7697/tcp # KLIO communications [Helmut_Giritzer_2] [Helmut_Giritzer_2] 2005-08
diff --git a/ui/qt/wireshark_de.qm b/ui/qt/wireshark_de.qm
index 93b9eb1ff0..b4c40ce355 100644
--- a/ui/qt/wireshark_de.qm
+++ b/ui/qt/wireshark_de.qm
Binary files differ
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index afb497d1d6..48dc3d5f1b 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -656,7 +656,7 @@
<message>
<location filename="capture_interfaces_dialog.ui" line="295"/>
<source>Create a new file automatically after...</source>
- <translation>Automatisch neue Datei erzeugen nach...</translation>
+ <translation>Automatisch eine neue Datei erzeugen nach...</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="339"/>
@@ -767,7 +767,7 @@
<message>
<location filename="capture_interfaces_dialog.ui" line="247"/>
<source>Capture to a permanent file</source>
- <translation>In in eine bleibende Datei aufzeichnen</translation>
+ <translation>In eine bleibende Datei aufzeichnen</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="292"/>
@@ -802,7 +802,7 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<message>
<location filename="capture_interfaces_dialog.ui" line="446"/>
<source>Use a ring buffer with </source>
- <translation>Verwende eine Ringpuffer mit </translation>
+ <translation>Verwende einen Ringpuffer mit </translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="463"/>
@@ -913,15 +913,15 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="531"/>
- <location filename="capture_interfaces_dialog.cpp" line="538"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>enabled</source>
<translation>aktivieren</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="531"/>
- <location filename="capture_interfaces_dialog.cpp" line="538"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>disabled</source>
<translation>deaktivieren</translation>
</message>
@@ -951,40 +951,40 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>keine Adressen</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="518"/>
+ <location filename="capture_interfaces_dialog.cpp" line="514"/>
<source>default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="538"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>n/a</source>
<translation>Nicht verfügbar</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="671"/>
- <location filename="capture_interfaces_dialog.cpp" line="679"/>
+ <location filename="capture_interfaces_dialog.cpp" line="667"/>
+ <location filename="capture_interfaces_dialog.cpp" line="675"/>
+ <location filename="capture_interfaces_dialog.cpp" line="686"/>
<location filename="capture_interfaces_dialog.cpp" line="690"/>
- <location filename="capture_interfaces_dialog.cpp" line="694"/>
- <location filename="capture_interfaces_dialog.cpp" line="707"/>
- <location filename="capture_interfaces_dialog.cpp" line="715"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="711"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="672"/>
- <location filename="capture_interfaces_dialog.cpp" line="680"/>
- <location filename="capture_interfaces_dialog.cpp" line="708"/>
- <location filename="capture_interfaces_dialog.cpp" line="716"/>
+ <location filename="capture_interfaces_dialog.cpp" line="668"/>
+ <location filename="capture_interfaces_dialog.cpp" line="676"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="712"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation>Dateisatz: Angeforderte Dateigröße zu groß! Die Dateigröße kann nicht größer als 2 GiB sein.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
+ <location filename="capture_interfaces_dialog.cpp" line="687"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation>Dateisatz: Keinen Dateinamen angeben! Wenn ein Dateisatz genutzt werden soll, muss ein Dateiname angegeben werden.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="695"/>
+ <location filename="capture_interfaces_dialog.cpp" line="691"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation>Dateisatz: Kein Limit angegeben! Wenn ein Dateisatz genutzt werden soll, muss eine Dateigröße oder eine Laufzeit angegeben werden, bei der zur nächsten Datei gewechselt wird</translation>
@@ -1563,17 +1563,17 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>Objekt speichern unter</translation>
</message>
<message>
- <location filename="export_object_dialog.cpp" line="277"/>
+ <location filename="export_object_dialog.cpp" line="287"/>
<source>Save All Objects In</source>
<translation>Alle Objekete sichern in</translation>
</message>
<message>
- <location filename="export_object_dialog.cpp" line="316"/>
+ <location filename="export_object_dialog.cpp" line="329"/>
<source>Object Export</source>
<translation>Objektexport</translation>
</message>
<message>
- <location filename="export_object_dialog.cpp" line="317"/>
+ <location filename="export_object_dialog.cpp" line="330"/>
<source>Some files could not be saved.</source>
<translation>Einige Dateien konnten nicht gespeichert werden.</translation>
</message>
@@ -2734,16 +2734,16 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="960"/>
- <location filename="capture_interfaces_dialog.cpp" line="993"/>
- <location filename="capture_interfaces_dialog.cpp" line="1042"/>
- <location filename="capture_interfaces_dialog.cpp" line="1062"/>
+ <location filename="capture_interfaces_dialog.cpp" line="956"/>
+ <location filename="capture_interfaces_dialog.cpp" line="989"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1058"/>
<source>enabled</source>
<translation>aktiviert</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="961"/>
- <location filename="capture_interfaces_dialog.cpp" line="994"/>
+ <location filename="capture_interfaces_dialog.cpp" line="957"/>
+ <location filename="capture_interfaces_dialog.cpp" line="990"/>
<source>disabled</source>
<translation>deaktiviert</translation>
</message>
@@ -4979,7 +4979,7 @@ text-decoration: underline;
<message>
<location filename="main_window.ui" line="921"/>
<source>Export Packet &amp;Bytes...</source>
- <translation>Paket %Bytes exportieren...</translation>
+ <translation>Paket &amp;Bytes exportieren...</translation>
</message>
<message>
<location filename="main_window.ui" line="924"/>
@@ -5216,7 +5216,7 @@ text-decoration: underline;
<location filename="main_window.ui" line="1127"/>
<location filename="main_window.ui" line="1172"/>
<source>... o&amp;r not Selected</source>
- <translation>... ode%r nicht das Ausgewählte</translation>
+ <translation>... ode&amp;r nicht das Ausgewählte</translation>
</message>
<message>
<location filename="main_window.ui" line="1130"/>
@@ -6228,7 +6228,7 @@ text-decoration: underline;
<message>
<location filename="main_window.ui" line="2108"/>
<source>Resolve &amp;Physical Addresses</source>
- <translation>%Physikalische Adressen auflösen</translation>
+ <translation>&amp;Physikalische Adressen auflösen</translation>
</message>
<message>
<location filename="main_window.ui" line="2111"/>
@@ -6642,7 +6642,7 @@ text-decoration: underline;
<message>
<location filename="main_window_preferences_frame.ui" line="60"/>
<source>This folder:</source>
- <translation>Dieser Ordner:</translation>
+ <translation>Diesen Ordner:</translation>
</message>
<message>
<location filename="main_window_preferences_frame.ui" line="73"/>
@@ -6652,7 +6652,7 @@ text-decoration: underline;
<message>
<location filename="main_window_preferences_frame.ui" line="80"/>
<source>The most recently used folder</source>
- <translation>Zuletzt genutzter Ordner</translation>
+ <translation>Zuletzt genutzten Ordner</translation>
</message>
<message>
<location filename="main_window_preferences_frame.ui" line="92"/>
@@ -6834,12 +6834,12 @@ text-decoration: underline;
<translation>Diese Version von Wireshark unterstützt keine entfernten Interfaces.</translation>
</message>
<message>
- <location filename="manage_interfaces_dialog.cpp" line="421"/>
+ <location filename="manage_interfaces_dialog.cpp" line="422"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="manage_interfaces_dialog.cpp" line="422"/>
+ <location filename="manage_interfaces_dialog.cpp" line="423"/>
<source>Default interface cannot be hidden.</source>
<translation>Standard Interface kann nicht versteckt werden.</translation>
</message>
@@ -6954,47 +6954,47 @@ text-decoration: underline;
<context>
<name>PacketList</name>
<message>
- <location filename="packet_list.cpp" line="603"/>
+ <location filename="packet_list.cpp" line="605"/>
<source>Align Left</source>
<translation>Links ausrichten</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="604"/>
+ <location filename="packet_list.cpp" line="606"/>
<source>Align Center</source>
<translation>Zentriert ausrichten</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="605"/>
+ <location filename="packet_list.cpp" line="607"/>
<source>Align Right</source>
<translation>Rechts ausrichten</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="607"/>
+ <location filename="packet_list.cpp" line="609"/>
<source>Column Preferences</source>
<translation>Spalteneigenschaft</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="608"/>
+ <location filename="packet_list.cpp" line="610"/>
<source>Edit Column</source>
<translation>Spalte editieren</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="609"/>
+ <location filename="packet_list.cpp" line="611"/>
<source>Resize To Contents</source>
<translation>Größe an Inhalt anpassen</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="610"/>
+ <location filename="packet_list.cpp" line="612"/>
<source>Resolve Names</source>
<translation>Namen auflösen</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="615"/>
+ <location filename="packet_list.cpp" line="617"/>
<source>Remove This Column</source>
<translation>Spalte entfernen</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="890"/>
+ <location filename="packet_list.cpp" line="892"/>
<source>Frame %1: %2
</source>
@@ -7003,17 +7003,17 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="894"/>
+ <location filename="packet_list.cpp" line="896"/>
<source>[ Comment text exceeds %1. Stopping. ]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1014"/>
+ <location filename="packet_list.cpp" line="1016"/>
<source>Change Time Display Format?</source>
<translation>Format der Zeitanzeige ändern?</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1015"/>
+ <location filename="packet_list.cpp" line="1017"/>
<source>Time References don&apos;t work well with the currently selected Time Display Format.
Do you want to switch to &quot;Seconds Since Beginning of Capture&quot; now?</source>
<translation>Zeitreferenzen passen nicht mit dem ausgewählten Format für die Zeitanzeige zusammen.
@@ -7092,12 +7092,12 @@ Wollen Sie zur Anzeige &quot;Sekunden seit dem Beginn der Aufzeichnung&quot; wec
<context>
<name>PathChooserDelegate</name>
<message>
- <location filename="manage_interfaces_dialog.cpp" line="800"/>
+ <location filename="manage_interfaces_dialog.cpp" line="802"/>
<source>Browse...</source>
<translation type="unfinished">Suchen...</translation>
</message>
<message>
- <location filename="manage_interfaces_dialog.cpp" line="854"/>
+ <location filename="manage_interfaces_dialog.cpp" line="856"/>
<source>Open Pipe</source>
<translation>Öffne Pipe</translation>
</message>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 6e0b3c0436..68aefc3a17 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -910,15 +910,15 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>disabled</source>
<translation type="unfinished"></translation>
</message>
@@ -948,40 +948,40 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="515"/>
+ <location filename="capture_interfaces_dialog.cpp" line="514"/>
<source>default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="668"/>
- <location filename="capture_interfaces_dialog.cpp" line="676"/>
- <location filename="capture_interfaces_dialog.cpp" line="687"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="704"/>
- <location filename="capture_interfaces_dialog.cpp" line="712"/>
+ <location filename="capture_interfaces_dialog.cpp" line="667"/>
+ <location filename="capture_interfaces_dialog.cpp" line="675"/>
+ <location filename="capture_interfaces_dialog.cpp" line="686"/>
+ <location filename="capture_interfaces_dialog.cpp" line="690"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="711"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="669"/>
- <location filename="capture_interfaces_dialog.cpp" line="677"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
- <location filename="capture_interfaces_dialog.cpp" line="713"/>
+ <location filename="capture_interfaces_dialog.cpp" line="668"/>
+ <location filename="capture_interfaces_dialog.cpp" line="676"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="712"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="688"/>
+ <location filename="capture_interfaces_dialog.cpp" line="687"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="692"/>
+ <location filename="capture_interfaces_dialog.cpp" line="691"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation type="unfinished"></translation>
@@ -2705,16 +2705,16 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="957"/>
- <location filename="capture_interfaces_dialog.cpp" line="990"/>
- <location filename="capture_interfaces_dialog.cpp" line="1039"/>
- <location filename="capture_interfaces_dialog.cpp" line="1059"/>
+ <location filename="capture_interfaces_dialog.cpp" line="956"/>
+ <location filename="capture_interfaces_dialog.cpp" line="989"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1058"/>
<source>enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="958"/>
- <location filename="capture_interfaces_dialog.cpp" line="991"/>
+ <location filename="capture_interfaces_dialog.cpp" line="957"/>
+ <location filename="capture_interfaces_dialog.cpp" line="990"/>
<source>disabled</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 071843ac7d..a68ab77630 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -910,15 +910,15 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>disabled</source>
<translation type="unfinished"></translation>
</message>
@@ -948,40 +948,40 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="515"/>
+ <location filename="capture_interfaces_dialog.cpp" line="514"/>
<source>default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="668"/>
- <location filename="capture_interfaces_dialog.cpp" line="676"/>
- <location filename="capture_interfaces_dialog.cpp" line="687"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="704"/>
- <location filename="capture_interfaces_dialog.cpp" line="712"/>
+ <location filename="capture_interfaces_dialog.cpp" line="667"/>
+ <location filename="capture_interfaces_dialog.cpp" line="675"/>
+ <location filename="capture_interfaces_dialog.cpp" line="686"/>
+ <location filename="capture_interfaces_dialog.cpp" line="690"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="711"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="669"/>
- <location filename="capture_interfaces_dialog.cpp" line="677"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
- <location filename="capture_interfaces_dialog.cpp" line="713"/>
+ <location filename="capture_interfaces_dialog.cpp" line="668"/>
+ <location filename="capture_interfaces_dialog.cpp" line="676"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="712"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="688"/>
+ <location filename="capture_interfaces_dialog.cpp" line="687"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="692"/>
+ <location filename="capture_interfaces_dialog.cpp" line="691"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation type="unfinished"></translation>
@@ -2705,16 +2705,16 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="957"/>
- <location filename="capture_interfaces_dialog.cpp" line="990"/>
- <location filename="capture_interfaces_dialog.cpp" line="1039"/>
- <location filename="capture_interfaces_dialog.cpp" line="1059"/>
+ <location filename="capture_interfaces_dialog.cpp" line="956"/>
+ <location filename="capture_interfaces_dialog.cpp" line="989"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1058"/>
<source>enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="958"/>
- <location filename="capture_interfaces_dialog.cpp" line="991"/>
+ <location filename="capture_interfaces_dialog.cpp" line="957"/>
+ <location filename="capture_interfaces_dialog.cpp" line="990"/>
<source>disabled</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 74b7ded5f2..339c071795 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -913,15 +913,15 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>enabled</source>
<translation>abilitato</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>disabled</source>
<translation>disabilitato</translation>
</message>
@@ -951,40 +951,40 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>nessun indirizzo</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="515"/>
+ <location filename="capture_interfaces_dialog.cpp" line="514"/>
<source>default</source>
<translation>predefinito</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>n/a</source>
<translation>n/d</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="668"/>
- <location filename="capture_interfaces_dialog.cpp" line="676"/>
- <location filename="capture_interfaces_dialog.cpp" line="687"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="704"/>
- <location filename="capture_interfaces_dialog.cpp" line="712"/>
+ <location filename="capture_interfaces_dialog.cpp" line="667"/>
+ <location filename="capture_interfaces_dialog.cpp" line="675"/>
+ <location filename="capture_interfaces_dialog.cpp" line="686"/>
+ <location filename="capture_interfaces_dialog.cpp" line="690"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="711"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="669"/>
- <location filename="capture_interfaces_dialog.cpp" line="677"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
- <location filename="capture_interfaces_dialog.cpp" line="713"/>
+ <location filename="capture_interfaces_dialog.cpp" line="668"/>
+ <location filename="capture_interfaces_dialog.cpp" line="676"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="712"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation>File multipli: la dimensione del file richiesta è troppo grande. La dimensione del file non può essere superiore a 2 GiB.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="688"/>
+ <location filename="capture_interfaces_dialog.cpp" line="687"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation>File multipli: non è stato fornito un nome del file di cattura! Devi specificare un nome del file se vuoi usare file multipli.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="692"/>
+ <location filename="capture_interfaces_dialog.cpp" line="691"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation>File multipli: non è stato fornito alcun limite di file! Devi specificare una dimensione del file o la durata raggiunta la quale si passa al successivo file di cattura se vuoi usare file multipli.</translation>
@@ -2733,16 +2733,16 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="957"/>
- <location filename="capture_interfaces_dialog.cpp" line="990"/>
- <location filename="capture_interfaces_dialog.cpp" line="1039"/>
- <location filename="capture_interfaces_dialog.cpp" line="1059"/>
+ <location filename="capture_interfaces_dialog.cpp" line="956"/>
+ <location filename="capture_interfaces_dialog.cpp" line="989"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1058"/>
<source>enabled</source>
<translation>abilitato</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="958"/>
- <location filename="capture_interfaces_dialog.cpp" line="991"/>
+ <location filename="capture_interfaces_dialog.cpp" line="957"/>
+ <location filename="capture_interfaces_dialog.cpp" line="990"/>
<source>disabled</source>
<translation>disabilitato</translation>
</message>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 3c32ddbf93..2705d75c0f 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -911,15 +911,15 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>enabled</source>
<translation>有効</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>disabled</source>
<translation>無効</translation>
</message>
@@ -949,40 +949,40 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>アドレスがありません</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="515"/>
+ <location filename="capture_interfaces_dialog.cpp" line="514"/>
<source>default</source>
<translation>デフォルト</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>n/a</source>
<translation>割当なし</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="668"/>
- <location filename="capture_interfaces_dialog.cpp" line="676"/>
- <location filename="capture_interfaces_dialog.cpp" line="687"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="704"/>
- <location filename="capture_interfaces_dialog.cpp" line="712"/>
+ <location filename="capture_interfaces_dialog.cpp" line="667"/>
+ <location filename="capture_interfaces_dialog.cpp" line="675"/>
+ <location filename="capture_interfaces_dialog.cpp" line="686"/>
+ <location filename="capture_interfaces_dialog.cpp" line="690"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="711"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="669"/>
- <location filename="capture_interfaces_dialog.cpp" line="677"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
- <location filename="capture_interfaces_dialog.cpp" line="713"/>
+ <location filename="capture_interfaces_dialog.cpp" line="668"/>
+ <location filename="capture_interfaces_dialog.cpp" line="676"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="712"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation>複数ファイル:要求したファイルサイズが大きすぎます! ファイルサイズは2GB より大きくできません</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="688"/>
+ <location filename="capture_interfaces_dialog.cpp" line="687"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation>キャプチャファイル名が指定されていません! 複数ファイルを利用したい場合にはファイル名を指定しなくてはいけません</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="692"/>
+ <location filename="capture_interfaces_dialog.cpp" line="691"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation>複数ファイル:ファイルの限界が指定されていません 次のキャプチャファイルへ切り替えるためのファイルサイズか間隔を指定する必要があります。</translation>
@@ -2725,16 +2725,16 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="957"/>
- <location filename="capture_interfaces_dialog.cpp" line="990"/>
- <location filename="capture_interfaces_dialog.cpp" line="1039"/>
- <location filename="capture_interfaces_dialog.cpp" line="1059"/>
+ <location filename="capture_interfaces_dialog.cpp" line="956"/>
+ <location filename="capture_interfaces_dialog.cpp" line="989"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1058"/>
<source>enabled</source>
<translation>有効</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="958"/>
- <location filename="capture_interfaces_dialog.cpp" line="991"/>
+ <location filename="capture_interfaces_dialog.cpp" line="957"/>
+ <location filename="capture_interfaces_dialog.cpp" line="990"/>
<source>disabled</source>
<translation>無効</translation>
</message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index aa66b4ec1d..cb0c82e9b8 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -911,15 +911,15 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>enabled</source>
<translation>włączony</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>disabled</source>
<translation>wyłączony</translation>
</message>
@@ -949,40 +949,40 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
<translation>brak adresu</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="515"/>
+ <location filename="capture_interfaces_dialog.cpp" line="514"/>
<source>default</source>
<translation>domyślny</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>n/a</source>
<translation>n/a</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="668"/>
- <location filename="capture_interfaces_dialog.cpp" line="676"/>
- <location filename="capture_interfaces_dialog.cpp" line="687"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="704"/>
- <location filename="capture_interfaces_dialog.cpp" line="712"/>
+ <location filename="capture_interfaces_dialog.cpp" line="667"/>
+ <location filename="capture_interfaces_dialog.cpp" line="675"/>
+ <location filename="capture_interfaces_dialog.cpp" line="686"/>
+ <location filename="capture_interfaces_dialog.cpp" line="690"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="711"/>
<source>Error</source>
<translation>Błąd</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="669"/>
- <location filename="capture_interfaces_dialog.cpp" line="677"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
- <location filename="capture_interfaces_dialog.cpp" line="713"/>
+ <location filename="capture_interfaces_dialog.cpp" line="668"/>
+ <location filename="capture_interfaces_dialog.cpp" line="676"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="712"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation>Wiele plików: Żądane wielkość pliku jest zbyt duża! Wielkość pliku nie może być większa niż 2 GiB.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="688"/>
+ <location filename="capture_interfaces_dialog.cpp" line="687"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation>Wiele plików: Nie wprowadzono nazwy pliku! Musisz wprowadzić nazwę pliku jeśli zamierzasz używać wielu plików.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="692"/>
+ <location filename="capture_interfaces_dialog.cpp" line="691"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation>Wiele plików: Nie ustalono limitu! Musisz ustalić limit wielkości pliku lub czas przechwytywania
@@ -2738,16 +2738,16 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="957"/>
- <location filename="capture_interfaces_dialog.cpp" line="990"/>
- <location filename="capture_interfaces_dialog.cpp" line="1039"/>
- <location filename="capture_interfaces_dialog.cpp" line="1059"/>
+ <location filename="capture_interfaces_dialog.cpp" line="956"/>
+ <location filename="capture_interfaces_dialog.cpp" line="989"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1058"/>
<source>enabled</source>
<translation>włączony</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="958"/>
- <location filename="capture_interfaces_dialog.cpp" line="991"/>
+ <location filename="capture_interfaces_dialog.cpp" line="957"/>
+ <location filename="capture_interfaces_dialog.cpp" line="990"/>
<source>disabled</source>
<translation>wyłączony</translation>
</message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 56efd8dca6..cfe5656855 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -912,15 +912,15 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>enabled</source>
<translation>启用</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="261"/>
- <location filename="capture_interfaces_dialog.cpp" line="528"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="527"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>disabled</source>
<translation>关闭</translation>
</message>
@@ -950,40 +950,40 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>无地址</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="515"/>
+ <location filename="capture_interfaces_dialog.cpp" line="514"/>
<source>default</source>
<translation>默认</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
+ <location filename="capture_interfaces_dialog.cpp" line="534"/>
<source>n/a</source>
<translation>n/a</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="668"/>
- <location filename="capture_interfaces_dialog.cpp" line="676"/>
- <location filename="capture_interfaces_dialog.cpp" line="687"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="704"/>
- <location filename="capture_interfaces_dialog.cpp" line="712"/>
+ <location filename="capture_interfaces_dialog.cpp" line="667"/>
+ <location filename="capture_interfaces_dialog.cpp" line="675"/>
+ <location filename="capture_interfaces_dialog.cpp" line="686"/>
+ <location filename="capture_interfaces_dialog.cpp" line="690"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="711"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="669"/>
- <location filename="capture_interfaces_dialog.cpp" line="677"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
- <location filename="capture_interfaces_dialog.cpp" line="713"/>
+ <location filename="capture_interfaces_dialog.cpp" line="668"/>
+ <location filename="capture_interfaces_dialog.cpp" line="676"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="712"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation>多文件：请求的文件尺寸太大！文件尺寸不能超过2GiB。</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="688"/>
+ <location filename="capture_interfaces_dialog.cpp" line="687"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation>多个文件：没有给出捕获文件名！如果你想使用多文件,你必须给出文件名。</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="692"/>
+ <location filename="capture_interfaces_dialog.cpp" line="691"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation>多个文件：未给出文件大小限制！如果你想使用多文件,你必须指定文件大小或者时长切换到下一个捕获文件。</translation>
@@ -2726,16 +2726,16 @@ PLEASE NOTE: One option MUST be selected.</source>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="957"/>
- <location filename="capture_interfaces_dialog.cpp" line="990"/>
- <location filename="capture_interfaces_dialog.cpp" line="1039"/>
- <location filename="capture_interfaces_dialog.cpp" line="1059"/>
+ <location filename="capture_interfaces_dialog.cpp" line="956"/>
+ <location filename="capture_interfaces_dialog.cpp" line="989"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1058"/>
<source>enabled</source>
<translation>启用</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="958"/>
- <location filename="capture_interfaces_dialog.cpp" line="991"/>
+ <location filename="capture_interfaces_dialog.cpp" line="957"/>
+ <location filename="capture_interfaces_dialog.cpp" line="990"/>
<source>disabled</source>
<translation>关闭</translation>
</message>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 19:41:17 +0000