aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--NEWS2
-rw-r--r--enterprises.tsv63
-rw-r--r--manuf71
-rw-r--r--ui/qt/wireshark_ja_JP.ts42
5 files changed, 144 insertions, 36 deletions
diff --git a/AUTHORS b/AUTHORS
index 0ea8813d1a..77cf8fcacf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4025,6 +4025,7 @@ Arjen Zonneveld <arjen[AT]bz2.nl>
Arnd Hannemann <arnd[AT]arndnet.de>
Artem Mygaiev <joculator[AT]gmail.com>
Artur Nowosielski <artnowo[AT]gmail.com>
+Arvind Dalvi <ardalvi[AT]outlook.in>
Asaf Kave <kaveasaf[AT]gmail.com>
Ashish Shukla <shukla.a[AT]gmail.com>
Atli Guðmundsson <atli[AT]tern.is>
@@ -4162,6 +4163,7 @@ Emmanuel Grumbach <emmanuel.grumbach[AT]intel.com>
Eric Anderson <andersoe[AT]cs.cmu.edu>
Eric Wang <terminal_0[AT]aol.com>
Eric Wetzel <thewetzel[AT]gmail.com>
+Eric Wild <ewild[AT]sysmocom.de>
Erik de Jong <erikdejong[AT]gmail.com>
Erika Szelleova <szelleerika[AT]gmail.com>
Ethan Everett <ethan.everett[AT]meraki.net>
diff --git a/NEWS b/NEWS
index ddfd3888fb..08f73152b4 100644
--- a/NEWS
+++ b/NEWS
@@ -74,7 +74,7 @@ Wireshark 3.1.0 Release Notes
A complete FAQ is available on the Wireshark web site[8].
- Last updated 2019-05-19 08:08:33 UTC
+ Last updated 2019-05-26 08:07:17 UTC
References
diff --git a/enterprises.tsv b/enterprises.tsv
index b57cd055a9..243755be27 100644
--- a/enterprises.tsv
+++ b/enterprises.tsv
@@ -5,7 +5,7 @@
# The format used here is: <NUMERICAL_ID><SPACE><NAME>
# Where SPACE can be any sequence of spaces and tabs.
#
-# (last updated 2019-05-18)
+# (last updated 2019-05-25)
0 Reserved
1 NxNetworks
@@ -15149,7 +15149,7 @@
15285 iSolv Technologies cc
15286 ADPM
15287 Joachim Bauch # formerly 'FOB Team'
-15288 REGISTER.IT S.p.a.
+15288 Register SpA
15289 Advanced Broadband Communications Center (CCABA-UPC)
15290 Ordway Center for the Performing Arts
15291 Mach Technology, Inc.
@@ -20219,7 +20219,7 @@
20371 VhaYu Technologies
20372 Michael A Nachbaur
20373 Coast to Coast Hosting
-20374 AVAL NAGASAKI CORPORATION
+20374 TOKYO ELECTRON DEVICE NAGASAKI LIMITED
20375 ATT - AudioText Telecom AG
20376 Century Systems Inc.
20377 ITMG GmbH
@@ -30044,7 +30044,7 @@
30203 Forschungsverbund Berlin e.V.
30204 Faculty of Physics and Applied Informatics, University of Lodz
30205 Rohde & Schwarz Cybersecurity GmbH # formerly 'Sirrix AG security technologies'
-30206 Invisible Software Ltd
+30206 Invisible Software 2.0 Ltd
30207 Level 3 Solutions, LLC
30208 Firecode Soluções em Tecnologia LTDA
30209 Universita' Ca' Foscari Venezia
@@ -53549,7 +53549,7 @@
53738 Beijing Tasson Technology Ltd.
53739 IDRAK TECHNOLOGY TRANSFER
53740 Magnit Pharma
-53741 Banque de Commerce et de Placements
+53741 Banque de Commerce et de Placements SA
53742 Deutsche Gesellschaft für Internationale Zusammenarbeit (GIZ) GmbH
53743 Domino's Pizza, Inc
53744 Wejds
@@ -53756,3 +53756,56 @@
53945 TEK TRIBE
53946 JACJ IT SOLUTIONS, LLC
53947 Sweroam
+53948 Norealp
+53949 Capio CFR A/S
+53950 Klebl GmbH
+53951 Arizona Blood and Cancer Specialists, PLLC
+53952 LEGAL SERVICES SOCIETY
+53953 SUN Behavioral Health Inc.
+53954 DECIMAL PLATFORM - LDA
+53955 Treetown Tech LLC
+53956 Alexei Voyageman Global Cyber Verifying Service
+53957 Easterseals Bay Area
+53958 Adaptive Energy LLC
+53959 SunPower Corporation
+53960 Gateview Technologies
+53961 WaferPath Inc.
+53962 Cannonia
+53963 Jundo Online, LLC
+53964 T&T sistemi R&D
+53965 Julian Kotysch
+53966 jamaillia.net
+53967 Sollatek UK
+53968 Infotek
+53969 Schneider Electric Software Netherlands
+53970 ICT Concept B.V.
+53971 Office of Public Works
+53972 Celitech Inc.
+53973 ABB Power Protection SA
+53974 SOGECAP
+53975 UGuard Technology Co. LTD
+53976 Trilobit
+53977 LaserNet
+53978 West Air Gas & Equipment
+53979 Seti Seguranca E Tecnologia Na Internet Ltda. Me
+53980 Motech Solutions Ltd
+53981 Socket Ltd.
+53982 OZON
+53983 Centro de Hematología y Oncología del Sur, CSP
+53984 Havs- och vattenmyndigheten
+53985 CirrusPoint Solutions Inc.
+53986 Mast Bazaar
+53987 mpDev
+53988 P-X Systems
+53989 Vyera Pharmaceuticals
+53990 Strategic Digital Defense, LLC
+53991 tecnint hte
+53992 Rausch Sturm
+53993 Ifinet srl
+53994 Schaeffer-AG
+53995 ZeeVee, Inc.
+53996 King's College
+53997 ZampleWorks
+53998 Documo Inc
+53999 Cathworks Ltd.
+54000 Springfield College
diff --git a/manuf b/manuf
index b08bb41990..ab9888e781 100644
--- a/manuf
+++ b/manuf
@@ -44,24 +44,24 @@
# https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob_plain;f=manuf;hb=HEAD
# http://standards-oui.ieee.org/cid/cid.csv:
-# Content-Length: 7476
-# Last-Modified: Sun, 19 May 2019 08:00:42 GMT
+# Content-Length: 7548
+# Last-Modified: Sun, 26 May 2019 08:00:43 GMT
# http://standards-oui.ieee.org/iab/iab.csv:
# Content-Length: 381347
-# Last-Modified: Sun, 19 May 2019 08:01:42 GMT
+# Last-Modified: Sun, 26 May 2019 08:01:47 GMT
# http://standards-oui.ieee.org/oui/oui.csv:
-# Content-Length: 2355750
-# Last-Modified: Sun, 19 May 2019 08:04:02 GMT
+# Content-Length: 2359503
+# Last-Modified: Sun, 26 May 2019 08:04:14 GMT
# http://standards-oui.ieee.org/oui28/mam.csv:
-# Content-Length: 273120
-# Last-Modified: Sun, 19 May 2019 08:02:10 GMT
+# Content-Length: 274195
+# Last-Modified: Sun, 26 May 2019 08:02:19 GMT
# http://standards-oui.ieee.org/oui36/oui36.csv:
-# Content-Length: 284726
-# Last-Modified: Sun, 19 May 2019 08:03:34 GMT
+# Content-Length: 285476
+# Last-Modified: Sun, 26 May 2019 08:03:45 GMT
00:00:00 00:00:00 Officially Xerox, but 0:0:0:0:0:0 is more common
00:00:01 Xerox Xerox Corporation
@@ -17721,6 +17721,8 @@
08:4E:1C H2ALlc H2A Systems, LLC
08:4E:BF BroadNet Broad Net Mux Corporation
08:4F:0A HuaweiTe Huawei Technologies Co.,Ltd
+08:4F:A9 Cisco Cisco Systems, Inc
+08:4F:F9 Cisco Cisco Systems, Inc
08:51:14 QingdaoT Qingdao Topscomm Communication Co., Ltd
08:51:2E OrionDia Orion Diagnostica Oy
08:52:40 EbvElekt EbV Elektronikbau- und Vertriebs GmbH
@@ -18633,6 +18635,7 @@
18:28:61 AirtiesW AirTies Wireless Networks
18:2A:44 HiroseEl Hirose Electronic System
18:2A:7B Nintendo Nintendo Co., Ltd.
+18:2A:D3 JuniperN Juniper Networks
18:2B:05 8DTechno 8D Technologies
18:2C:91 ConceptD Concept Development, Inc.
18:2C:B4 Nectarso Nectarsoft Co., Ltd.
@@ -18731,6 +18734,7 @@
18:8B:9D Cisco Cisco Systems, Inc
18:8E:D5 TpVision TP Vision Belgium N.V. - innovation site Brugge
18:8E:F9 G2C G2C Co. Ltd.
+18:90:88 Eero eero inc.
18:90:D8 Sagemcom Sagemcom Broadband SAS
18:92:2C VirtualI Virtual Instruments
18:93:7F AmpakTec AMPAK Technology, Inc.
@@ -18946,6 +18950,7 @@
1C:66:6D HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
1C:66:AA SamsungE Samsung Electronics Co.,Ltd
1C:67:58 HuaweiTe Huawei Technologies Co.,Ltd
+1C:68:7E Shenzhen Shenzhen Qihu Intelligent Technology Company Limited
1C:69:7A Elitegro EliteGroup Computer Systems Co., LTD
1C:69:A5 Blackber BlackBerry RTS
1C:6A:7A Cisco Cisco Systems, Inc
@@ -19294,6 +19299,7 @@
20:76:00 Actionte Actiontec Electronics, Inc
20:76:8F Apple Apple, Inc.
20:76:93 LenovoBe Lenovo (Beijing) Limited.
+20:77:59 OpticalN Optical Network Video Technologies (Shenzhen) Co., Ltd.
20:78:0B DeltaFau Delta Faucet Company
20:78:52 Nokia
20:78:F0 Apple Apple, Inc.
@@ -19582,6 +19588,7 @@
24:DB:ED SamsungE Samsung Electronics Co.,Ltd
24:DE:C6 ArubaAHe Aruba, a Hewlett Packard Enterprise Company
24:DF:6A HuaweiTe Huawei Technologies Co.,Ltd
+24:DF:A7 Hangzhou Hangzhou BroadLink Technology Co.,Ltd
24:E1:24 XiamenUr Xiamen Ursaconn Technology Co. , Ltd.
24:E2:71 QingdaoH Qingdao Hisense Communications Co.,Ltd.
24:E3:14 Apple Apple, Inc.
@@ -20690,6 +20697,7 @@
34:DA:C1 SaeTechn SAE Technologies Development(Dongguan) Co., Ltd.
34:DB:9C Sagemcom Sagemcom Broadband SAS
34:DB:FD Cisco Cisco Systems, Inc
+34:DD:7E UmeoxInn Umeox Innovations Co.,Ltd
34:DE:1A IntelCor Intel Corporate
34:DE:34 Zte zte corporation
34:DF:2A FujikonI Fujikon Industrial Co.,Limited
@@ -20958,6 +20966,7 @@
38:BF:33 NecCasio NEC CASIO Mobile Communications
38:C0:96 AlpsElec Alps Electric Co., Ltd.
38:C2:BA CctvNeot Cctv Neotech
+38:C4:E8 NssSpZOO NSS Sp. z o.o.
38:C7:0A Wifisong
38:C7:BA CsServic CS Services Co.,Ltd.
38:C8:5C CiscoSpv Cisco SPVTG
@@ -22612,6 +22621,7 @@
4C:55:B8 Turkcell Turkcell Teknoloji
4C:55:CC ZentriPt Zentri Pty Ltd
4C:56:9D Apple Apple, Inc.
+4C:56:DF TargusUs Targus US LLC
4C:57:CA Apple Apple, Inc.
4C:5D:CD OyFinnis Oy Finnish Electric Vehicle Technologies Ltd
4C:5E:0C Routerbo Routerboard.com
@@ -22779,6 +22789,7 @@
4C:E9:33 Railcomm RailComm, LLC
4C:E9:E4 NewH3CTe New H3C Technologies Co., Ltd
4C:EB:42 IntelCor Intel Corporate
+4C:EB:BD Chongqin Chongqing Fugui Electronics Co.,Ltd.
4C:EC:EF Soraa Soraa, Inc.
4C:ED:DE AskeyCom Askey Computer Corp
4C:ED:FB AsustekC ASUSTek COMPUTER INC.
@@ -22956,6 +22967,7 @@
50:97:44 Integrat Integrated Device Technology (Malaysia) Sdn. Bhd.
50:97:72 Westingh Westinghouse Digital
50:98:71 Inventum Inventum Technologies Private Limited
+50:98:B8 NewH3CTe New H3C Technologies Co., Ltd
50:98:F3 RheemAus Rheem Australia Pty Ltd
50:9A:4C Dell Dell Inc.
50:9E:A7 SamsungE Samsung Electronics Co.,Ltd
@@ -23109,6 +23121,7 @@
54:27:58 Motorola Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
54:27:6C JiangsuH Jiangsu Houge Technology Corp.
54:27:8D NxpChina NXP (China) Management Ltd.
+54:2A:1B Sonos Sonos, Inc.
54:2A:9C LsyDefen LSY Defense, LLC.
54:2A:A2 AlphaNet Alpha Networks Inc.
54:2B:57 NightOwl Night Owl SP
@@ -23389,6 +23402,7 @@
58:82:A8 Microsof Microsoft
58:84:E4 Ip500All IP500 Alliance e.V.
58:85:6E Qsc Qsc Ag
+58:85:A2 RealmeCh Realme Chongqing MobileTelecommunications Corp Ltd
58:87:4C Lite-OnC Lite-On Clean Energy Technology Corp.
58:87:E2 Shenzhen Shenzhen Coship Electronics Co., Ltd.
58:8A:5A Dell Dell Inc.
@@ -23612,6 +23626,7 @@
5C:8D:2D Shanghai Shanghai Wellpay Information Technology Co., Ltd
5C:8D:4E Apple Apple, Inc.
5C:8F:E0 ArrisGro ARRIS Group, Inc.
+5C:92:5E ZioncomE Zioncom Electronics (Shenzhen) Ltd.
5C:93:A2 LiteonTe Liteon Technology Corporation
5C:95:AE Apple Apple, Inc.
5C:96:56 Azurewav AzureWave Technology Inc.
@@ -23881,6 +23896,7 @@
60:A7:30 Shenzhen Shenzhen Yipinfang Internet Technology Co.,Ltd
60:A8:FE Nokia
60:A9:B0 Merchand Merchandising Technologies, Inc
+60:AB:14 LgInnote LG Innotek
60:AB:67 XiaomiCo Xiaomi Communications Co Ltd
60:AC:C8 Kunteng KunTeng Inc.
60:AF:6D SamsungE Samsung Electronics Co.,Ltd
@@ -25124,6 +25140,7 @@
70:B3:D5:16:C0:00/36 Ocean
70:B3:D5:16:E0:00/36 JemacSwe Jemac Sweden AB
70:B3:D5:16:F0:00/36 Nimbelin NimbeLink Corp
+70:B3:D5:17:00:00/36 Mutelcor Mutelcor GmbH
70:B3:D5:17:10:00/36 Aetina Aetina Corporation
70:B3:D5:17:20:00/36 Lumigrow LumiGrow, Inc
70:B3:D5:17:30:00/36 National National TeleConsultants LLC
@@ -25349,6 +25366,7 @@
70:B3:D5:29:C0:00/36 TekoTele Teko Telecom Srl
70:B3:D5:29:D0:00/36 Xtech2Si XTech2 SIA
70:B3:D5:29:F0:00/36 CodeHard Code Hardware SA
+70:B3:D5:2A:00:00/36 Airthing Airthings
70:B3:D5:2A:10:00/36 BlinkSer Blink Services AB
70:B3:D5:2A:20:00/36 Visualwa Visualware, Inc.
70:B3:D5:2A:30:00/36 AttNussb ATT Nussbaum Prüftechnik GmbH
@@ -26004,6 +26022,7 @@
70:B3:D5:62:50:00/36 VxInstru VX Instruments GmbH
70:B3:D5:62:80:00/36 MectSrl Mect Srl
70:B3:D5:62:B0:00/36 Silicann Silicann Systems GmbH
+70:B3:D5:62:F0:00/36 BarcoSRO BARCO, s.r.o.
70:B3:D5:63:00:00/36 Lge
70:B3:D5:63:10:00/36 Senso2Me
70:B3:D5:63:30:00/36 Observer Observer Foundation
@@ -26062,6 +26081,7 @@
70:B3:D5:67:70:00/36 Fraunhof Fraunhofer-Institut IIS
70:B3:D5:67:80:00/36 DiniGrou The Dini Group, La Jolla inc.
70:B3:D5:67:90:00/36 Emac EMAC, Inc.
+70:B3:D5:67:A0:00/36 Micatu
70:B3:D5:67:B0:00/36 Stesalit Stesalit Systems Ltd
70:B3:D5:67:D0:00/36 Acrodea Acrodea, Inc.
70:B3:D5:68:00:00/36 Basf BASF Corporation
@@ -26256,6 +26276,7 @@
70:B3:D5:78:30:00/36 Chieru CHIeru., CO., Ltd.
70:B3:D5:78:40:00/36 Shenzhen Shenzhen bayue software co. LTD
70:B3:D5:78:50:00/36 Density Density Inc.
+70:B3:D5:78:70:00/36 DenAutom Den Automation
70:B3:D5:78:80:00/36 Slan
70:B3:D5:78:90:00/36 Semex-En SEMEX-EngCon GmbH
70:B3:D5:78:A0:00/36 HillsHea Hills Health Solutions
@@ -26387,6 +26408,7 @@
70:B3:D5:82:D0:00/36 Elektron Elektronik Art S.C.
70:B3:D5:82:E0:00/36 Playaliv PlayAlive A/S
70:B3:D5:83:10:00/36 ArnouseD Arnouse Digital Devices Corp
+70:B3:D5:83:20:00/36 PotterEl Potter Electric Signal Co. LLC
70:B3:D5:83:30:00/36 AlpiqInt Alpiq InTec Management AG
70:B3:D5:83:50:00/36 CommboxP CommBox P/L
70:B3:D5:83:60:00/36 Authenti Authenticdata
@@ -26659,6 +26681,7 @@
70:B3:D5:9A:B0:00/36 GroupePa Groupe Paris-Turf
70:B3:D5:9A:D0:00/36 FortunaI Fortuna Impex Pvt ltd
70:B3:D5:9A:E0:00/36 Volansys Volansys technologies pvt ltd
+70:B3:D5:9B:00:00/36 ClearlyI Clearly IP Inc
70:B3:D5:9B:10:00/36 AplexTec Aplex Technology Inc.
70:B3:D5:9B:20:00/36 Continen CONTINENT, Ltd
70:B3:D5:9B:30:00/36 K&JSchmi K&J Schmittschneider AG
@@ -27064,6 +27087,7 @@
70:B3:D5:BB:D0:00/36 Providiu Providius Corp
70:B3:D5:BB:E0:00/36 SunriseE Sunrise Systems Electronics Co. Inc.
70:B3:D5:BB:F0:00/36 EnsysSrl Ensys srl
+70:B3:D5:BC:00:00/36 Senso2Me
70:B3:D5:BC:10:00/36 Abionic
70:B3:D5:BC:20:00/36 Dwewoong DWEWOONG ELECTRIC Co., Ltd.
70:B3:D5:BC:30:00/36 Ewireles eWireless
@@ -27315,6 +27339,7 @@
70:B3:D5:D1:F0:00/36 Embsec Embsec AB
70:B3:D5:D2:00:00/36 Rheonics Rheonics GmbH
70:B3:D5:D2:20:00/36 DekTechn DEK Technologies
+70:B3:D5:D2:30:00/36 CottElec COTT Electronics
70:B3:D5:D2:40:00/36 Microtro Microtronics Engineering GmbH
70:B3:D5:D2:50:00/36 Engenesi ENGenesis
70:B3:D5:D2:60:00/36 Mi MI Inc.
@@ -27577,6 +27602,7 @@
70:B3:D5:E8:80:00/36 BreasMed Breas Medical AB
70:B3:D5:E8:A0:00/36 MelecsEw Melecs EWS GmbH
70:B3:D5:E8:C0:00/36 Fracarro Fracarro srl
+70:B3:D5:E8:D0:00/36 NatavSer Natav Services Ltd.
70:B3:D5:E8:E0:00/36 MacnicaT Macnica Technology
70:B3:D5:E8:F0:00/36 Dismunte Dismuntel, S.A.
70:B3:D5:E9:00:00/36 GeteinBi Getein Biotechnology Co.,ltd
@@ -28329,6 +28355,7 @@
78:66:AE ZtecInst ZTEC Instruments, Inc.
78:67:D7 Apple Apple, Inc.
78:68:F7 YstenTec YSTen Technology Co.,Ltd
+78:69:D4 Shenyang Shenyang Vibrotech Instruments Inc.
78:6A:89 HuaweiTe Huawei Technologies Co.,Ltd
78:6C:1C Apple Apple, Inc.
78:6D:94 PaloAlto Palo Alto Networks
@@ -29004,6 +29031,7 @@
80:AD:16 XiaomiCo Xiaomi Communications Co Ltd
80:AD:67 KasdaNet Kasda Networks Inc
80:B0:3D Apple Apple, Inc.
+80:B0:7B Zte zte corporation
80:B2:19 Elektron Elektron Technology Uk Limited
80:B2:34 Technico Technicolor CH USA Inc.
80:B2:89 Forworld Forworld Electronics Ltd.
@@ -29518,6 +29546,7 @@
88:98:21 Teraon
88:9B:39 SamsungE Samsung Electronics Co.,Ltd
88:9C:A6 BtbKorea BTB Korea INC
+88:9D:98 Allied-T Allied-telesisK.K.
88:9E:33 TctMobil TCT mobile ltd
88:9F:6F SamsungE Samsung Electronics Co.,Ltd
88:9F:AA HellaGut Hella Gutmann Solutions GmbH
@@ -29840,6 +29869,7 @@
8C:B6:4F Cisco Cisco Systems, Inc
8C:B7:F7 Shenzhen Shenzhen UniStrong Science & Technology Co., Ltd
8C:B8:2C IpitomyC IPitomy Communications
+8C:B8:4A SamsungE Samsung Electro-Mechanics(Thailand)
8C:B8:64 AcsipTec AcSiP Technology Corp.
8C:BE:24 TashangS Tashang Semiconductor(Shanghai) Co., Ltd.
8C:BE:BE XiaomiCo Xiaomi Communications Co Ltd
@@ -29929,6 +29959,7 @@
90:0D:CB ArrisGro ARRIS Group, Inc.
90:0E:83 MonicoMo Monico Monitoring, Inc.
90:0E:B3 Shenzhen Shenzhen Amediatech Technology Co., Ltd.
+90:12:34 Shenzhen Shenzhen YOUHUA Technology Co., Ltd
90:17:11 HagenukM Hagenuk Marinekommunikation GmbH
90:17:9B Nanomega Nanomegas
90:17:AC HuaweiTe Huawei Technologies Co.,Ltd
@@ -30402,6 +30433,16 @@
98:03:9B Mellanox Mellanox Technologies, Inc.
98:03:A0 AbbNVPow ABB n.v. Power Quality Products
98:03:D8 Apple Apple, Inc.
+98:06:37 IeeeRegi IEEE Registration Authority
+98:06:37:00:00:00/28 Zoleo Zoleo Inc.
+98:06:37:10:00:00/28 EPSchlum E. P. Schlumberger
+98:06:37:40:00:00/28 ChengduS Chengdu Shuwei Communication Technology Co.,Ltd
+98:06:37:60:00:00/28 BoeingSs Boeing Ssg
+98:06:37:90:00:00/28 Nab NAB co,.LTD
+98:06:37:A0:00:00/28 AngoraNe Angora Networks
+98:06:37:B0:00:00/28 Petersim Petersime
+98:06:37:C0:00:00/28 Hwacom HwaCom Systems Inc.
+98:06:37:D0:00:00/28 VrTechno VR Technology(Shenzhen) Limited
98:07:2D TexasIns Texas Instruments
98:09:CF OneplusT OnePlus Technology (Shenzhen) Co., Ltd
98:0C:82 SamsungE Samsung Electro Mechanics Co., Ltd.
@@ -30586,6 +30627,7 @@
98:E7:F4 HewlettP Hewlett Packard
98:E7:F5 HuaweiTe Huawei Technologies Co.,Ltd
98:E8:48 Axiim
+98:E8:FA Nintendo Nintendo Co.,Ltd
98:EC:65 CosesyAp Cosesy ApS
98:ED:5C TeslaMot Tesla Motors, Inc
98:EE:CB WistronI Wistron Infocomm (Zhongshan) Corporation
@@ -31659,6 +31701,7 @@ A8:BD:27 HewlettP Hewlett Packard Enterprise
A8:BD:3A Unionman Unionman Technology Co.,Ltd
A8:BE:27 Apple Apple, Inc.
A8:BF:3C HdvPhoel HDV Phoelectron Technology Limited
+A8:C0:EA Pepwave Pepwave Limited
A8:C2:22 Tm-Resea TM-Research Inc.
A8:C8:3A HuaweiTe Huawei Technologies Co.,Ltd
A8:C8:7F Roqos Roqos, Inc.
@@ -32046,6 +32089,7 @@ B0:5C:E5 Nokia Nokia Corporation
B0:61:C7 Ericsson Ericsson-LG Enterprise
B0:65:63 Shanghai Shanghai Railway Communication Factory
B0:65:BD Apple Apple, Inc.
+B0:65:F1 WioManuf WIO Manufacturing HK Limited
B0:67:2F BowersWi Bowers & Wilkins
B0:68:B6 Hangzhou Hangzhou OYE Technology Co. Ltd
B0:68:E6 Chongqin Chongqing Fugui Electronics Co.,Ltd.
@@ -32369,6 +32413,7 @@ B4:A2:EB:70:00:00/28 KonaI Kona I
B4:A2:EB:80:00:00/28 Shenzhen Shenzhen Zhuifengma Technology Co., Ltd
B4:A2:EB:90:00:00/28 CurrentW Current Ways, Inc.
B4:A2:EB:A0:00:00/28 Hengkang Hengkang(Hangzhou)Co.,Ltd
+B4:A2:EB:C0:00:00/28 Shanghai Shanghai Shenou Communication Equipment Co., Ltd.
B4:A2:EB:D0:00:00/28 Salzbren SALZBRENNER media GmbH
B4:A2:EB:E0:00:00/28 Dongguan Dongguan Finslink Communication Technology Co.,Ltd.
B4:A3:05 XiamenYa Xiamen Yaxon Network Co., Ltd.
@@ -32445,6 +32490,7 @@ B4:E9:B0 Cisco Cisco Systems, Inc
B4:EC:02 AlpsElec Alps Electric Co., Ltd.
B4:ED:19 PieDigit Pie Digital, Inc.
B4:ED:54 WohlerTe Wohler Technologies
+B4:EE:25 Shenzhen Shenzhen Belon Technology CO.,LTD
B4:EE:B4 AskeyCom Askey Computer Corp
B4:EE:D4 TexasIns Texas Instruments
B4:EF:04 DaihanSc DAIHAN Scientific Co., Ltd.
@@ -32794,6 +32840,7 @@ BC:60:10 QingdaoH Qingdao Hisense Communications Co.,Ltd.
BC:60:A7 SonyInte Sony Interactive Entertainment Inc.
BC:62:0E HuaweiTe Huawei Technologies Co.,Ltd
BC:62:9F TelenetP Telenet Systems P. Ltd.
+BC:62:D2 GenexisI Genexis International B.V.
BC:64:4B ArrisGro ARRIS Group, Inc.
BC:66:41 IeeeRegi IEEE Registration Authority
BC:66:41:00:00:00/28 InsyncTe InSync Technology Ltd
@@ -33447,6 +33494,7 @@ C8:25:E1 Lemobile Lemobile Information Technology (Beijing) Co., Ltd
C8:28:32 BeijingX Beijing Xiaomi Electronics Co., Ltd.
C8:29:2A BarunEle Barun Electronics
C8:2A:14 Apple Apple, Inc.
+C8:2B:96 Espressi Espressif Inc.
C8:2C:2B IeeeRegi IEEE Registration Authority
C8:2C:2B:00:00:00/28 Fungible Fungible, Inc.
C8:2C:2B:10:00:00/28 Galgus
@@ -33499,6 +33547,7 @@ C8:52:61 ArrisGro ARRIS Group, Inc.
C8:54:4B ZyxelCom Zyxel Communications Corporation
C8:56:45 Intermas Intermas France
C8:56:63 SunflexE Sunflex Europe GmbH
+C8:5A:9F Zte zte corporation
C8:5B:76 LcfcHefe LCFC(HeFei) Electronics Technology co., ltd
C8:5D:38 Humax HUMAX Co., Ltd.
C8:60:00 AsustekC ASUSTek COMPUTER INC.
@@ -34731,6 +34780,7 @@ DA:0D:38 Farpoint Farpointe Data, Inc.
DA:1C:21 Sesam Sesam GmbH
DA:28:EC HgGenuin HG Genuine
DA:2B:DD At&T AT&T, Inc.
+DA:41:62 Xperi Xperi Corporation
DA:A1:19 Google Google, Inc.
DA:C8:7D SeDevelo SE Development AB
DA:FF:6B TeamPrec Team Precision Public Company Limited
@@ -34900,6 +34950,7 @@ DC:C6:4B HuaweiTe Huawei Technologies Co.,Ltd
DC:C7:93 Nokia Nokia Corporation
DC:C8:F5 Shanghai Shanghai UMEinfo CO.,LTD.
DC:CB:A8 ExploraT Explora Technologies Inc
+DC:CC:8D Integrat Integrated Device Technology (Malaysia) Sdn. Bhd.
DC:CE:41 FeGlobal Fe Global Hong Kong Limited
DC:CE:BC Shenzhen Shenzhen JSR Technology Co.,Ltd.
DC:CE:C1 Cisco Cisco Systems, Inc
@@ -34962,6 +35013,7 @@ DC:F7:19 Cisco Cisco Systems, Inc
DC:F7:55 Sitronik
DC:F7:56 SamsungE Samsung Electronics Co.,Ltd
DC:F8:58 LorentNe Lorent Networks, Inc.
+DC:F8:B9 Zte zte corporation
DC:FA:D5 StrongGe STRONG Ges.m.b.H.
DC:FB:02 Buffalo Buffalo.Inc
DC:FB:48 IntelCor Intel Corporate
@@ -35973,6 +36025,7 @@ F0:58:49 Careview CareView Communications
F0:5A:09 SamsungE Samsung Electronics Co.,Ltd
F0:5B:7B SamsungE Samsung Electronics Co.,Ltd
F0:5C:19 ArubaAHe Aruba, a Hewlett Packard Enterprise Company
+F0:5C:77 Google Google, Inc.
F0:5D:89 Dycon Dycon Limited
F0:5D:C8 Duracell Duracell Powermat
F0:5F:5A Getriebe Getriebebau NORD GmbH and Co. KG
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index ff5465fd5e..9e546b92ae 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1109,49 +1109,49 @@
<message>
<source>Multiple filters selected. Override them here or leave this blank to preserve them.</source>
<extracomment>This is a very long concept that needs to fit into a short space.</extracomment>
- <translation type="unfinished"></translation>
+ <translation>複数のフィルタが選択されています。選択を上書きするか空白のままにしてください</translation>
</message>
<message>
<source>&lt;p&gt;The interfaces you have selected have different capture filters. Typing a filter here will override them. Doing nothing will preserve them.&lt;/p&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;p&gt;選択したインターフェースには異なるキャプチャフィルタがあります。ここにフィルタを入力すれば上書きされます。なにもしなければ保存します&lt;/p&gt;</translation>
</message>
<message>
<source>Enter a capture filter %1</source>
- <translation type="unfinished"></translation>
+ <translation>キャプチャフィルタ %1 を入力</translation>
</message>
<message>
<source>Save this filter</source>
- <translation type="unfinished"></translation>
+ <translation>このフィルタを保存</translation>
</message>
<message>
<source>Remove this filter</source>
- <translation type="unfinished"></translation>
+ <translation>このフィルタを削除</translation>
</message>
<message>
<source>Manage Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>キャプチャフィルタ管理</translation>
</message>
</context>
<context>
<name>CaptureInfoDialog</name>
<message>
<source>Capture Information</source>
- <translation type="unfinished"></translation>
+ <translation>キャプチャ情報</translation>
</message>
<message>
<source>Stop Capture</source>
- <translation type="unfinished"></translation>
+ <translation>キャプチャ停止</translation>
</message>
<message>
<source>%1 packets, %2:%3:%4</source>
- <translation type="unfinished"></translation>
+ <translation>%1 パケット, %2:%3:%4</translation>
</message>
</context>
<context>
<name>CaptureInfoModel</name>
<message>
<source>Other</source>
- <translation type="unfinished">その他</translation>
+ <translation>その他</translation>
</message>
</context>
<context>
@@ -1186,7 +1186,7 @@
</message>
<message>
<source>pcapng</source>
- <translation type="unfinished"></translation>
+ <translation>pcap-ng形式</translation>
</message>
<message>
<source>pcap</source>
@@ -1225,7 +1225,7 @@
</message>
<message>
<source>Show capture information during live capture</source>
- <translation type="unfinished"></translation>
+ <translation>キャプチャ中にキャプチャ情報画面を表示</translation>
</message>
<message>
<source>Stop capturing after the specified number of packets have been captured.</source>
@@ -1301,31 +1301,31 @@
</message>
<message>
<source>Switch to the next file after the specified number of packets have been captured.</source>
- <translation type="unfinished"></translation>
+ <translation>指定したパケット数がキャプチャされた後に次のファイルに切り替えます</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Instead of using a single capture file, multiple files will be created.&lt;/p&gt;&lt;p&gt;The generated file names will contain an incrementing number and the start time of the capture.&lt;/p&gt;&lt;p&gt;NOTE: If enabled, at least one of the new-file criteria MUST be selected.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;1つのキャプチャファイルを用いる代わりに複数のファイルが作成されます。&lt;/p&gt;&lt;p&gt;生成されたファイル名は連番とキャプチャ開始時間を含みます&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Create a new file automatically…</source>
- <translation type="unfinished"></translation>
+ <translation>…後に自動的に新ファイルを作成</translation>
</message>
<message>
<source>after</source>
- <translation type="unfinished"></translation>
+ <translation>後</translation>
</message>
<message>
<source>Switch to the next file after the file size exceeds the specified file size.</source>
- <translation type="unfinished"></translation>
+ <translation>ファイルサイズが指定したファイルサイズを超過した後に次のファイルに切り替えます</translation>
</message>
<message>
<source>Switch to the next file when the time capturing to the current file exceeds the specified time.</source>
- <translation type="unfinished"></translation>
+ <translation>現在のファイルをキャプチャしている時間が指定した時間を超過した際に次のファイルに切り替えます</translation>
</message>
<message>
<source>when time is a multiple of</source>
- <translation type="unfinished"></translation>
+ <translation>時刻が複数の</translation>
</message>
<message>
<source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
@@ -1919,11 +1919,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Save this filter</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">このフィルタを保存</translation>
</message>
<message>
<source>Remove this filter</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">このフィルタを削除</translation>
</message>
<message>
<source>Manage Display Filters</source>