aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-10-16 08:11:48 -0700
committerGerald Combs <gerald@wireshark.org>2016-10-16 15:11:55 +0000
commitb240082cf4ca297149a119694e9eb4d205bccc02 (patch)
tree90582b309cbe59bb4780fdf97309d61248778c1e
parentfaa74f86e2cedbaa7ceceda1b5aa28821bdfb58a (diff)
[Automatic update for 2016-10-16]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I016f035d04c44a68163ea0670e27fa454f4ba660 Reviewed-on: https://code.wireshark.org/review/18217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r--AUTHORS3
-rw-r--r--epan/dissectors/usb.c221
-rw-r--r--epan/enterprise-numbers258
-rw-r--r--epan/sminmpec.c60
-rw-r--r--manuf47
-rw-r--r--ui/qt/wireshark_de.ts22
-rw-r--r--ui/qt/wireshark_en.ts26
-rw-r--r--ui/qt/wireshark_fr.ts22
-rw-r--r--ui/qt/wireshark_it.ts22
-rw-r--r--ui/qt/wireshark_ja_JP.ts22
-rw-r--r--ui/qt/wireshark_pl.ts22
-rw-r--r--ui/qt/wireshark_zh_CN.ts22
12 files changed, 656 insertions, 91 deletions
diff --git a/AUTHORS b/AUTHORS
index f64e2ccc30..5dfab6954f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2374,6 +2374,7 @@ Francesco Fondelli <francesco.fondelli[AT]gmail.com> {
PCEP Extensions for Segment Routing, draft-ietf-pce-segment-routing-01
PCEP Extensions for Association, draft-ietf-pce-association-group-00
BGP-LS extensions for Segment Routing, draft-gredler-idr-bgp-ls-segment-routing-ext-01
+ HL7 protocol support
}
Artem Tamazov <artem.tamazov[AT]tellabs.com> {
@@ -4090,6 +4091,7 @@ James Coleman <jamesc[AT]dspsrv.com>
Jamil Nimeh <jnimeh[AT]gmail.com>
Jan Kaisrlik <j.kaisrlik[AT]seznam.cz>
Jan Seda <hodor[AT]hodor.cz>
+Jan Spevak <jan.spevak[AT]nokia.com>
Jan-Hendrik Bolte <jabolte[AT]uos.de>
Jason Heimann <jheimann[AT]pertino.com>
Jean Thomas <jeanthomas[AT]sierrawireless.com>
@@ -4293,6 +4295,7 @@ Ville Skyttä <ville.skytta[AT]iki.fi>
Vincent Helfre <vincent.helfre[AT]gmx.net>
Vincenzo Reale <smart2128[AT]baslug.org>
Vladimir Kondratiev <qca_vkondrat[AT]qca.qualcomm.com>
+Vladlen Popov <vladlen.popov[AT]yahoo.com>
Volker Lendecke <vl[AT]samba.org>
Warren Moxam <warrenmptgrey[AT]gmail.com>
Wasim Abu Moch <wasim[AT]mellanox.com>
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 32ae949b24..c3fed2e287 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -18032,37 +18032,236 @@ static const value_string usb_products_vals[] = {
{ 0x1d4d0002, "Ralink RT2770/2720 802.11b/g/n Wireless LAN Mini-USB Device" },
{ 0x1d4d000c, "Ralink RT3070 802.11b/g/n Wireless Lan USB Device" },
{ 0x1d4d000e, "Ralink RT3070 802.11b/g/n Wireless Lan USB Device" },
- { 0x1d501db5, "IDBG DFU" },
+ { 0x1d501db5, "IDBG (DFU)" },
{ 0x1d501db6, "IDBG" },
- { 0x1d505117, "Neo1973/FreeRunner kernel usbnet (g_ether, CDC Ethernet) Mode" },
- { 0x1d505118, "Debug Board (FT2232D) for Neo1973/FreeRunner" },
- { 0x1d505119, "GTA01/GTA02 U-Boot Bootloader" },
+ { 0x1d505117, "Neo1973/FreeRunner kernel usbnet (g_ether, CDC Ethernet) mode" },
+ { 0x1d505118, "Neo1973/FreeRunner Debug board (V2+)" },
+ { 0x1d505119, "Neo1973/FreeRunner u-boot cdc_acm serial port" },
{ 0x1d50511a, "HXD8 u-boot usbtty CDC ACM Mode" },
{ 0x1d50511b, "SMDK2440 u-boot usbtty CDC ACM mode" },
{ 0x1d50511c, "SMDK2443 u-boot usbtty CDC ACM mode" },
{ 0x1d50511d, "QT2410 u-boot usbtty CDC ACM mode" },
- { 0x1d505120, "Neo1973/FreeRunner u-boot generic serial mode" },
+ { 0x1d505120, "Neo1973/FreeRunner u-boot usbtty generic serial" },
{ 0x1d505121, "Neo1973/FreeRunner kernel mass storage (g_storage) mode" },
- { 0x1d505122, "Neo1973/FreeRunner kernel usbnet (g_ether, RNDIS) mode" },
- { 0x1d505123, "Neo1973/FreeRunner internal Bluetooth CSR4 module" },
+ { 0x1d505122, "Neo1973/FreeRunner kernel cdc_ether USB network" },
+ { 0x1d505123, "Neo1973/FreeRunner internal USB CSR4 module" },
{ 0x1d505124, "Neo1973/FreeRunner Bluetooth Device ID service" },
+ { 0x1d505300, "Rockbox" },
{ 0x1d506000, "Ubertooth Zero" },
- { 0x1d506001, "Ubertooth Zero DFU" },
+ { 0x1d506001, "Ubertooth Zero (DFU)" },
{ 0x1d506002, "Ubertooth One" },
- { 0x1d506003, "Ubertooth One DFU" },
+ { 0x1d506003, "Ubertooth One (DFU)" },
{ 0x1d506004, "LeoLipo" },
{ 0x1d506005, "LED Flower S" },
{ 0x1d506006, "LED Cube" },
{ 0x1d506007, "LED Flower" },
{ 0x1d506008, "Kisbee 802.15.4 transceiver" },
{ 0x1d506009, "Adjacent Reality Tracker" },
+ { 0x1d50600a, "AVR Programmer" },
+ { 0x1d50600b, "Hypna Go Go" },
+ { 0x1d50600c, "CatNip LPC1343 development board" },
+ { 0x1d50600d, "Enhanced RoboBrrd Brain board" },
+ { 0x1d50600e, "OpenRISC Ordb2a-ep4ce22 development board" },
+ { 0x1d50600f, "Paparazzi Lisa/M (DFU)" },
+ { 0x1d506010, "OpenPipe: OSHW Bagpipes MIDI controller" },
+ { 0x1d506011, "LeoLipo (DFU)" },
+ { 0x1d506012, "Universal C64 Cartridge" },
+ { 0x1d506013, "DiscFerret magnetic disc analyser (bootloader)" },
+ { 0x1d506014, "DiscFerret magnetic disc analyser" },
+ { 0x1d506015, "Smoothieboard" },
+ { 0x1d506016, "phInterface" },
+ { 0x1d506017, "Black Magic Debug Probe (DFU)" },
+ { 0x1d506018, "Black Magic Debug Probe (Application)" },
+ { 0x1d506019, "4pi 5 axis motion controller" },
+ { 0x1d50601a, "Paparazzi Lisa/M" },
+ { 0x1d50601b, "IST-2 chronograph for bullet speeds" },
+ { 0x1d50601c, "EPOSMote II" },
+ { 0x1d50601e, "5x5 STM32 prototyping board" },
+ { 0x1d50601f, "uNSF" },
+ { 0x1d506020, "Toad3" },
+ { 0x1d506021, "AlphaSphere" },
+ { 0x1d506022, "LightPack" },
+ { 0x1d506023, "Pixelkit" },
+ { 0x1d506024, "Illucia" },
+ { 0x1d506025, "Keyglove (HID)" },
+ { 0x1d506027, "Key64 Keyboard" },
{ 0x1d506028, "Teensy 2.0 Development Board [ErgoDox Keyboard]" },
+ { 0x1d50602a, "Marlin 2.0 (Mass Storage)" },
{ 0x1d50602b, "FPGALink" },
+ { 0x1d50602c, "5nes5snes (5x8)" },
+ { 0x1d50602d, "5nes5snes (4x12)" },
+ { 0x1d50602e, "Flexibity" },
+ { 0x1d50602f, "K-copter" },
+ { 0x1d506030, "USB-oscope" },
+ { 0x1d506031, "Handmade GSM GPS tracker" },
+ { 0x1d506033, "frobiac / adnw keyboard" },
+ { 0x1d506034, "Tiflomag Ergo 2" },
+ { 0x1d506035, "FreeLaserTag Gun" },
+ { 0x1d506036, "FreeLaserTag Big Brother" },
+ { 0x1d506037, "FreeLaserTag Node" },
+ { 0x1d506038, "Monaka" },
+ { 0x1d506039, "eXtreme Feedback Device" },
+ { 0x1d50603a, "TiLDA" },
+ { 0x1d50603b, "Raspiface" },
+ { 0x1d50603c, "Paparazzi (bootloader)" },
+ { 0x1d50603d, "Paparazzi (Serial)" },
+ { 0x1d50603e, "Paparazzi (Mass Storage)" },
+ { 0x1d50603f, "airGuitar" },
+ { 0x1d506040, "moco" },
+ { 0x1d506041, "AlphaSphere (bootloader)" },
+ { 0x1d506042, "Dspace robot controller" },
+ { 0x1d506043, "pc-power" },
+ { 0x1d506044, "open-usb-can (DFU)" },
+ { 0x1d506045, "open-usb-can" },
+ { 0x1d506046, "mimus-weigand" },
+ { 0x1d506047, "RfCat Chronos Dongle" },
+ { 0x1d506048, "RfCat Dons Dongle" },
+ { 0x1d506049, "RfCat Chronos bootloader" },
+ { 0x1d50604a, "RfCat Dons bootloader" },
{ 0x1d50604b, "HackRF Jawbreaker Software-Defined Radio" },
+ { 0x1d50604c, "Makibox A6" },
+ { 0x1d50604d, "Paella Pulse height analyzer" },
+ { 0x1d50604e, "Miniscope v2b" },
+ { 0x1d50604f, "Miniscope v2c" },
+ { 0x1d506050, "GoodFET" },
+ { 0x1d506051, "pinocc.io" },
+ { 0x1d506052, "APB Team Robotic Development Board" },
{ 0x1d506053, "Darkgame Controller" },
- { 0x1d506089, "Great Scott Gadgets HackRF One" },
+ { 0x1d506054, "Satlab/AAUSAT3 BlueBox" },
+ { 0x1d506056, "The Glitch" },
+ { 0x1d50605b, "RfCat YARD Stick One" },
+ { 0x1d50605c, "YARD Stick One bootloader" },
+ { 0x1d50605d, "Funky Sensor v2" },
+ { 0x1d50605e, "Blinkiverse Analog LED Fader" },
+ { 0x1d50605f, "Small DIP package Cypress FX2" },
+ { 0x1d506060, "Data logger using the Cypress FX2" },
+ { 0x1d506061, "Power Manager" },
+ { 0x1d506063, "CPC FPGA" },
+ { 0x1d506064, "CPC FPGA (DFU)" },
+ { 0x1d506065, "CPC FPGA (Serial)" },
+ { 0x1d506066, "Nuand BladeRF" },
+ { 0x1d506067, "Orbotron 9000 (Serial)" },
+ { 0x1d506068, "Orbotron 9000 (HID)" },
+ { 0x1d506069, "xser (DFU)" },
+ { 0x1d50606a, "xser (legacy)" },
+ { 0x1d50606b, "S08-245, urJtag compatible firmware for S08JS" },
+ { 0x1d50606c, "Blinkytape full-color light tape" },
+ { 0x1d50606d, "TinyG open source motion controller" },
+ { 0x1d50606e, "Reefangel Evolution 1.0" },
+ { 0x1d506070, "Open Pinball Project" },
+ { 0x1d506071, "The Glitch HID" },
+ { 0x1d506072, "The Glitch Disk" },
+ { 0x1d506073, "The Glitch Serial" },
+ { 0x1d506074, "The Glitch MIDI" },
+ { 0x1d506075, "The Glitch RawHID" },
+ { 0x1d506076, "Vultureprog BIOS chip programmer" },
+ { 0x1d506077, "PaintDuino" },
+ { 0x1d506078, "DTplug" },
+ { 0x1d50607a, "Fadecandy" },
+ { 0x1d50607b, "RCDongle for IR remote control" },
+ { 0x1d50607c, "OpenVizsla USB sniffer/analyzer" },
+ { 0x1d50607d, "Spark Core Arduino-compatible board with WiFi" },
+ { 0x1d50607f, "Spark Core Arduino-compatible board with WiFi (bootloader)" },
+ { 0x1d506080, "arcin arcade controller" },
+ { 0x1d506081, "BladeRF (bootloader)" },
+ { 0x1d506082, "Facecandy (DFU)" },
+ { 0x1d506083, "LightUp (bootloader)" },
+ { 0x1d506084, "arcin arcade controller (DFU)" },
+ { 0x1d506085, "IRKit for controlloing home electronics from iOS devices" },
+ { 0x1d506086, "OneRNG entropy device" },
+ { 0x1d506088, "picp PIC16F145x based PIC16F145x programmer" },
+ { 0x1d506089, "Great Scott Gadgets HackRF One SDR" },
+ { 0x1d50608a, "BLEduino" },
+ { 0x1d50608b, "Loctronix ASR-2300 SDR/motion sensing module" },
+ { 0x1d50608c, "Fx2lafw" },
+ { 0x1d50608d, "Fx2lafw" },
+ { 0x1d50608e, "Fx2lafw" },
+ { 0x1d50608f, "Fx2lafw" },
+ { 0x1d506090, "Fx2lafw" },
+ { 0x1d506091, "Fx2lafw" },
+ { 0x1d506092, "Fx2lafw" },
+ { 0x1d506093, "Fx2lafw" },
+ { 0x1d506094, "Fx2lafw" },
+ { 0x1d506095, "Fx2lafw" },
+ { 0x1d506096, "LightUp (sketch)" },
+ { 0x1d506097, "Tessel JavaScript enabled Microcontroller with built-in WiFi" },
+ { 0x1d506098, "RFIDler" },
+ { 0x1d506099, "RASDR Radio Astronomy SDR Rx Interface" },
+ { 0x1d50609a, "RASDR Radio Astronomy SDR Tx Interface" },
+ { 0x1d50609b, "RASDR Radio Astronomy SDR (bootloader)" },
+ { 0x1d50609c, "antiAFK keyboard" },
+ { 0x1d50609d, "PIC16F145x bootloader" },
+ { 0x1d50609e, "Clyde Lamp by Fabule (bootloader)" },
+ { 0x1d50609f, "Clyde Lamp by Fabule (sketch)" },
+ { 0x1d5060a0, "Smoothiepanel robotic control interface" },
{ 0x1d5060a1, "Airspy" },
- { 0x1d50cc15, "CCCAMP2015 rad1o badge" },
+ { 0x1d5060a2, "barebox (DFU)" },
+ { 0x1d5060a3, "keyboard (bootloader)" },
+ { 0x1d5060a4, "Papilio Duo (AVR)" },
+ { 0x1d5060a5, "Papilio Duo (FPGA)" },
+ { 0x1d5060a6, "HydraBus/HydraNFC (bootloader)" },
+ { 0x1d5060a7, "HydraBus/HydraNFC" },
+ { 0x1d5060a8, "reserved" },
+ { 0x1d5060a9, "Blinky Light Controller (DFU)" },
+ { 0x1d5060aa, "Blinky Light Controller" },
+ { 0x1d5060ab, "AllPixel" },
+ { 0x1d5060ac, "OpenBLT generic microcontroller (bootloader)" },
+ { 0x1d5060b0, "Waterott Arduino based Clock (caterina bootloader)" },
+ { 0x1d5060b1, "Drinkbot (processing)" },
+ { 0x1d5060b2, "Drinkbot (OTG-tablet support)" },
+ { 0x1d5060b3, "calc.pw password generator device (standard)" },
+ { 0x1d5060b4, "calc.pw password generator device (enhanced)" },
+ { 0x1d5060b5, "TimVideos' HDMI2USB (FX2) - Unconfigured device" },
+ { 0x1d5060b6, "TimVideos' HDMI2USB (FX2) - Firmware load/upgrade" },
+ { 0x1d5060b7, "TimVideos' HDMI2USB (FX2) - HDMI/DVI Capture Device" },
+ { 0x1d5060b8, "TimVideos' HDMI2USB (Soft+UTMI) - Unconfigured device" },
+ { 0x1d5060b9, "TimVideos' HDMI2USB (Soft+UTMI) - Firmware upgrade" },
+ { 0x1d5060ba, "TimVideos' HDMI2USB (Soft+UTMI) - HDMI/DVI Capture Device" },
+ { 0x1d5060bc, "Simple CC25xx programmer / serial board" },
+ { 0x1d5060bd, "Open Source control interface for multimedia applications" },
+ { 0x1d5060be, "Pixelmatix Aurora (bootloader)" },
+ { 0x1d5060bf, "Pixelmatix Aurora" },
+ { 0x1d5060c1, "BrewBit Model-T pOSHW temperature controller for homebrewers (bootloader)" },
+ { 0x1d5060c2, "BrewBit Model-T pOSHW temperature controller for homebrewers" },
+ { 0x1d5060c3, "X Antenna Tracker arduino board" },
+ { 0x1d5060c6, "USBtrng hardware random number generator" },
+ { 0x1d5060c7, "Zubax GNSS positioning module for light UAV systems" },
+ { 0x1d5060c8, "Xlink data transfer and control system for Commodore C64" },
+ { 0x1d5060c9, "random number generator" },
+ { 0x1d5060ca, "FinalKey password manager" },
+ { 0x1d5060cb, "PteroDAQ Data Acquisition on FRDM-KL25Z and future boards" },
+ { 0x1d5060cc, "LamDiNao" },
+ { 0x1d5060de, "Cryptech.is random number generator" },
+ { 0x1d5060df, "Numato Opsis HDMI2USB board (unconfigured)" },
+ { 0x1d5060e0, "Numato Opsis HDMI2USB board (JTAG Programming Mode)" },
+ { 0x1d5060e1, "Numato Opsis HDMI2USB board (User Mode)" },
+ { 0x1d5060e2, "Osmocom SIMtrace 2 (DFU)" },
+ { 0x1d5060e3, "Osmocom SIMtrace 2" },
+ { 0x1d5060e4, "3D printed racing game - (Catalina CDC bootloader)" },
+ { 0x1d5060e5, "3D printed racing game" },
+ { 0x1d5060e6, "replacement for GoodFET/FaceDancer - GreatFet" },
+ { 0x1d5060e7, "replacement for GoodFET/FaceDancer - GreatFet target" },
+ { 0x1d5060e8, "Alpen Clack keyboard" },
+ { 0x1d5060e9, "keyman64 keyboard itercepter" },
+ { 0x1d5060ea, "Wiggleport FPGA-based I/O board" },
+ { 0x1d5060ec, "Duet 3D Printer Controller" },
+ { 0x1d5060f0, "UDAD-T1 data aquisition device (boot)" },
+ { 0x1d5060f1, "UDAD-T1 data aquisition device" },
+ { 0x1d5060f2, "UDAD-T2 data aquisition device (boot)" },
+ { 0x1d5060f3, "UDAD-T2 data aquisition device" },
+ { 0x1d5060f4, "Uniti ARC motor controller" },
+ { 0x1d5060f5, "EightByEight Blinky Badge (DFU)" },
+ { 0x1d5060f6, "EightByEight Blinky Badge" },
+ { 0x1d5060f7, "cardio NFC/RFID card reader (bootloader)" },
+ { 0x1d5060f8, "cardio NFC/RFID card reader" },
+ { 0x1d5060fc, "OnlyKey Two-factor Authentication and Password Solution" },
+ { 0x1d506100, "overlay64 video overlay module" },
+ { 0x1d506104, "ScopeFun open source instrumentation" },
+ { 0x1d506108, "Myriad-RF LimeSDR" },
+ { 0x1d50610c, "Magic Keys (boot)" },
+ { 0x1d50610d, "Magic Keys" },
+ { 0x1d508085, "Box0 (box0-v5)" },
+ { 0x1d50cc15, "rad1o badge for CCC congress 2015" },
{ 0x1d570005, "Wireless Receiver (Keyboard and Mouse)" },
{ 0x1d570006, "Wireless Receiver (RC Laser Pointer)" },
{ 0x1d57000c, "Optical Mouse" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index cf23b1ec6f..ec94021266 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2016-10-09)
+(last updated 2016-10-15)
SMI Network Management Private Enterprise Codes:
@@ -89380,9 +89380,9 @@ Limited
Thomas Fabrizi
tfa&mauell.com
22455
- Tribunal Regional do Trabalho da 4a. Região
- Joice Pavek Figueiró
- pavek&trt4.gov.br
+ Tribunal Regional do Trabalho da 4a. Regiao
+ Fabiano Martins
+ fabiano.martins&trt4.jus.br
22456
Hebraic Hertiage Christian School of Theology
Dave Augustus
@@ -152581,8 +152581,8 @@ Decentralization / Helenic Public Administra
licensing&niagarahealth.on.ca
38250
Proventa AG
- Philipp Kern
- p.kern&proventa.de
+ Clemens Bergmann
+ it-admins&proventa.de
38251
Zmanda, Inc.
Ramesh Gupta
@@ -164713,8 +164713,8 @@ Decentralization / Helenic Public Administra
iana&speechstorm.com
41283
IEX Group, LLC
- John Schwall
- john.schwall&iextrading.com
+ PEN Administrator
+ pen_admin&iextrading.com
41284
Celestech, Inc
Skip Penny
@@ -176337,8 +176337,8 @@ Decentralization / Helenic Public Administra
dmason&grossmontoncology.com
44189
Pacific Cancer Care
- Valeria Wareham
- vwareham&pacificcancercare.com
+ Karin N. Roman
+ kroman&pacificcancercare.com
44190
PostAR
Bostjan Kezmah
@@ -183645,8 +183645,8 @@ Decentralization / Helenic Public Administra
shapovalovdenis&gmail.com
46016
Leonton Technologies, Co. Ltd.
- Ike Tien
- ike.tien&leonton.com
+ Kun-Lung Liao
+ clone.liao&leonton.com
46017
Research Institute of Systems Planning, Inc. / ISP
Tomoya Saito
@@ -193794,7 +193794,7 @@ Decentralization / Helenic Public Administra
48553
Duet Asset Management Ltd
Davide Ronchi
- techadmin&duetgroup.net
+ iana-pen&duetgroup.net
48554
Church Pension Group Services Corporation
Clayton Crawley
@@ -194315,6 +194315,238 @@ Decentralization / Helenic Public Administra
Elastifile
Modi Finkelstein
modi.finkelstein&elastifile.com
+48684
+ 32lou
+ arthur li
+ yunql4&sina.com
+48685
+ IXI Technology
+ Bryan Ly
+ bryanly&ixitech.com
+48686
+ Pittel+Brausewetter Holding GmbH
+ Marvin Kirowitz
+ it-office&pittel.at
+48687
+ John Kenyon
+ John Kenyon
+ etljwk&gmail.com
+48688
+ Ventacity Systems, Inc.
+ Jonah Peskin
+ jp&ventacity.com
+48689
+ Novar GmbH
+ Klaus-Dieter Wank
+ klaus-dieter.wank&honeywell.com
+48690
+ Teltonika
+ Darius Jokšas
+ darius.joksas&teltonika.lt
+48691
+ OPNT B.V.
+ Marco Gorter
+ m.gorter&opnt.nl
+48692
+ ASP AG
+ Christof Kraka
+ christof.kraka&asp-ag.eu
+48693
+ Sistemas Electrónicos de Potencia, S.A.
+ José Alberto García García
+ jagarcia&sepsa.es
+48694
+ Vision4ce Limited
+ Philip Park
+ snmp.admin&vision4ce.com
+48695
+ Occitaline
+ ben hassen imen
+ benhassen.imen8&gmail.com
+48696
+ infofab GmbH
+ Frank Flachenecker
+ frank.flachenecker&infofab.de
+48697
+ Threat Stack, Inc.
+ Patrick Cable
+ pat.cable&threatstack.com
+48698
+ McHenry Savings Bank
+ Ken Olsen
+ kolsen&mchenrysavings.com
+48699
+ Reversing Labs
+ Igor Lasic
+ ilasic&reversinglabs.com
+48700
+ SwipeSense
+ Daniel Gunderson
+ admin&swipesense.com
+48701
+ Steward Health Care System
+ Glenn Brown
+ glenn.brown&steward.org
+48702
+ ReversingLabs US Inc.
+ Maarten Boot
+ cloud&reversinglabs.com
+48703
+ A.T.I.B. Srl
+ Antonio Tinti
+ antonio.tinti&atib.com
+48704
+ Center of Radiological Medical Physics, USTC
+ Yifei Pi
+ pyfdrw&mail.ustc.edu.cn
+48705
+ Griffith City Council
+ Mike Gaze
+ mike.gaze&griffith.nsw.gov.au
+48706
+ Beijing Feifanshi Technology Co., Ltd.
+ DANG Fan
+ dangfan&fayfans.com
+48707
+ häwa GmbH
+ Markus Spring
+ edv&haewa.de
+48708
+ Rolls-Royce Control Systems
+ Simon Daniel
+ simon.daniel&rolls-royce.com
+48709
+ DevTeam SRL
+ Mauricio Ghiorzi
+ mauriciog&devteam.com.ar
+48710
+ Gluu, Inc.
+ Michael Schwartz
+ mike&gluu.org
+48711
+ UBIVELOX Inc.
+ Jung-Ho Kim
+ visualguide&ubivelox.com
+48712
+ van-Eerd.net
+ Rob van Eerd
+ rob&van-Eerd.net
+48713
+ DWA Internet Solutions
+ Slobodan Senic
+ office&dwais.rs
+48714
+ LEMZ R&P Corp.
+ Rinat Gadelshin
+ gadelshin.r.n&topaz-atcs.com
+48715
+ LEMZ R&P Corp.
+ Rinat Gadelshin
+ gadelshin.r.n&topaz-atcs.com
+48716
+ Ceredigion County Council
+ Jason Taylor
+ jason.taylor&ceredigion.gov.uk
+48717
+ Q2 Solutions
+ Anthony Altemara
+ anthony.altemara&q2labsolutions.com
+48718
+ United Power Inc
+ System Administrator
+ itregistrations&unitedpower.com
+48719
+ Digitalor Tech Inc
+ ZOU BIN
+ binzou&digitalor.com
+48720
+ New Mexico Oncology Hematology Consultants, Ltd
+ Tyler Black
+ Tyler.Black&pathforward.us
+48721
+ Chastain-Skillman, Inc.
+ Matthew Gruenau
+ mgruenau&chastainskillman.com
+48722
+ PG Services Sarl
+ Murat Izli
+ murat.izli&pg-services.lu
+48723
+ Institute for Family Health
+ Muhammad Sulaman
+ it-com&institute.org
+48724
+ cCARE:California Cancer Associates for Research and Excellence
+ Mahshid Albrecht
+ malbrecht&ccare.com
+48725
+ PayNet, Inc.
+ Avi Nutkis
+ anutkis&paynet.com
+48726
+ TAP Portugal
+ Marcio Garcia Marcenari
+ e-mmarcenari&tap.pt
+48727
+ COTA Inc.
+ Doug Leder
+ dougleder&oncota.com
+48728
+ CircleX
+ Richard Dawson
+ dawsora&gmail.com
+48729
+ CSRA
+ Michael Cramer
+ michael.cramer&csra.com
+48730
+ HostDir
+ Antonino Riina
+ admin&hostdir.net
+48731
+ Home Branch
+ Richard Dawson
+ dawsora&gmail.com
+48732
+ Fundação Educacional Encosta Inferior do Nordeste
+ Marcia Regina Diehl
+ redes&faccat.br
+48733
+ Excellium Services S.A.
+ Morgan HENREAUX
+ mhenreaux&excellium-services.com
+48734
+ IOxOS Technologies SA
+ Ralph Hoffmann
+ ralph.hoffmann&ioxos.ch
+48735
+ CAE Engineering Kft.
+ Dr. András Korn
+ iana-pen&cae-engineering.hu
+48736
+ INX International Ink Co.
+ Todd Pharis
+ todd.pharis&inxintl.com
+48737
+ EasyNMS
+ Sławomir Kłos
+ slawekk87&gmail.com
+48738
+ Littlepay Pty Ltd
+ David Johnston
+ iana.admin&littlepay.com
+48739
+ 杭州电子科技大学 (Hangzhou University of Electronic Science and Technology)
+ zhangmeng
+ 1247882983&qq.com
+48740
+ Clanjor Prods.
+ Giumo Clanjor
+ cjxgm2&gmail.com
+48741
+ Zitius Service Delivery AB
+ Mathias Ehrlin
+ mathias&zitius.com
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 16ad0c244f..fe7b0cf474 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -22475,7 +22475,7 @@ const value_string sminmpec_values[] = {
{ 22452, "ING-DiBa AG" },
{ 22453, "H:S Hovedstadens Sygehusf\0303\0246llesskab" },
{ 22454, "Helmut Mauell GmbH" },
- { 22455, "Tribunal Regional do Trabalho da 4a. Regi\0303\0243o" },
+ { 22455, "Tribunal Regional do Trabalho da 4a. Regiao" },
{ 22456, "Hebraic Hertiage Christian School of Theology" },
{ 22457, "Deutscher Ring LebensversicherungsAG" },
{ 22458, "Modulus Video, Inc." },
@@ -48704,6 +48704,64 @@ const value_string sminmpec_values[] = {
{ 48681, "Guangzhou Caipin Communication Technology Co., Ltd." },
{ 48682, "NETSTARS CO., LTD." },
{ 48683, "Elastifile" },
+ { 48684, "32lou" },
+ { 48685, "IXI Technology" },
+ { 48686, "Pittel+Brausewetter Holding GmbH" },
+ { 48687, "John Kenyon" },
+ { 48688, "Ventacity Systems, Inc." },
+ { 48689, "Novar GmbH" },
+ { 48690, "Teltonika" },
+ { 48691, "OPNT B.V." },
+ { 48692, "ASP AG" },
+ { 48693, "Sistemas Electr\0303\0263nicos de Potencia, S.A." },
+ { 48694, "Vision4ce Limited" },
+ { 48695, "Occitaline" },
+ { 48696, "infofab GmbH" },
+ { 48697, "Threat Stack, Inc." },
+ { 48698, "McHenry Savings Bank" },
+ { 48699, "Reversing Labs" },
+ { 48700, "SwipeSense" },
+ { 48701, "Steward Health Care System" },
+ { 48702, "ReversingLabs US Inc." },
+ { 48703, "A.T.I.B. Srl" },
+ { 48704, "Center of Radiological Medical Physics, USTC" },
+ { 48705, "Griffith City Council" },
+ { 48706, "Beijing Feifanshi Technology Co., Ltd." },
+ { 48707, "h\0303\0244wa GmbH" },
+ { 48708, "Rolls-Royce Control Systems" },
+ { 48709, "DevTeam SRL" },
+ { 48710, "Gluu, Inc." },
+ { 48711, "UBIVELOX Inc." },
+ { 48712, "van-Eerd.net" },
+ { 48713, "DWA Internet Solutions" },
+ { 48714, "LEMZ R&P Corp." },
+ { 48715, "LEMZ R&P Corp." },
+ { 48716, "Ceredigion County Council" },
+ { 48717, "Q2 Solutions" },
+ { 48718, "United Power Inc" },
+ { 48719, "Digitalor Tech Inc" },
+ { 48720, "New Mexico Oncology Hematology Consultants, Ltd" },
+ { 48721, "Chastain-Skillman, Inc." },
+ { 48722, "PG Services Sarl" },
+ { 48723, "Institute for Family Health" },
+ { 48724, "cCARE:California Cancer Associates for Research and Excellence" },
+ { 48725, "PayNet, Inc." },
+ { 48726, "TAP Portugal" },
+ { 48727, "COTA Inc." },
+ { 48728, "CircleX" },
+ { 48729, "CSRA" },
+ { 48730, "HostDir" },
+ { 48731, "Home Branch" },
+ { 48732, "Funda\0303\0247\0303\0243o Educacional Encosta Inferior do Nordeste" },
+ { 48733, "Excellium Services S.A." },
+ { 48734, "IOxOS Technologies SA" },
+ { 48735, "CAE Engineering Kft." },
+ { 48736, "INX International Ink Co." },
+ { 48737, "EasyNMS" },
+ { 48738, "Littlepay Pty Ltd" },
+ { 48739, "\0346\0235\0255\0345\0267\0236\0347\0224\0265\0345\0255\0220\0347\0247\0221\0346\0212\0200\0345\0244\0247\0345\0255\0246 (Hangzhou University of Electronic Science and Technology)" },
+ { 48740, "Clanjor Prods." },
+ { 48741, "Zitius Service Delivery AB" },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index 33983c49e3..d2238a5a3c 100644
--- a/manuf
+++ b/manuf
@@ -1874,7 +1874,7 @@
00:07:19 Mobiis # Mobiis Co., Ltd.
00:07:1A Finedigi # Finedigital Inc.
00:07:1B CdviAmer # CDVI Americas Ltd
-00:07:1C At&TFixe # AT&T Fixed Wireless Services
+00:07:1C At&T
00:07:1D SatelsaS # Satelsa Sistemas Y Aplicaciones De Telecomunicaciones, S.A.
00:07:1E Tri-MEng # Tri-M Engineering / Nupak Dev. Corp.
00:07:1F European # European Systems Integration
@@ -8806,7 +8806,7 @@
00:21:80 ArrisGro # ARRIS Group, Inc.
00:21:81 Si2Micro # Si2 Microsystems Limited
00:21:82 Sandlink # SandLinks Systems, Ltd.
-00:21:83 VatechHy # VATECH HYDRO
+00:21:83 AndritzH # ANDRITZ HYDRO GmbH
00:21:84 Powersof # POWERSOFT SRL
00:21:85 Micro-St # MICRO-STAR INT'L CO.,LTD.
00:21:86 Universa # Universal Global Scientific Industrial Co., Ltd.
@@ -13694,7 +13694,7 @@
00:50:C2:A9:90:00/36 Haivisio # Haivision Systems Inc
00:50:C2:A9:A0:00/36 Absolutr # Absolutron. LLC
00:50:C2:A9:B0:00/36 PdqManuf # PDQ Manufacturing Inc.
-00:50:C2:A9:C0:00/36 Eberspäc # Eberspächer Electronics GmbH & Co. KG
+00:50:C2:A9:C0:00/36 StarElec # Star Electronics GmbH & Co. KG
00:50:C2:A9:D0:00/36 JoehlKoe # Joehl & Koeferli AG
00:50:C2:A9:E0:00/36 ProconEn # Procon Engineering Limited
00:50:C2:A9:F0:00/36 Yellowso # YellowSoft Co., Ltd.
@@ -17221,6 +17221,7 @@
04:5A:95 Nokia # Nokia Corporation
04:5C:06 ZmodoTec # Zmodo Technology Corporation
04:5C:8E GosundGr # gosund GROUP CO.,LTD
+04:5D:4B Sony # Sony Corporation
04:5D:56 CamtronI # camtron industrial inc.
04:5F:A7 Shenzhen # Shenzhen Yichen Technology Development Co.,LTD
04:61:69 MediaGlo # MEDIA GLOBAL LINKS CO., LTD.
@@ -19174,7 +19175,7 @@
2C:96:62 InvenitB # Invenit BV
2C:97:17 ICYBV # I.C.Y. B.V.
2C:99:24 ArrisGro # ARRIS Group, Inc.
-2C:9A:A4 Ngi # NGI SpA
+2C:9A:A4 Eolo # Eolo SpA
2C:9D:1E HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
2C:9E:5F ArrisGro # ARRIS Group, Inc.
2C:9E:FC Canon # CANON INC.
@@ -19851,6 +19852,7 @@
3C:78:73 Airsonic # Airsonics
3C:7A:8A ArrisGro # ARRIS Group, Inc.
3C:7D:B1 TexasIns # Texas Instruments
+3C:7F:6F Telechip # Telechips, Inc.
3C:80:AA RansnetS # Ransnet Singapore Pte Ltd
3C:81:D8 Sagemcom # Sagemcom Broadband SAS
3C:83:1E Ckd # CKD Corporation
@@ -20858,6 +20860,7 @@
48:9D:24 Blackber # BlackBerry RTS
48:A2:2D Shenzhen # Shenzhen Huaxuchang Telecom Technology Co.,Ltd
48:A2:B7 KodofonJ # Kodofon JSC
+48:A3:80 GioneeCo # Gionee Communication Equipment Co.,Ltd.
48:A6:D2 GjsunOpt # GJsun Optical Science and Tech Co.,Ltd.
48:A9:D2 WistronN # Wistron Neweb Corporation
48:AA:5D StoreEle # Store Electronic Systems
@@ -20982,6 +20985,7 @@
4C:74:87 LeaderPh # Leader Phone Communication Technology Co., Ltd.
4C:76:25 Dell # Dell Inc.
4C:77:4F Embedded # Embedded Wireless Labs
+4C:78:72 CavUffGi # Cav. Uff. Giacomo Cimberio S.p.A.
4C:78:97 Arrowhea # Arrowhead Alarm Products Ltd
4C:79:BA IntelCor # Intel Corporate
4C:7C:5F Apple # Apple, Inc.
@@ -21190,7 +21194,10 @@
50:A0:BF AlbaFibe # Alba Fiber Systems Inc.
50:A4:C8 SamsungE # Samsung Electronics Co.,Ltd
50:A4:D0 IeeeRegi # IEEE Registration Authority
+50:A4:D0:40:00:00/28 RavenInd # Raven Industries Inc.
+50:A4:D0:50:00:00/28 TrexomSR # TREXOM S.r.l.
50:A4:D0:60:00:00/28 Pointgra # PointGrab
+50:A4:D0:80:00:00/28 XinlianA # XinLian'AnBao(Beijing)Technology Co.,LTD.
50:A6:E3 DavidCla # David Clark Company
50:A7:15 Aboundi # Aboundi, Inc.
50:A7:2B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
@@ -21217,6 +21224,7 @@
50:CD:22 Avaya # Avaya Inc
50:CD:32 NanjingC # NanJing Chaoran Science & Technology Co.,Ltd.
50:CE:75 MeasyEle # Measy Electronics Co., Ltd.
+50:D2:13 Cvilux # CviLux Corporation
50:D2:74 Steffes # Steffes Corporation
50:D5:9C ThaiHabe # Thai Habel Industrial Co., Ltd.
50:D6:D7 Takahata # Takahata Precision
@@ -21685,6 +21693,7 @@
5C:AA:FD Sonos # Sonos, Inc.
5C:AC:4C HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
5C:AD:CF Apple # Apple, Inc.
+5C:AF:06 LgElectr # LG Electronics (Mobile Communications)
5C:B0:66 ArrisGro # ARRIS Group, Inc.
5C:B3:95 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
5C:B4:3E HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
@@ -21693,6 +21702,7 @@
5C:B6:CC Novacomm # NovaComm Technologies Inc.
5C:B8:CB AllisCom # Allis Communications
5C:B9:01 HewlettP # Hewlett Packard
+5C:BA:37 Microsof # Microsoft Corporation
5C:BD:9E Hongkong # HONGKONG MIRACLE EAGLE TECHNOLOGY(GROUP) LIMITED
5C:C2:13 FrSauter # Fr. Sauter AG
5C:C5:D4 IntelCor # Intel Corporate
@@ -22142,6 +22152,7 @@
68:53:88 P&STechn # P&S Technology
68:54:ED Alcatel- # Alcatel-Lucent - Nuage
68:54:F5 Enlighte # enLighted Inc
+68:54:FD AmazonTe # Amazon Technologies Inc.
68:58:C5 ZfTrwAut # ZF TRW Automotive
68:59:7F AlcatelL # Alcatel Lucent
68:5B:35 Apple # Apple, Inc.
@@ -22204,6 +22215,7 @@
68:9C:70 Apple # Apple, Inc.
68:9C:E2 Cisco # Cisco Systems, Inc
68:9E:19 TexasIns # Texas Instruments
+68:9F:F0 Zte # zte corporation
68:A0:F6 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
68:A1:B7 HonghaoM # Honghao Mingchuan Technology (Beijing) CO.,Ltd.
68:A3:78 FreeboxS # FREEBOX SAS
@@ -22267,6 +22279,7 @@
6C:0F:6A JdcTech # JDC Tech Co., Ltd.
6C:14:F7 Erhardt+ # Erhardt+Leimer GmbH
6C:15:F9 Nautroni # Nautronix Limited
+6C:16:0E Shottrac # ShotTracker
6C:18:11 DecaturE # Decatur Electronics
6C:19:8F D-LinkIn # D-Link International
6C:19:C0 Apple # Apple, Inc.
@@ -22805,12 +22818,14 @@
70:B3:D5:2D:50:00/36 TeucoGuz # Teuco Guzzini
70:B3:D5:2D:60:00/36 KvazarLl # Kvazar LLC
70:B3:D5:2D:A0:00/36 SkywaveN # Skywave Networks Private Limited
+70:B3:D5:2D:B0:00/36 Protopix # ProtoPixel SL
70:B3:D5:2D:C0:00/36 BolideTe # Bolide Technology Group, Inc.
70:B3:D5:2E:00:00/36 PeterHub # Peter Huber
70:B3:D5:2E:30:00/36 Meiknolo # Meiknologic GmbH
70:B3:D5:2E:70:00/36 Atos # Atos spa
70:B3:D5:2E:A0:00/36 Schneide # Schneider Electric Motion
70:B3:D5:2E:B0:00/36 Brnet # BRNET CO.,LTD.
+70:B3:D5:2E:C0:00/36 GrupoEpe # Grupo Epelsa S.L.
70:B3:D5:2E:E0:00/36 AplexTec # Aplex Technology Inc.
70:B3:D5:2E:F0:00/36 IemSa # IEM SA
70:B3:D5:2F:00:00/36 Clock-O- # Clock-O-Matic
@@ -22960,6 +22975,7 @@
70:B3:D5:45:E0:00/36 Esol # eSOL Co.,Ltd.
70:B3:D5:45:F0:00/36 Cloud4wi
70:B3:D5:46:10:00/36 Tesec # TESEC Corporation
+70:B3:D5:46:20:00/36 Eartex
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
@@ -23050,6 +23066,7 @@
70:B3:D5:55:B0:00/36 ProconEl # Procon Electronics Pty Ltd
70:B3:D5:55:C0:00/36 Saratoga # Saratoga Speed, Inc.
70:B3:D5:55:D0:00/36 Lunanexu # LunaNexus Inc
+70:B3:D5:56:30:00/36 Zhejiang # Zhejiang Hao Teng Electronic Technology Co., Ltd.
70:B3:D5:56:40:00/36 Christma # christmann informationstechnik + medien GmbH & Co. KG
70:B3:D5:57:00:00/36 BayernEn # Bayern Engineering GmbH & Co. KG
70:B3:D5:57:80:00/36 ImageTec # IMAGE TECH CO.,LTD
@@ -23163,6 +23180,7 @@
70:B3:D5:6A:80:00/36 VitschEl # Vitsch Electronics
70:B3:D5:6A:90:00/36 OhmoriEl # OHMORI ELECTRIC INDUSTRIES CO.LTD
70:B3:D5:6B:00:00/36 Ptype # PTYPE Co., LTD.
+70:B3:D5:6B:10:00/36 TtcTelek # TTC TELEKOMUNIKACE, s.r.o.
70:B3:D5:6B:30:00/36 Duracomm # DuraComm Corporation
70:B3:D5:6B:50:00/36 Art # ART SPA
70:B3:D5:6B:60:00/36 Inradios # INRADIOS GmbH
@@ -23207,11 +23225,13 @@
70:B3:D5:72:00:00/36 Private
70:B3:D5:72:10:00/36 ZoeMedic # Zoe Medical
70:B3:D5:72:90:00/36 Emac # EMAC, Inc.
+70:B3:D5:72:C0:00/36 Nuri&GEn # NuRi&G Engineering co,.Ltd.
70:B3:D5:72:D0:00/36 KronMedi # Kron Medidores
70:B3:D5:73:00:00/36 Videogen # Videogenix
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:30:00/36 SaInstru # SA Instrumentation Limited
+70:B3:D5:73:50:00/36 SwissAud # Swiss Audio
70:B3:D5:73:70:00/36 SdBiosen # SD Biosensor
70:B3:D5:73:B0:00/36 S-I-C
70:B3:D5:73:E0:00/36 TridentR # Trident RFID Pty Ltd
@@ -23244,6 +23264,7 @@
70:B3:D5:77:90:00/36 DrBridge # DR.BRIDGE AQUATECH
70:B3:D5:77:C0:00/36 HustyMSt # HUSTY M.Styczen J.Hupert Sp.J.
70:B3:D5:78:10:00/36 ProjectS # Project Service S.a.s.
+70:B3:D5:78:50:00/36 Density # Density Inc.
70:B3:D5:78:90:00/36 Semex-En # SEMEX-EngCon GmbH
70:B3:D5:78:B0:00/36 JingtuPr # Jingtu Printing Systems Co., Ltd
70:B3:D5:78:C0:00/36 Survalen # Survalent Technology Corporation
@@ -23366,6 +23387,7 @@
70:B3:D5:8B:E0:00/36 Connoise # Connoiseur Electronics Private Limited
70:B3:D5:8C:20:00/36 F-Domain # F-domain corporation
70:B3:D5:8C:50:00/36 Hmicro # HMicro Inc
+70:B3:D5:8C:A0:00/36 AlliedDa # Allied Data Systems
70:B3:D5:8C:B0:00/36 Welt # WELT Corporation
70:B3:D5:8C:E0:00/36 Cores # CORES Corporation
70:B3:D5:8C:F0:00/36 Dainichi # Dainichi Denshi Co.,LTD
@@ -23406,6 +23428,7 @@
70:B3:D5:93:50:00/36 SensorDe # Sensor Developments
70:B3:D5:93:60:00/36 FaroTech # FARO TECHNOLOGIES, INC.
70:B3:D5:93:80:00/36 JetiTech # JETI Technische Instrumente GmbH
+70:B3:D5:93:90:00/36 Invertek # Invertek Drives Ltd
70:B3:D5:94:10:00/36 Triax # Triax A/S
70:B3:D5:94:20:00/36 TruteqDe # TruTeq Devices (Pty) Ltd
70:B3:D5:94:30:00/36 AbbottMe # Abbott Medical Optics Inc.
@@ -23431,6 +23454,7 @@
70:B3:D5:99:50:00/36 Laytec # LayTec AG
70:B3:D5:99:60:00/36 Xpertsea # XpertSea Solutions inc.
70:B3:D5:99:A0:00/36 Kevic # KEVIC. inc,
+70:B3:D5:99:E0:00/36 TrinityC # Trinity College Dublin
70:B3:D5:99:F0:00/36 ConfedBV # Confed Holding B.V.
70:B3:D5:9A:70:00/36 Honeywel # Honeywell
70:B3:D5:9A:D0:00/36 FortunaI # Fortuna Impex Pvt ltd
@@ -23478,6 +23502,7 @@
70:B3:D5:A1:B0:00/36 PotterEl # Potter Electric Signal Co. LLC
70:B3:D5:A1:C0:00/36 MecaSyst # MECA SYSTEM
70:B3:D5:A1:D0:00/36 FluidCom # Fluid Components International
+70:B3:D5:A1:F0:00/36 Globalte # GlobalTest LLC
70:B3:D5:A2:00:00/36 DesignFo # Design For Life Systems
70:B3:D5:A2:10:00/36 Ppi # PPI Inc.
70:B3:D5:A2:50:00/36 Pulsetor # PulseTor LLC
@@ -23502,6 +23527,7 @@
70:B3:D5:A5:50:00/36 EmbestTe # Embest Technology Co., Ltd
70:B3:D5:A5:60:00/36 DorletSa # DORLET SAU
70:B3:D5:A5:70:00/36 Pcsc
+70:B3:D5:A5:80:00/36 McqTech # MCQ TECH GmbH
70:B3:D5:A5:90:00/36 Muuntosä # Muuntosähkö Oy - Trafox
70:B3:D5:A5:A0:00/36 RcsEnerg # RCS Energy Management Ltd
70:B3:D5:A5:B0:00/36 ChristEl # Christ Elektronik GmbH
@@ -23652,6 +23678,7 @@
70:B3:D5:BC:C0:00/36 MbConnec # MB connect line GmbH Fernwartungssysteme
70:B3:D5:BD:20:00/36 BurkTech # Burk Technology
70:B3:D5:BD:30:00/36 FotonaDD # FOTONA D.D.
+70:B3:D5:BD:50:00/36 Synics # Synics AG
70:B3:D5:BD:90:00/36 Solwayte # SolwayTech
70:B3:D5:BD:A0:00/36 5-D # 5-D Systems, Inc.
70:B3:D5:BD:D0:00/36 CdrSrl # CDR SRL
@@ -23669,6 +23696,7 @@
70:B3:D5:BF:E0:00/36 AplexTec # Aplex Technology Inc.
70:B3:D5:C0:10:00/36 Smartgua # SmartGuard LLC
70:B3:D5:C0:30:00/36 XaviTech # XAVi Technologies Corp.
+70:B3:D5:C0:60:00/36 Xotonics # XotonicsMED GmbH
70:B3:D5:C0:70:00/36 Areco
70:B3:D5:C0:A0:00/36 Infosock # Infosocket Co., Ltd.
70:B3:D5:C0:E0:00/36 SysdevSr # SYSDEV Srl
@@ -23945,6 +23973,7 @@
70:B3:D5:F0:00:00/36 AplexTec # Aplex Technology Inc.
70:B3:D5:F0:10:00/36 Software # Software Systems Plus
70:B3:D5:F0:30:00/36 Gmi # GMI Ltd
+70:B3:D5:F0:70:00/36 DuvalMes # DUVAL MESSIEN
70:B3:D5:F0:80:00/36 SzaboSof # Szabo Software & Engineering UK Ltd
70:B3:D5:F0:B0:00/36 RfIndust # RF Industries
70:B3:D5:F1:00:00/36 RieglLas # Riegl Laser Measurement Systems GmbH
@@ -23990,6 +24019,7 @@
70:B3:D5:F7:E0:00/36 AlphaEle # Alpha Elettronica s.r.l.
70:B3:D5:F8:10:00/36 Littlemo # Littlemore Scientific
70:B3:D5:F8:50:00/36 Solystic
+70:B3:D5:F8:B0:00/36 IoootaSr # IOOOTA Srl
70:B3:D5:F8:C0:00/36 European # EUROPEAN ADVANCED TECHNOLOGIES
70:B3:D5:F8:D0:00/36 Flextron # Flextronics Canafa Design Services
70:B3:D5:F8:E0:00/36 Isabelle # Isabellenhütte Heusler Gmbh &Co KG
@@ -24406,6 +24436,7 @@
78:AC:BF Igneous # Igneous Systems
78:AC:C0 HewlettP # Hewlett Packard
78:AE:0C FarSouth # Far South Networks
+78:AF:58 GimasiSa # GIMASI SA
78:B3:B9 Shanghai # ShangHai sunup lighting CO.,LTD
78:B3:CE EloTouch # Elo touch solutions
78:B5:D2 EverTrea # Ever Treasure Industrial Limited
@@ -24417,6 +24448,7 @@
78:BD:BC SamsungE # Samsung Electronics Co.,Ltd
78:BE:B6 Enhanced # Enhanced Vision
78:BE:BD Stulz # STULZ GmbH
+78:C1:A7 Zte # zte corporation
78:C2:C0 IeeeRegi # IEEE Registration Authority
78:C2:C0:00:00:00/28 Shenzhen # Shenzhen ELI Technology co.,ltd
78:C2:C0:10:00:00/28 Xronos-I # XRONOS-INC
@@ -24517,6 +24549,7 @@
7C:0A:50 J-Mex # J-MEX Inc.
7C:0B:C6 SamsungE # Samsung Electronics Co.,Ltd
7C:0E:CE Cisco # Cisco Systems, Inc
+7C:10:15 Brillian # Brilliant Home Technology, Inc.
7C:11:BE Apple # Apple, Inc.
7C:11:CB HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
7C:11:CD Qiantang # QianTang Technology
@@ -24764,6 +24797,7 @@
80:38:BC HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
80:38:FD Leapfrog # LeapFrog Enterprises, Inc.
80:39:E5 Patlite # PATLITE CORPORATION
+80:3A:0A Integrat # Integrated Device Technology (Malaysia) Sdn. Bhd.
80:3B:2A AbbXiame # ABB Xiamen Low Voltage Equipment Co.,Ltd.
80:3B:9A Ghe-CesE # ghe-ces electronic ag
80:3F:5D Winstars # Winstars Technology Ltd
@@ -25660,6 +25694,7 @@
94:61:24 Pason # Pason Systems
94:62:69 ArrisGro # ARRIS Group, Inc.
94:63:D1 SamsungE # Samsung Electronics Co.,Ltd
+94:65:2D OneplusT # OnePlus Technology (Shenzhen) Co., Ltd
94:65:9C IntelCor # Intel Corporate
94:66:E7 WomEngin # WOM Engineering
94:70:D2 WinfirmT # WINFIRM TECHNOLOGY
@@ -26514,6 +26549,7 @@ A4:FC:CE Security # Security Expert Ltd.
A8:01:80 ImagoTec # IMAGO Technologies GmbH
A8:06:00 SamsungE # Samsung Electronics Co.,Ltd
A8:0C:0D Cisco # Cisco Systems, Inc
+A8:0C:CA Shenzhen # Shenzhen Sundray Technologies Company Limited
A8:11:FC ArrisGro # ARRIS Group, Inc.
A8:13:74 Panasoni # Panasonic Corporation AVC Networks Company
A8:15:4D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD.
@@ -27787,6 +27823,7 @@ C4:7D:FE ANSoluti # A.N. Solutions GmbH
C4:7F:51 Inventek # Inventek Systems
C4:82:3F FujianNe # Fujian Newland Auto-ID Tech. Co,.Ltd.
C4:82:4E Changzho # Changzhou Uchip Electronics Co., LTD.
+C4:83:6F Ciena # Ciena Corporation
C4:85:08 IntelCor # Intel Corporate
C4:86:E9 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
C4:88:E5 SamsungE # Samsung Electronics Co.,Ltd
@@ -27913,6 +27950,7 @@ C8:6C:87 ZyxelCom # ZyXEL Communications Corporation
C8:6C:B6 Optcom # Optcom Co., Ltd.
C8:6F:1D Apple # Apple, Inc.
C8:72:48 AplicomO # Aplicom Oy
+C8:73:24 SowCheng # Sow Cheng Technology Co. Ltd.
C8:75:5B Quantify # Quantify Technology Pty. Ltd.
C8:77:8B ThemisCo # Themis Computer
C8:7B:5B Zte # zte corporation
@@ -30019,6 +30057,7 @@ F8:A0:3D DinstarT # Dinstar Technologies Co., Ltd.
F8:A0:97 ArrisGro # ARRIS Group, Inc.
F8:A1:88 LedRoadw # LED Roadway Lighting
F8:A2:B4 Rhewa-Wa # RHEWA-WAAGENFABRIK August Freudewald GmbH &amp;Co. KG
+F8:A3:4F Zte # zte corporation
F8:A4:5F XiaomiCo # Xiaomi Communications Co Ltd
F8:A9:63 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD.
F8:A9:D0 LgElectr # LG Electronics (Mobile Communications)
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 295f2181b1..c69a5e6a93 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -4649,12 +4649,12 @@ für die Filterdateien kann nicht erstellt werden:
<translation type="unfinished">Frame</translation>
</message>
<message>
- <location filename="interface_frame.ui" line="44"/>
+ <location filename="interface_frame.ui" line="50"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="79"/>
+ <location filename="interface_frame.ui" line="88"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4710,6 +4710,14 @@ für die Filterdateien kann nicht erstellt werden:
</message>
</context>
<context>
+ <name>InterfaceSortFilterModel</name>
+ <message>
+ <location filename="interface_sort_filter_model.cpp" line="251"/>
+ <source>No interfaces to be displayed. %1 interfaces filtered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InterfaceTree</name>
<message>
<source>Welcome screen list</source>
@@ -15358,24 +15366,22 @@ text-decoration: underline;
<translation>Diesen Eintrag kopieren.</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="89"/>
+ <location filename="uat_dialog.cpp" line="90"/>
<source>Unknown User Accessible Table</source>
<translation>Unbekannte User Accessible Table </translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="107"/>
+ <location filename="uat_dialog.cpp" line="106"/>
<source>Open </source>
<translation>Öffnen</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="419"/>
<source>Uneven number of chars hex string (%1)</source>
- <translation>Ungerade Anzahl an Hexzeichen (%1)</translation>
+ <translation type="vanished">Ungerade Anzahl an Hexzeichen (%1)</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
- <translation>Fehler beim Parsen der Hex Zeichenkette</translation>
+ <translation type="vanished">Fehler beim Parsen der Hex Zeichenkette</translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 50aa20afdd..077ffbdec1 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -4538,12 +4538,12 @@ for filter files: %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="44"/>
+ <location filename="interface_frame.ui" line="50"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="79"/>
+ <location filename="interface_frame.ui" line="88"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4599,6 +4599,14 @@ for filter files: %2.</source>
</message>
</context>
<context>
+ <name>InterfaceSortFilterModel</name>
+ <message>
+ <location filename="interface_sort_filter_model.cpp" line="251"/>
+ <source>No interfaces to be displayed. %1 interfaces filtered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InterfaceTreeModel</name>
<message>
<location filename="interface_tree_model.cpp" line="79"/>
@@ -15011,25 +15019,15 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="89"/>
+ <location filename="uat_dialog.cpp" line="90"/>
<source>Unknown User Accessible Table</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="107"/>
+ <location filename="uat_dialog.cpp" line="106"/>
<source>Open </source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="uat_dialog.cpp" line="419"/>
- <source>Uneven number of chars hex string (%1)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="uat_dialog.cpp" line="426"/>
- <source>Error parsing hex string</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>VoipCallsDialog</name>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 680e29d435..7be99c0e1c 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -4652,12 +4652,12 @@ pour fichiers de filtre : %2.</translation>
<translation type="unfinished">Trame</translation>
</message>
<message>
- <location filename="interface_frame.ui" line="44"/>
+ <location filename="interface_frame.ui" line="50"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="79"/>
+ <location filename="interface_frame.ui" line="88"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4713,6 +4713,14 @@ pour fichiers de filtre : %2.</translation>
</message>
</context>
<context>
+ <name>InterfaceSortFilterModel</name>
+ <message>
+ <location filename="interface_sort_filter_model.cpp" line="251"/>
+ <source>No interfaces to be displayed. %1 interfaces filtered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InterfaceTree</name>
<message>
<source>Welcome screen list</source>
@@ -15304,24 +15312,22 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Copier cette entrée.</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="89"/>
+ <location filename="uat_dialog.cpp" line="90"/>
<source>Unknown User Accessible Table</source>
<translation>inconnu UAT</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="107"/>
+ <location filename="uat_dialog.cpp" line="106"/>
<source>Open </source>
<translation>Ouvrir </translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="419"/>
<source>Uneven number of chars hex string (%1)</source>
- <translation>Nombre impair de caractères dans la chaine hex (%1)</translation>
+ <translation type="vanished">Nombre impair de caractères dans la chaine hex (%1)</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
- <translation>Erreur de conversion de la chaine hex</translation>
+ <translation type="vanished">Erreur de conversion de la chaine hex</translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 01c87b6a8e..896e827eed 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -4647,12 +4647,12 @@ per i file di filtro: %2.</translation>
<translation type="unfinished">Frame</translation>
</message>
<message>
- <location filename="interface_frame.ui" line="44"/>
+ <location filename="interface_frame.ui" line="50"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="79"/>
+ <location filename="interface_frame.ui" line="88"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4708,6 +4708,14 @@ per i file di filtro: %2.</translation>
</message>
</context>
<context>
+ <name>InterfaceSortFilterModel</name>
+ <message>
+ <location filename="interface_sort_filter_model.cpp" line="251"/>
+ <source>No interfaces to be displayed. %1 interfaces filtered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InterfaceTree</name>
<message>
<source>Welcome screen list</source>
@@ -15351,24 +15359,22 @@ a:hover {
<translation>Copia questa voce.</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="89"/>
+ <location filename="uat_dialog.cpp" line="90"/>
<source>Unknown User Accessible Table</source>
<translation>Tabella accessibile dall&apos;utente sconosciuta</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="107"/>
+ <location filename="uat_dialog.cpp" line="106"/>
<source>Open </source>
<translation>Apri </translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="419"/>
<source>Uneven number of chars hex string (%1)</source>
- <translation>Numero irregolare di caratteri della stringa esadecimale (%1)</translation>
+ <translation type="vanished">Numero irregolare di caratteri della stringa esadecimale (%1)</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
- <translation>Errore di elaborazione della stringa esadecimale</translation>
+ <translation type="vanished">Errore di elaborazione della stringa esadecimale</translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 9f67339d63..a79110514d 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -4632,12 +4632,12 @@ for filter files: %2.</source>
<translation type="unfinished">フレーム</translation>
</message>
<message>
- <location filename="interface_frame.ui" line="44"/>
+ <location filename="interface_frame.ui" line="50"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="79"/>
+ <location filename="interface_frame.ui" line="88"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4693,6 +4693,14 @@ for filter files: %2.</source>
</message>
</context>
<context>
+ <name>InterfaceSortFilterModel</name>
+ <message>
+ <location filename="interface_sort_filter_model.cpp" line="251"/>
+ <source>No interfaces to be displayed. %1 interfaces filtered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InterfaceTree</name>
<message>
<source>Welcome screen list</source>
@@ -15285,24 +15293,22 @@ a:hover {
<translation>このエントリをコピーします</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="89"/>
+ <location filename="uat_dialog.cpp" line="90"/>
<source>Unknown User Accessible Table</source>
<translation>ユーザがアクセスできる表が不明</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="107"/>
+ <location filename="uat_dialog.cpp" line="106"/>
<source>Open </source>
<translation>開く </translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="419"/>
<source>Uneven number of chars hex string (%1)</source>
- <translation>奇数番号の16進数文字(%1)</translation>
+ <translation type="vanished">奇数番号の16進数文字(%1)</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
- <translation>16進数文字列の解釈エラー</translation>
+ <translation type="vanished">16進数文字列の解釈エラー</translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index c395d4c254..78efbaba02 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -4646,12 +4646,12 @@ dla plików filtrów: %2.</translation>
<translation type="unfinished">Ramka</translation>
</message>
<message>
- <location filename="interface_frame.ui" line="44"/>
+ <location filename="interface_frame.ui" line="50"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="79"/>
+ <location filename="interface_frame.ui" line="88"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4707,6 +4707,14 @@ dla plików filtrów: %2.</translation>
</message>
</context>
<context>
+ <name>InterfaceSortFilterModel</name>
+ <message>
+ <location filename="interface_sort_filter_model.cpp" line="251"/>
+ <source>No interfaces to be displayed. %1 interfaces filtered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InterfaceTree</name>
<message>
<source>Welcome screen list</source>
@@ -15356,24 +15364,22 @@ text-decoration: underline;
<translation>Kopiuj wpis.</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="89"/>
+ <location filename="uat_dialog.cpp" line="90"/>
<source>Unknown User Accessible Table</source>
<translation>Nieznana Tabela Użytkownika</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="107"/>
+ <location filename="uat_dialog.cpp" line="106"/>
<source>Open </source>
<translation>Otwórz</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="419"/>
<source>Uneven number of chars hex string (%1)</source>
- <translation>Nieparzysta liczba znaków strumienia szesnastkowego (%1)</translation>
+ <translation type="vanished">Nieparzysta liczba znaków strumienia szesnastkowego (%1)</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
- <translation>Błąd analizowania szesnastkowego strumienia znaków</translation>
+ <translation type="vanished">Błąd analizowania szesnastkowego strumienia znaków</translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 4d7c0b974e..7fbf69e4af 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -4639,12 +4639,12 @@ for filter files: %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="44"/>
+ <location filename="interface_frame.ui" line="50"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="79"/>
+ <location filename="interface_frame.ui" line="88"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4700,6 +4700,14 @@ for filter files: %2.</source>
</message>
</context>
<context>
+ <name>InterfaceSortFilterModel</name>
+ <message>
+ <location filename="interface_sort_filter_model.cpp" line="251"/>
+ <source>No interfaces to be displayed. %1 interfaces filtered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InterfaceTree</name>
<message>
<source>Welcome screen list</source>
@@ -15313,24 +15321,22 @@ text-decoration: underline;
<translation>复制此项。</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="89"/>
+ <location filename="uat_dialog.cpp" line="90"/>
<source>Unknown User Accessible Table</source>
<translation>未知用户可访问表</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="107"/>
+ <location filename="uat_dialog.cpp" line="106"/>
<source>Open </source>
<translation>打开</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="419"/>
<source>Uneven number of chars hex string (%1)</source>
- <translation>字符十六进制字符串 (%1) 的奇数</translation>
+ <translation type="vanished">字符十六进制字符串 (%1) 的奇数</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
- <translation>解析十六进制字符串出错</translation>
+ <translation type="vanished">解析十六进制字符串出错</translation>
</message>
</context>
<context>