[Automatic update for 2018-02-18]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I5b5b729c83aa7017454b7c7d8230415e1834587f
Reviewed-on: https://code.wireshark.org/review/25862
Reviewed-by: Gerald Combs <gerald@wireshark.org>

diff --git a/AUTHORS b/AUTHORS
index 3b6c3b38378302fee4ad756a1927b474c3aef91a..1895ca8a7ef765a7be61988809cf73a8ccd08947 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -4186,6 +4186,7 @@ Jakub Pawlowski           <jpawlowski[AT]google.com>
 James Coleman          <jamesc[AT]dspsrv.com>
 James Ko               <jck[AT]exegin.com>
 Jamil Nimeh            <jnimeh[AT]gmail.com>
+Jan Holthuis           <jan.holthuis[AT]ruhr-uni-bochum.de>
 Jan Kaisrlik           <j.kaisrlik[AT]seznam.cz>
 Jan Seda               <hodor[AT]hodor.cz>
 Jan Spevak             <jan.spevak[AT]nokia.com>

diff --git a/docbook/wsug_src/editcap-T.txt b/docbook/wsug_src/editcap-T.txt
index 5d7e40bc38a3daf44003dd5dca4c2fa92ce8a5e0..b31ef0bdf2d2da91e5e91421745fb1b6155d2f00 100644 (file)
--- a/docbook/wsug_src/editcap-T.txt
+++ b/docbook/wsug_src/editcap-T.txt
@@ -25,6 +25,7 @@ editcap: The available encapsulation types for the "-T" flag are:
     dbus - D-Bus
     dct2000 - Catapult DCT2000
     docsis - Data Over Cable Service Interface Specification
+    docsis31_xra31 - DOCSIS31 XRA31
     dpnss_link - Digital Private Signalling System No 1 Link Layer
     dvbci - DVB-CI (Common Interface)
     enc - OpenBSD enc(4) encapsulating interface

diff --git a/enterprises.tsv b/enterprises.tsv
index d918709f8b74e54dacdd6ec3a1a3fe7348eb24f8..75a8f3fa4997eafb0d142e3fabeb3aca8dc7d8df 100644 (file)
--- 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 2018-02-10)
+# (last updated 2018-02-17)
 
 0      Reserved
 1      NxNetworks
@@ -7463,7 +7463,7 @@
 7480   @MySpend.Com
 7481   Talon
 7482   Widax Corporation
-7483   Alcatel-Lucent  # formerly 'Tropic Networks'
+7483   Nokia (Formerly 'Alcatel-Lucent')
 7484   Teleias Inc.
 7485   SPS, Inc.
 7486   Embassy Systems, Ltda.
@@ -51231,3 +51231,38 @@
 51415  Banicomm Co.
 51416  Neotech Solutions
 51417  Rede Zone
+51418  North Carolina Department of Transportation (NCDOT)
+51419  Responsiv
+51420  Skene Ventures Limited
+51421  Civis Technologies, LLC
+51422  Department of Energy - Strategic Petroleum Reserve
+51423  Little Company of Mary Hospital and Health Care Centers
+51424  Vyvygen Corporation
+51425  New Directions Housing Corporation
+51426  Dark3, Inc.
+51427  China Telecommunication Technology Labs
+51428  Virkeslogistik Mellansverige AB
+51429  Crossrims Pty Ltd
+51430  liuwei1573
+51431  ELKO EP, s.r.o.
+51432  Vaultit AB
+51433  V-Partei³
+51434  S.C. DELTATEL SRL
+51435  SCLE SFE
+51436  Opendigitalradio
+51437  Razberi Technologies, Inc.
+51438  unshare
+51439  Videotec S.P.A.
+51440  smart-edge.com
+51441  InfraNet AG
+51442  Siegfrieds Mechanisches Musikkabinett GmbH & Co Museum KG
+51443  Kaloom
+51444  AllSouth Federal Credit Union
+51445  Chromatec Video Products
+51446  Saitro
+51447  Mizuno USA, Inc.
+51448  ID06 AB
+51449  Verified Systems International GmbH
+51450  Nokia
+51451  Beijing mission communication co.,Ltd
+51452  Evolution Travel Network

diff --git a/manuf b/manuf
index 0911b06f00bd73be9b42be32ef44aa218f68630a..baeba4b6e5015e19dadb5597c291ebb366c1ede0 100644 (file)
--- a/manuf
+++ b/manuf
@@ -2554,7 +2554,7 @@
 00:09:DC       GalaxisT        Galaxis Technology AG
 00:09:DD       MavinTec        Mavin Technology Inc.
 00:09:DE       SamjinIn        Samjin Information & Communications Co., Ltd.
-00:09:DF       VestelKo        Vestel Komunikasyon Sanayi ve Ticaret A.S.
+00:09:DF       VestelEl        Vestel Elektronik San ve Tic. A.Ş.
 00:09:E0       XemicsSA        Xemics S.A.
 00:09:E1       GemtekTe        Gemtek Technology Co., Ltd.
 00:09:E2       SinbonEl        Sinbon Electronics Co., Ltd.
@@ -3753,7 +3753,7 @@
 00:0E:8C       SiemensA        Siemens AG A&D ET
 00:0E:8D       InProgre        Systems in Progress Holding GmbH
 00:0E:8E       Sparklan        SparkLAN Communications, Inc.
-00:0E:8F       Sercomm Sercomm Corp.
+00:0E:8F       Sercomm Sercomm Corporation.
 00:0E:90       Ponico  Ponico Corp.
 00:0E:91       NavicoAu        Navico Auckland Ltd
 00:0E:92       OpenTele        Open Telecom
@@ -4969,7 +4969,7 @@
 00:13:4C       YdtTechn        YDT Technology International
 00:13:4D       IneproBv        Inepro BV
 00:13:4E       Valox   Valox Systems, Inc.
-00:13:4F       TranzeoW        Tranzeo Wireless Technologies Inc.
+00:13:4F       RapidusW        Rapidus Wireless Networks Inc.
 00:13:50       SilverSp        Silver Spring Networks, Inc
 00:13:51       NilesAud        Niles Audio Corporation
 00:13:52       Naztec  Naztec, Inc.
@@ -5028,7 +5028,7 @@
 00:13:87       27mTechn        27M Technologies AB
 00:13:88       WimediaA        WiMedia Alliance
 00:13:89       RedesDeT        Redes de Telefonía Móvil S.A.
-00:13:8A       QingdaoG        Qingdao Goertek Electronics Co.,Ltd.
+00:13:8A       QingdaoG        Qingdao GoerTek Technology Co., Ltd.
 00:13:8B       PhantomT        Phantom Technologies LLC
 00:13:8C       Kumyoung        Kumyoung.Co.Ltd
 00:13:8D       Kinghold
@@ -11118,7 +11118,7 @@
 00:50:C2:08:00:00/36   Aim
 00:50:C2:08:10:00/36   Matusche        Matuschek Messtechnik GmbH
 00:50:C2:08:20:00/36   GfiChron        GFI Chrono Time
-00:50:C2:08:30:00/36   ArdSa   Ard Sa
+00:50:C2:08:30:00/36   ArdSa   ard sa
 00:50:C2:08:40:00/36   Dialog4S        DIALOG4 System Engineering GmbH
 00:50:C2:08:50:00/36   Crosspor        Crossport Systems
 00:50:C2:08:60:00/36   Validyne        Validyne Engineering Corp.
@@ -13675,7 +13675,7 @@
 00:50:C2:A7:D0:00/36   VitelNet        Vitel Net
 00:50:C2:A7:E0:00/36   Independ        Independent Project Engineering Ltd
 00:50:C2:A7:F0:00/36   PhytecMe        Phytec Messtechnik GmbH
-00:50:C2:A8:00:00/36   ArdSa   Ard Sa
+00:50:C2:A8:00:00/36   ArdSa   ard sa
 00:50:C2:A8:10:00/36   BpcCircu        BPC circuits Ltd
 00:50:C2:A8:20:00/36   Ct      CT Company
 00:50:C2:A8:30:00/36   TechnoSo        Techno Sobi Co. Ltd.
@@ -16611,6 +16611,7 @@
 00:CB:00       Private
 00:CB:B4       Shenzhen        Shenzhen Ateko Photoelectricity Co.,Ltd
 00:CB:BD       Cambridg        Cambridge Broadband Networks Ltd.
+00:CC:3F       Universa        Universal Electronics, Inc.
 00:CC:FC       Cisco   Cisco Systems, Inc
 00:CD:90       MasElekt        MAS Elektronik AG
 00:CD:FE       Apple   Apple, Inc.
@@ -17687,6 +17688,7 @@
 08:BE:77       GreenEle        Green Electronics
 08:BE:AC       EdimaxTe        Edimax Technology Co. Ltd.
 08:C0:21       HuaweiTe        Huawei Technologies Co.,Ltd
+08:C5:E1       SamsungE        SAMSUNG ELECTRO-MECHANICS(THAILAND)
 08:C6:B3       QtechLlc        Qtech Llc
 08:CA:45       ToyouFei        Toyou Feiji Electronics Co., Ltd.
 08:CC:68       Cisco   Cisco Systems, Inc
@@ -17744,6 +17746,7 @@
 08:FD:0E       SamsungE        Samsung Electronics Co.,Ltd
 09:00:6A       AT&T
 0A:87:36       Ieee1901        IEEE 1901 Working Group
+0C:01:DB       InfinixM        Infinix mobility limited
 0C:02:27       Technico        Technicolor CH USA Inc.
 0C:04:00       JantarDO        Jantar d.o.o.
 0C:05:35       Juniper Juniper Systems
@@ -17886,6 +17889,7 @@
 0C:B4:59       Marketec        Marketech International Corp.
 0C:B4:EF       Digience        Digience Co.,Ltd.
 0C:B5:DE       AlcatelL        Alcatel Lucent
+0C:B6:D2       D-LinkIn        D-Link International
 0C:B9:12       Jm-Data JM-DATA GmbH
 0C:B9:37       UbeeInte        Ubee Interactive Co., Limited
 0C:BC:9F       Apple   Apple, Inc.
@@ -17923,6 +17927,7 @@
 0C:DC:CC       InalaTec        Inala Technologies
 0C:DD:EF       Nokia   Nokia Corporation
 0C:DF:A4       SamsungE        Samsung Electronics Co.,Ltd
+0C:E0:DC       SamsungE        Samsung Electronics Co.,Ltd
 0C:E0:E4       Plantron        Plantronics, Inc.
 0C:E5:D3       DhElectr        DH electronics GmbH
 0C:E7:09       FoxCrypt        Fox Crypto B.V.
@@ -18086,6 +18091,7 @@
 10:88:CE       Fiberhom        Fiberhome Telecommunication Technologies Co.,LTD
 10:8A:1B       Raonix  RAONIX Inc.
 10:8C:CF       Cisco   Cisco Systems, Inc
+10:8E:E0       SamsungE        Samsung Electronics Co.,Ltd
 10:92:66       SamsungE        Samsung Electronics Co.,Ltd
 10:93:E9       Apple   Apple, Inc.
 10:94:BB       Apple   Apple, Inc.
@@ -18654,7 +18660,7 @@
 1C:5C:F2       Apple   Apple, Inc.
 1C:5F:2B       D-LinkIn        D-Link International
 1C:5F:FF       BeijingE        Beijing Ereneben Information Technology Co.,Ltd Shenzhen Branch
-1C:60:DE       Shenzhen        Shenzhen Mercury Communication Technologies Co.,Ltd.
+1C:60:DE       MercuryC        Mercury Communication Technologies Co.,Ltd.
 1C:62:B8       SamsungE        Samsung Electronics Co.,Ltd
 1C:63:B7       Openprod        OpenProducts 237 AB
 1C:65:9D       LiteonTe        Liteon Technology Corporation
@@ -18756,7 +18762,7 @@
 1C:94:92       RuagSchw        RUAG Schweiz AG
 1C:95:5D       I-LaxEle        I-LAX ELECTRONICS INC.
 1C:95:9F       Veethree        Veethree Electronics And Marine LLC
-1C:96:5A       WeifangG        Weifang GoerTek Technology Co.,Ltd.
+1C:96:5A       WeifangG        Weifang Goertek Electronics Co.,Ltd
 1C:97:3D       PricomDe        PRICOM Design
 1C:98:EC       HewlettP        Hewlett Packard Enterprise
 1C:99:4C       MurataMa        Murata Manufacturing Co., Ltd.
@@ -18908,6 +18914,7 @@
 20:3C:AE       Apple   Apple, Inc.
 20:3D:66       ArrisGro        ARRIS Group, Inc.
 20:3D:B2       HuaweiTe        Huawei Technologies Co.,Ltd
+20:3D:BD       LgInnote        LG Innotek
 20:40:05       Feno    feno GmbH
 20:41:5A       SmartehD        Smarteh d.o.o.
 20:44:3A       Schneide        Schneider Electric Asia Pacific Ltd
@@ -19588,9 +19595,17 @@
 2C:44:1B       Spectrum        Spectrum Medical Limited
 2C:44:FD       HewlettP        Hewlett Packard
 2C:48:35       IeeeRegi        IEEE Registration Authority
+2C:48:35:10:00:00/28   Advanced        Advanced Electronics Company Ltd
+2C:48:35:30:00:00/28   NewtraxT        Newtrax Technologies Inc
+2C:48:35:40:00:00/28   Geartech        Geartech Ltd
 2C:48:35:60:00:00/28   ExertusO        Exertus Oy
+2C:48:35:80:00:00/28   DpsElect        DPS Electronics
+2C:48:35:90:00:00/28   Sureflap        SureFlap Ltd
+2C:48:35:A0:00:00/28   Collatz+        Collatz+Trojan GmbH
+2C:48:35:B0:00:00/28   Shanghai        Shanghai Visteon Automotive Electronics System CO. Ltd.
+2C:48:35:D0:00:00/28   PhasorSo        Phasor Solutions Ltd
 2C:4D:54       AsustekC        ASUSTek COMPUTER INC.
-2C:4D:79       WeifangG        Weifang GoerTek Technology Co.,Ltd.
+2C:4D:79       WeifangG        Weifang Goertek Electronics Co.,Ltd
 2C:50:89       Shenzhen        Shenzhen Kaixuan Visual Technology Co.,Limited
 2C:53:4A       Shenzhen        Shenzhen Winyao Electronic Limited
 2C:54:2D       Cisco   Cisco Systems, Inc
@@ -19846,6 +19861,7 @@
 30:85:A9       AsustekC        ASUSTek COMPUTER INC.
 30:87:30       HuaweiTe        Huawei Technologies Co.,Ltd
 30:87:D9       RuckusWi        Ruckus Wireless
+30:88:41       SichuanA        Sichuan AI-Link Technology Co., Ltd.
 30:89:76       DalianLa        Dalian Lamba Technology Co.,Ltd
 30:89:99       Guangdon        Guangdong East Power Co.,
 30:89:D3       Hongkong        Hongkong Ucloudlink Network Technology Limited
@@ -20537,6 +20553,7 @@
 3C:4E:47       Etronic Etronic A/S
 3C:52:82       HewlettP        Hewlett Packard
 3C:57:4F       ChinaMob        China Mobile Group Device Co.,Ltd.
+3C:57:6C       SamsungE        Samsung Electronics Co.,Ltd
 3C:57:BD       KesslerC        Kessler Crane Inc.
 3C:57:D5       Fiveco
 3C:59:1E       TclKingE        TCL King Electrical Appliances (Huizhou) Co., Ltd
@@ -20659,7 +20676,7 @@
 3C:EA:FB       Nse     Nse Ag
 3C:EF:8C       Zhejiang        Zhejiang Dahua Technology Co., Ltd.
 3C:F3:92       Virtualt        Virtualtek. Co. Ltd
-3C:F4:F9       Mada-Inn        Mada-InnoChips
+3C:F4:F9       Moda-Inn        Moda-InnoChips
 3C:F5:2C       Dspecial        DSPECIALISTS GmbH
 3C:F5:91       Guangdon        Guangdong Oppo Mobile Telecommunications Corp.,Ltd
 3C:F5:CC       NewH3cTe        New H3C Technologies Co., Ltd
@@ -20692,7 +20709,7 @@
 40:16:FA       EkmMeter        EKM Metering
 40:18:B1       Aerohive        Aerohive Networks Inc.
 40:18:D7       Smartron        Smartronix, Inc.
-40:1B:5F       WeifangG        Weifang GoerTek Technology Co.,Ltd.
+40:1B:5F       WeifangG        Weifang Goertek Electronics Co.,Ltd
 40:1D:59       Biometri        Biometric Associates, LP
 40:22:ED       DigitalP        Digital Projection Ltd
 40:25:C2       IntelCor        Intel Corporate
@@ -21695,7 +21712,7 @@
 48:86:E8       Microsof        Microsoft Corporation
 48:88:03       Mantechn        ManTechnology Inc.
 48:88:CA       Motorola        Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
-48:8A:D2       Shenzhen        Shenzhen Mercury Communication Technologies Co.,Ltd.
+48:8A:D2       MercuryC        Mercury Communication Technologies Co.,Ltd.
 48:8D:36       Arcadyan        Arcadyan Corporation
 48:8E:42       Digalog DIGALOG GmbH
 48:8E:EF       HuaweiTe        Huawei Technologies Co.,Ltd
@@ -22366,6 +22383,7 @@
 54:BD:79       SamsungE        Samsung Electronics Co.,Ltd
 54:BE:53       Zte     zte corporation
 54:BE:F7       Pegatron        Pegatron Corporation
+54:BF:64       Dell    Dell Inc.
 54:C4:15       Hangzhou        Hangzhou Hikvision Digital Technology Co.,Ltd.
 54:C5:7A       SunnovoI        Sunnovo International Limited
 54:C8:0F       Tp-LinkT        TP-LINK TECHNOLOGIES CO.,LTD.
@@ -22530,6 +22548,7 @@
 58:AC:78       Cisco   Cisco Systems, Inc
 58:B0:35       Apple   Apple, Inc.
 58:B0:D4       Zunidata        ZuniData Systems Inc.
+58:B1:0F       SamsungE        Samsung Electronics Co.,Ltd
 58:B3:FC       Shenzhen        SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.
 58:B4:2D       YstenTec        YSTen Technology Co.,Ltd
 58:B6:33       RuckusWi        Ruckus Wireless
@@ -22961,6 +22980,7 @@
 60:CB:FB       Airscape        AirScape Inc.
 60:CD:A9       Abloomy
 60:CD:C5       TaiwanCa        Taiwan Carol Electronics., Ltd
+60:D0:2C       RuckusWi        Ruckus Wireless
 60:D0:A9       SamsungE        Samsung Electronics Co.,Ltd
 60:D1:AA       VishalTe        Vishal Telecommunications Pvt Ltd
 60:D2:1C       SunnovoI        Sunnovo International Limited
@@ -23258,6 +23278,7 @@
 68:35:63       Shenzhen        Shenzhen Liown Electronics Co.,Ltd.
 68:36:B5       Drivesca        DriveScale, Inc.
 68:37:E9       AmazonTe        Amazon Technologies Inc.
+68:3A:1E       CiscoMer        Cisco Meraki
 68:3B:1E       Countwis        Countwise LTD
 68:3C:7D       MagicInt        Magic Intelligence Technology Limited
 68:3E:02       SiemensD        SIEMENS AG, Digital Factory, Motion Control System
@@ -23387,6 +23408,7 @@
 68:DF:DD       XiaomiCo        Xiaomi Communications Co Ltd
 68:E1:66       Private
 68:E4:1F       Unglaube        Unglaube Identech GmbH
+68:E7:C2       SamsungE        Samsung Electronics Co.,Ltd
 68:E8:EB       LinktelT        Linktel Technologies Co.,Ltd
 68:EB:AE       SamsungE        Samsung Electronics Co.,Ltd
 68:EB:C5       Angstrem        Angstrem Telecom
@@ -23410,6 +23432,7 @@
 68:FE:F7       Apple   Apple, Inc.
 6A:0E:20       Geofrenz        GeoFrenzy, Inc
 6A:1F:6C       Ipass   iPass, Inc.
+6A:40:65       OpenConn        Open Connectivity Foundation
 6A:73:7D       25gEther        25G Ethernet Consortium
 6A:E6:4A       S&OElect        S&O Electronics (Malaysia) Sdn. Bhd.
 6C:02:73       Shenzhen        Shenzhen Jin Yun Video Equipment Co., Ltd.
@@ -23469,7 +23492,7 @@
 6C:54:CD       LampexEl        Lampex Electronics Limited
 6C:56:97       AmazonTe        Amazon Technologies Inc.
 6C:57:79       Aclima  Aclima, Inc.
-6C:59:40       Shenzhen        Shenzhen Mercury Communication Technologies Co.,Ltd.
+6C:59:40       MercuryC        Mercury Communication Technologies Co.,Ltd.
 6C:59:76       Shanghai        Shanghai Tricheer Technology Co.,Ltd.
 6C:5A:34       Shenzhen        Shenzhen Haitianxiong Electronic Co., Ltd.
 6C:5A:B5       TclTechn        TCL Technoly Electronics (Huizhou) Co., Ltd.
@@ -23739,6 +23762,7 @@
 70:9E:29       SonyInte        Sony Interactive Entertainment Inc.
 70:9E:86       X6d     X6D Limited
 70:9F:2D       Zte     zte corporation
+70:9F:A9       TecnoMob        Tecno Mobile Limited
 70:A1:91       Trendset        Trendsetter Medical, LLC
 70:A2:B3       Apple   Apple, Inc.
 70:A4:1C       Advanced        Advanced Wireless Dynamics S.L.
@@ -23856,6 +23880,7 @@
 70:B3:D5:0A:90:00/36   Proconne        ProConnections, Inc.
 70:B3:D5:0A:A0:00/36   Wanco   Wanco Inc
 70:B3:D5:0A:B0:00/36   KstTechn        KST technology
+70:B3:D5:0A:C0:00/36   Robocore        RoboCore Tecnologia
 70:B3:D5:0A:E0:00/36   NorsatIn        Norsat International Inc.
 70:B3:D5:0A:F0:00/36   Kmtronic        KMtronic ltd
 70:B3:D5:0B:00:00/36   RavenDes        Raven Systems Design, Inc
@@ -24033,6 +24058,7 @@
 70:B3:D5:1C:D0:00/36   Eleusi  ELEUSI GmbH
 70:B3:D5:1D:00:00/36   Shenzhen        Shenzhen INVT Electric Co.,Ltd
 70:B3:D5:1D:10:00/36   EurotekS        Eurotek Srl
+70:B3:D5:1D:30:00/36   AirobotO        AIROBOT OÜ
 70:B3:D5:1D:40:00/36   Brinkman        Brinkmann Audio GmbH
 70:B3:D5:1D:70:00/36   Private
 70:B3:D5:1D:A0:00/36   Promess Promess Inc.
@@ -24071,6 +24097,7 @@
 70:B3:D5:21:60:00/36   Flextron        Flextronics
 70:B3:D5:21:70:00/36   TecnintH        Tecnint HTE SRL
 70:B3:D5:21:B0:00/36   Lab241  Lab241 Co.,Ltd.
+70:B3:D5:21:C0:00/36   EnyxSa  Enyx SA
 70:B3:D5:21:D0:00/36   Irf-Inte        iRF - Intelligent RF Solutions, LLC
 70:B3:D5:21:E0:00/36   Hildebra        Hildebrand Technology Limited
 70:B3:D5:22:00:00/36   Private
@@ -24321,6 +24348,7 @@
 70:B3:D5:3C:30:00/36   Aimco
 70:B3:D5:3C:50:00/36   P4qElect        P4Q ELECTRONICS, S.L.
 70:B3:D5:3C:60:00/36   AcdElekr        ACD Elekronik GmbH
+70:B3:D5:3C:90:00/36   Duerkopp        Duerkopp-Adler
 70:B3:D5:3C:A0:00/36   Tti     TTI Ltd
 70:B3:D5:3C:C0:00/36   Teropta TerOpta Ltd
 70:B3:D5:3C:E0:00/36   Aditec  Aditec GmbH
@@ -24849,6 +24877,7 @@
 70:B3:D5:77:90:00/36   DrBridge        Dr.Bridge Aquatech
 70:B3:D5:77:B0:00/36   Aerovisi        AeroVision Avionics, Inc.
 70:B3:D5:77:C0:00/36   HustyMSt        HUSTY M.Styczen J.Hupert Sp.J.
+70:B3:D5:77:E0:00/36   BlueMarb        Blue Marble Communications, Inc.
 70:B3:D5:78:10:00/36   ProjectS        Project Service S.a.s.
 70:B3:D5:78:20:00/36   Thou&Tec        thou&tech
 70:B3:D5:78:40:00/36   Shenzhen        Shenzhen bayue software co. LTD
@@ -25144,6 +25173,7 @@
 70:B3:D5:97:C0:00/36   Nu-TekPo        Nu-Tek Power Controls and Automation
 70:B3:D5:97:F0:00/36   Bistos  BISTOS.,Co.,Ltd
 70:B3:D5:98:10:00/36   ZamirRec        Zamir Recognition Systems Ltd.
+70:B3:D5:98:40:00/36   SanminaI        Sanmina Israel
 70:B3:D5:98:60:00/36   AplexTec        Aplex Technology Inc.
 70:B3:D5:98:70:00/36   Axis    Axis Corporation
 70:B3:D5:98:90:00/36   Dcns
@@ -25251,6 +25281,7 @@
 70:B3:D5:A3:30:00/36   Tiama
 70:B3:D5:A3:50:00/36   SiconSrl        Sicon srl
 70:B3:D5:A3:60:00/36   BeijingD        Beijing DamingWuzhou Science&Technology Co., Ltd.
+70:B3:D5:A3:70:00/36   Mitsubis        Mitsubishi Heavy Industries Thermal Systems, Ltd.
 70:B3:D5:A3:A0:00/36   Epsoft  EPSOFT Co., Ltd
 70:B3:D5:A3:B0:00/36   GraceDes        Grace Design/Lunatec LLC
 70:B3:D5:A3:C0:00/36   WaveMusi        Wave Music Ltd
@@ -25891,6 +25922,7 @@
 70:B3:D5:EB:70:00/36   Skreens
 70:B3:D5:EB:90:00/36   ThielAud        Thiel Audio Products Company, LLC
 70:B3:D5:EB:B0:00/36   BeijingW        Beijing Wing ICT Technology Co., Ltd.
+70:B3:D5:EB:C0:00/36   RefineTe        Refine Technology, LLC
 70:B3:D5:EB:D0:00/36   MidbitTe        midBit Technologies, LLC
 70:B3:D5:EB:E0:00/36   SierraPa        Sierra Pacific Innovations Corp
 70:B3:D5:EC:10:00/36   XafaxNed        Xafax Nederland bv
@@ -26236,6 +26268,7 @@
 74:6A:89       Rezolt  Rezolt Corporation
 74:6A:8F       VsVision        VS Vision Systems GmbH
 74:6B:82       Movek
+74:6B:AB       Guangdon        Guangdong Enok Communication Co., Ltd
 74:6E:E4       AsiaVita        Asia Vital Components Co.,Ltd.
 74:6F:19       Icarvisi        ICARVISIONS (SHENZHEN) TECHNOLOGY CO., LTD.
 74:6F:3D       Contec  Contec GmbH
@@ -26363,6 +26396,7 @@
 74:EA:C8       NewH3cTe        New H3C Technologies Co., Ltd
 74:EA:CB       NewH3cTe        New H3C Technologies Co., Ltd
 74:EA:E8       ArrisGro        ARRIS Group, Inc.
+74:EB:80       SamsungE        Samsung Electronics Co.,Ltd
 74:EC:42       Fiberhom        Fiberhome Telecommunication Technologies Co.,LTD
 74:EC:F1       Acumen
 74:F0:6D       Azurewav        AzureWave Technology Inc.
@@ -26425,6 +26459,7 @@
 78:25:7A       LeoInnov        LEO Innovation Lab
 78:25:AD       SamsungE        Samsung Electronics Co.,Ltd
 78:28:CA       Sonos   Sonos, Inc.
+78:29:ED       AskeyCom        Askey Computer Corp
 78:2B:CB       Dell    Dell Inc.
 78:2D:7E       Trendnet        TRENDnet, Inc.
 78:2E:EF       Nokia   Nokia Corporation
@@ -26598,6 +26633,7 @@
 78:CD:8E       SmcNetwo        SMC Networks Inc
 78:D0:04       NeousysT        Neousys Technology Inc.
 78:D1:29       Vicos
+78:D2:94       Netgear
 78:D3:4F       Pace-O-M        Pace-O-Matic, Inc.
 78:D3:8D       Hongkong        Hongkong Yunlink Technology Limited
 78:D5:B5       Navielek        Navielektro Ky
@@ -26996,6 +27032,7 @@
 80:4F:58       Thinkeco        ThinkEco, Inc.
 80:50:1B       Nokia   Nokia Corporation
 80:50:67       WDTechno        W & D TECHNOLOGY CORPORATION
+80:50:F6       ItelMobi        Itel Mobile Limited
 80:56:F2       HonHaiPr        Hon Hai Precision Ind. Co.,Ltd.
 80:57:19       SamsungE        Samsung Electronics Co.,Ltd
 80:58:C5       NovatecK        NovaTec Kommunikationstechnik GmbH
@@ -27075,7 +27112,7 @@
 80:B2:19       Elektron        Elektron Technology Uk Limited
 80:B2:34       Technico        Technicolor CH USA Inc.
 80:B2:89       Forworld        Forworld Electronics Ltd.
-80:B3:2A       AlstomGr        Alstom Grid
+80:B3:2A       UkGridSo        UK Grid Solutions Ltd
 80:B6:86       HuaweiTe        Huawei Technologies Co.,Ltd
 80:B7:08       BlueDanu        Blue Danube Systems, Inc
 80:B7:09       Viptela Viptela, Inc
@@ -27152,7 +27189,7 @@
 84:11:9E       SamsungE        Samsung Electronics Co.,Ltd
 84:16:F9       Tp-LinkT        TP-LINK TECHNOLOGIES CO.,LTD.
 84:17:15       GpElectr        GP Electronics (HK) Ltd.
-84:17:66       WeifangG        Weifang GoerTek Technology Co.,Ltd.
+84:17:66       WeifangG        Weifang Goertek Electronics Co.,Ltd
 84:18:26       Osram   Osram GmbH
 84:18:3A       RuckusWi        Ruckus Wireless
 84:18:88       JuniperN        Juniper Networks
@@ -27810,7 +27847,7 @@
 8C:EB:C6       HuaweiTe        Huawei Technologies Co.,Ltd
 8C:EC:4B       Dell    Dell Inc.
 8C:EE:C6       Precepsc        Precepscion Pty. Ltd.
-8C:F2:28       Shenzhen        Shenzhen Mercury Communication Technologies Co.,Ltd.
+8C:F2:28       MercuryC        Mercury Communication Technologies Co.,Ltd.
 8C:F5:A3       SamsungE        SAMSUNG ELECTRO-MECHANICS(THAILAND)
 8C:F7:10       AmpakTec        AMPAK Technology, Inc.
 8C:F7:73       Nokia
@@ -28094,7 +28131,7 @@
 94:46:96       Baudtec BaudTec Corporation
 94:49:96       Wisilica        WiSilica Inc
 94:4A:09       BitwiseC        BitWise Controls
-94:4A:0C       Sercomm Sercomm Corporation
+94:4A:0C       Sercomm Sercomm Corporation.
 94:50:47       Rechnerb        Rechnerbetriebsgruppe
 94:50:89       Simonsvo        SimonsVoss Technologies GmbH
 94:51:03       SamsungE        Samsung Electronics Co.,Ltd
@@ -28368,6 +28405,7 @@
 98:97:D1       Mitrasta        MitraStar Technology Corp.
 98:9C:57       HuaweiTe        Huawei Technologies Co.,Ltd
 98:9E:63       Apple   Apple, Inc.
+98:A4:04       Ericsson        Ericsson AB
 98:A4:0E       Snap    Snap, Inc.
 98:A7:B0       McstZao Mcst Zao
 98:AA:3C       WillI-Te        Will i-tech Co., Ltd.
@@ -28938,7 +28976,7 @@ A4:11:63:E0:00:00/28    Tinylogi        tinylogics
 A4:12:42       NecPlatf        NEC Platforms, Ltd.
 A4:13:4E       Luxul
 A4:14:37       Hangzhou        Hangzhou Hikvision Digital Technology Co.,Ltd.
-A4:15:66       WeifangG        Weifang GoerTek Technology Co.,Ltd.
+A4:15:66       WeifangG        Weifang Goertek Electronics Co.,Ltd
 A4:15:88       ArrisGro        ARRIS Group, Inc.
 A4:17:31       HonHaiPr        Hon Hai Precision Ind. Co.,Ltd.
 A4:18:75       Cisco   Cisco Systems, Inc
@@ -29015,7 +29053,7 @@ A4:4F:29:F0:00:00/28    Private
 A4:50:55       BuswareD        Busware.De
 A4:51:6F       Microsof        Microsoft Mobile Oy
 A4:52:6F       AdbBroad        ADB Broadband Italia
-A4:53:85       WeifangG        Weifang GoerTek Technology Co.,Ltd.
+A4:53:85       WeifangG        Weifang Goertek Electronics Co.,Ltd
 A4:56:02       Fenglian        fenglian Technology Co.,Ltd.
 A4:56:1B       Mcot    MCOT Corporation
 A4:56:30       Cisco   Cisco Systems, Inc
@@ -29204,8 +29242,9 @@ A8:25:EB        Cambridg        Cambridge Industries(Group) Co.,Ltd.
 A8:26:D9       Htc     HTC Corporation
 A8:29:4C       Precisio        Precision Optical Transceivers, Inc.
 A8:2B:B5       Edgecore        Edgecore Networks Corporation
+A8:2B:B9       SamsungE        Samsung Electronics Co.,Ltd
 A8:2B:D6       ShinaSys        Shina System Co., Ltd
-A8:30:AD       WeifangG        Weifang GoerTek Technology Co.,Ltd.
+A8:30:AD       WeifangG        Weifang Goertek Electronics Co.,Ltd
 A8:32:9A       DigicomF        Digicom Futuristic Technologies Ltd.
 A8:36:7A       Frogblue        frogblue TECHNOLOGY GmbH
 A8:39:44       Actionte        Actiontec Electronics, Inc
@@ -29309,6 +29348,7 @@ A8:D2:36        Lightwar        Lightware Visual Engineering
 A8:D3:C8       TopconEl        Topcon Electronics GmbH & Co. KG
 A8:D3:F7       Arcadyan        Arcadyan Technology Corporation
 A8:D4:09       Usa111  USA 111 Inc
+A8:D4:98       AviraOpe        Avira Operations GmbH & Co. KG
 A8:D5:79       BeijingC        Beijing Chushang Science and Technology Co.,Ltd
 A8:D8:28       Ascensia        Ascensia Diabetes Care
 A8:D8:8A       Wyconn
@@ -29316,6 +29356,7 @@ A8:DA:01        Shenzhen        Shenzhen NUOLIJIA Digital Technology Co.,Ltd
 A8:E0:18       Nokia   Nokia Corporation
 A8:E3:EE       SonyInte        Sony Interactive Entertainment Inc.
 A8:E5:39       Moimston        Moimstone Co.,Ltd
+A8:E5:52       JuwelAqu        JUWEL Aquarium AG & Co. KG
 A8:E7:05       Fiberhom        Fiberhome Telecommunication Technologies Co.,LTD
 A8:E8:24       InimElec        Inim Electronics S.R.L.
 A8:EE:C6       Muuselab        Muuselabs NV/SA
@@ -29559,7 +29600,7 @@ AC:F7:F3        XiaomiCo        Xiaomi Communications Co Ltd
 AC:F8:5C       Private
 AC:F9:70       HuaweiTe        Huawei Technologies Co.,Ltd
 AC:F9:7E       Elesys  Elesys Inc.
-AC:FD:93       WeifangG        Weifang GoerTek Technology Co.,Ltd.
+AC:FD:93       WeifangG        Weifang Goertek Electronics Co.,Ltd
 AC:FD:CE       IntelCor        Intel Corporate
 AC:FD:EC       Apple   Apple, Inc.
 B0:00:B4       Cisco   Cisco Systems, Inc
@@ -29625,6 +29666,7 @@ B0:4E:26        Tp-LinkT        TP-LINK TECHNOLOGIES CO.,LTD.
 B0:50:BC       Shenzhen        Shenzhen Basicom Electronic Co.,Ltd.
 B0:51:8E       HollTech        Holl technology CO.Ltd.
 B0:52:16       HonHaiPr        Hon Hai Precision Ind. Co.,Ltd.
+B0:53:65       ChinaMob        China Mobile IOT Company Limited
 B0:55:08       HuaweiTe        Huawei Technologies Co.,Ltd
 B0:57:06       ValloxOy        Vallox Oy
 B0:58:C4       Broadcas        Broadcast Microwave Services, Inc
@@ -30083,6 +30125,7 @@ B8:B2:EB        GoogolTe        Googol Technology (HK) Limited
 B8:B3:DC       DerekSha        DEREK (SHAOGUAN) LIMITED
 B8:B4:2E       GioneeCo        Gionee Communication Equipment Co,Ltd.ShenZhen
 B8:B7:D7       2gigTech        2GIG Technologies
+B8:B7:F1       WistronN        Wistron Neweb Corporation
 B8:B8:1E       IntelCor        Intel Corporate
 B8:B9:4E       Shenzhen        Shenzhen iBaby Labs, Inc.
 B8:BA:68       XiAnJizh        Xi'an Jizhong Digital Communication Co.,Ltd
@@ -30250,7 +30293,7 @@ BC:54:F9        DrogooTe        Drogoo Technology Co., Ltd.
 BC:54:FC       Shenzhen        Shenzhen Mercury Communication Technologies Co.,Ltd.
 BC:5C:4C       Elecom  Elecom Co.,Ltd.
 BC:5F:F4       AsrockIn        ASRock Incorporation
-BC:5F:F6       Shenzhen        Shenzhen Mercury Communication Technologies Co.,Ltd.
+BC:5F:F6       MercuryC        Mercury Communication Technologies Co.,Ltd.
 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
@@ -30685,6 +30728,7 @@ C4:92:4C        Keisokuk        Keisokuki Center Co.,Ltd.
 C4:93:00       8devices
 C4:93:13       100fioNe        100fio networks technology llc
 C4:93:80       Speedyte        Speedytel technology
+C4:93:D9       SamsungE        Samsung Electronics Co.,Ltd
 C4:95:A2       Shenzhen        Shenzhen Weijiu Industry And Trade Development Co., Ltd
 C4:98:05       MinieumN        Minieum Networks, Inc
 C4:98:80       Apple   Apple, Inc.
@@ -30838,7 +30882,7 @@ 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:65       Tiesse  Tiesse SpA
-C8:77:8B       ThemisCo        Themis Computer
+C8:77:8B       Mercury–      Mercury Systems – Trusted Mission Solutions, Inc.
 C8:7B:5B       Zte     zte corporation
 C8:7C:BC       Valink  Valink Co., Ltd.
 C8:7D:77       Shenzhen        Shenzhen Kingtech Communication Equipment Co.,Ltd
@@ -30938,7 +30982,7 @@ C8:E1:30        Milkyway        Milkyway Group Ltd
 C8:E1:A7       Vertu   Vertu Corporation Limited
 C8:E4:2F       Technica        Technical Research Design and Development
 C8:E7:76       PtcomTec        PTCOM Technology
-C8:E7:D8       Shenzhen        Shenzhen Mercury Communication Technologies Co.,Ltd.
+C8:E7:D8       MercuryC        Mercury Communication Technologies Co.,Ltd.
 C8:E7:F0       JuniperN        Juniper Networks
 C8:EE:08       TangtopT        Tangtop Technology Co.,Ltd
 C8:EE:75       PishionI        Pishion International Co. Ltd
@@ -31240,7 +31284,7 @@ D0:22:12:E0:00:00/28    U::Lux  u::Lux GmbH
 D0:22:12:F0:00:00/28   Private
 D0:22:BE       SamsungE        SAMSUNG ELECTRO-MECHANICS(THAILAND)
 D0:23:DB       Apple   Apple, Inc.
-D0:25:16       Shenzhen        Shenzhen Mercury Communication Technologies Co.,Ltd.
+D0:25:16       MercuryC        Mercury Communication Technologies Co.,Ltd.
 D0:25:44       SamsungE        SAMSUNG ELECTRO-MECHANICS(THAILAND)
 D0:25:98       Apple   Apple, Inc.
 D0:27:88       HonHaiPr        Hon Hai Precision Ind. Co.,Ltd.
@@ -31275,6 +31319,7 @@ D0:57:85        Pantech Pantech Co., Ltd.
 D0:57:A1       WermaSig        Werma Signaltechnik GmbH & Co. KG
 D0:58:75       ActiveCo        Active Control Technology Inc.
 D0:58:A8       Zte     zte corporation
+D0:58:FC       Bskyb   BSkyB Ltd
 D0:59:95       Fiberhom        Fiberhome Telecommunication Technologies Co.,LTD
 D0:59:C3       Ceramicr        CeraMicro Technology Corporation
 D0:59:E4       SamsungE        Samsung Electronics Co.,Ltd
@@ -31453,7 +31498,7 @@ D4:1D:71        PaloAlto        Palo Alto Networks
 D4:1E:35       TohoElec        TOHO Electronics INC.
 D4:1F:0C       JaiOy   JAI Oy
 D4:20:6D       Htc     HTC Corporation
-D4:21:22       Sercomm Sercomm Corporation
+D4:21:22       Sercomm Sercomm Corporation.
 D4:22:3F       LenovoMo        Lenovo Mobile Communication Technology Ltd.
 D4:22:4E       AlcatelL        Alcatel Lucent
 D4:25:8B       IntelCor        Intel Corporate
@@ -31706,6 +31751,7 @@ D8:65:95        ToySMyth        Toy's Myth Inc.
 D8:66:C6       Shenzhen        Shenzhen Daystar Technology Co.,ltd
 D8:66:EE       BoxinCom        Boxin Communication Co.,Ltd.
 D8:67:D9       Cisco   Cisco Systems, Inc
+D8:68:C3       SamsungE        Samsung Electronics Co.,Ltd
 D8:69:60       Steinsvi        Steinsvik
 D8:6B:F7       Nintendo        Nintendo Co., Ltd.
 D8:6C:02       HuaqinTe        Huaqin Telecom Technology Co.,Ltd
@@ -32093,7 +32139,7 @@ E0:5B:70        Innovid Innovid, Co., Ltd.
 E0:5D:A6       DetlefFi        Detlef Fink Elektronik & Softwareentwicklung
 E0:5F:45       Apple   Apple, Inc.
 E0:5F:B9       Cisco   Cisco Systems, Inc
-E0:60:66       Sercomm Sercomm Corporation
+E0:60:66       Sercomm Sercomm Corporation.
 E0:60:89       Cloudlea        Cloudleaf, Inc.
 E0:61:B2       Hangzhou        Hangzhou Zenointel Technology Co., Ltd
 E0:62:90       JinanJov        Jinan Jovision Science & Technology Co., Ltd.
@@ -32884,6 +32930,7 @@ F0:43:35        DvnShang        DVN(Shanghai)Ltd.
 F0:43:47       HuaweiTe        Huawei Technologies Co.,Ltd
 F0:45:DA       TexasIns        Texas Instruments
 F0:4A:2B       PyramidC        PYRAMID Computer GmbH
+F0:4B:3A       JuniperN        Juniper Networks
 F0:4B:6A       Scientif        Scientific Production Association Siberian Arsenal, Ltd.
 F0:4B:F2       JtechCom        JTECH Communications, Inc.
 F0:4C:D5       Maxlinea        Maxlinear, Inc
@@ -33223,7 +33270,7 @@ F4:EA:B5        Aerohive        Aerohive Networks Inc.
 F4:EB:38       Sagemcom        Sagemcom Broadband SAS
 F4:EC:38       Tp-LinkT        TP-LINK TECHNOLOGIES CO.,LTD.
 F4:ED:5F       Shenzhen        Shenzhen Ktc Technology Group
-F4:EE:14       Shenzhen        Shenzhen Mercury Communication Technologies Co.,Ltd.
+F4:EE:14       MercuryC        Mercury Communication Technologies Co.,Ltd.
 F4:EF:9E       SgsgScie        SGSG SCIENCE & TECHNOLOGY CO. LTD
 F4:F1:5A       Apple   Apple, Inc.
 F4:F1:E1       Motorola        Motorola Mobility LLC, a Lenovo Company
@@ -33627,6 +33674,7 @@ FC:A1:3E        SamsungE        Samsung Electronics Co.,Ltd
 FC:A1:83       AmazonTe        Amazon Technologies Inc.
 FC:A2:2A       PtCallys        PT. Callysta Multi Engineering
 FC:A3:86       Shenzhen        SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD
+FC:A6:21       SamsungE        Samsung Electronics Co.,Ltd
 FC:A6:67       AmazonTe        Amazon Technologies Inc.
 FC:A6:CD       Fiberhom        Fiberhome Telecommunication Technologies Co.,LTD
 FC:A8:41       Avaya   Avaya Inc

diff --git a/services b/services
index 875ae7d4d5ce7aadefe4bb004e7c80f21dfef7aa..f6ce9904855f10b97c13124b5cd00d3c03949521 100644 (file)
--- a/services
+++ b/services
@@ -4942,6 +4942,8 @@ iposplanet        7031/tcp        # IPOSPLANET retailing multi devices protocol
 quest-disc     7040/udp        # Quest application level network service discovery
 arcp           7070/tcp/udp    # ARCP
 iwg1           7071/tcp/udp    # IWGADTS Aircraft Housekeeping Message
+iba-cfg                7072/tcp        # iba Device Configuration Protocol
+iba-cfg-disc   7072/udp        # iba Device Configuration Protocol
 martalk                7073/tcp        # MarTalk protocol
 empowerid      7080/tcp/udp    # EmpowerID Communication
 zixi-transport 7088/udp        # Zixi live video transport protocol
@@ -6126,6 +6128,7 @@ nimhub            48002/tcp/udp   # Nimbus Hub
 nimgtw         48003/tcp/udp   # Nimbus Gateway
 nimbusdb       48004/tcp       # NimbusDB Connector
 nimbusdbctrl   48005/tcp       # NimbusDB Control
+juliar         48048/tcp       # Juliar Programming Language Protocol
 3gpp-cbsp      48049/tcp       # 3GPP Cell Broadcast Service Protocol
 weandsf                48050/tcp       # WeFi Access Network Discovery and Selection Function
 isnetserv      48128/tcp/udp   # Image Systems Network Services

diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 0edca9abf07275a8eddd38fd8d2a2b9906a671ec..836d396a22fd41eaab274498a0da9b5ab8ed9484 100644 (file)
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -841,23 +841,23 @@
     </message>
     <message numerus="yes">
         <source>%1, error after %Ln record(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, Fehler nach %Ln Paket</numerusform>
+            <numerusform>%1, Fehler nach %Ln Paketen</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%1, timed out at %Ln data record(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, Zeitüberschreitung nach %Ln Dateneintrag</numerusform>
+            <numerusform>%1, Zeitüberschreitung nach %Ln Dateneinträgen</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%1, %Ln data record(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, %Ln Dateneintrag</numerusform>
+            <numerusform>%1, %Ln Dateneinträge</numerusform>
         </translation>
     </message>
     <message>
@@ -1453,6 +1453,13 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
         <translation>Externe Mitschnittschnittstellen deaktivieren</translation>
     </message>
 </context>
+<context>
+    <name>ColoringRulesDelegate</name>
+    <message>
+        <source>the &quot;@&quot; symbol will be ignored.</source>
+        <translation type="unfinished">das &quot;@&quot; Symbol wird ignoriert.</translation>
+    </message>
+</context>
 <context>
     <name>ColoringRulesDialog</name>
     <message>
@@ -1461,11 +1468,11 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Name</translation>
+        <translation type="vanished">Name</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation>Filter</translation>
+        <translation type="vanished">Filter</translation>
     </message>
     <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
@@ -1509,7 +1516,7 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
     </message>
     <message>
         <source>Coloring Rules</source>
-        <translation>Einfärbungsregeln</translation>
+        <translation type="vanished">Einfärbungsregeln</translation>
     </message>
     <message>
         <source>Import</source>
@@ -1529,7 +1536,11 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
     </message>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation>das &quot;@&quot; Symbol wird ignoriert.</translation>
+        <translation type="vanished">das &quot;@&quot; Symbol wird ignoriert.</translation>
+    </message>
+    <message>
+        <source>Coloring Rules %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
@@ -1553,7 +1564,22 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
     </message>
     <message>
         <source>Unable to save coloring rules: %s</source>
-        <translation>Einfärbungsregeln können nicht gespeichert werden: %s</translation>
+        <translation type="vanished">Einfärbungsregeln können nicht gespeichert werden: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ColoringRulesModel</name>
+    <message>
+        <source>Unable to save coloring rules: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished">Filter</translation>
     </message>
 </context>
 <context>
@@ -6620,11 +6646,11 @@ text-decoration: underline;
     </message>
     <message>
         <source>Referers</source>
-        <translation type="unfinished"></translation>
+        <translation>Referers</translation>
     </message>
     <message>
         <source>HTTP referers</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTP Referers</translation>
     </message>
     <message>
         <source>Packet Lengths</source>

diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 80fa726e565e1ec62310cd411e2342e9e4022f49..1834549ef3c7482b2034025c44d60ebb885aac09 100644 (file)
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1451,17 +1451,16 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
 </context>
 <context>
-    <name>ColoringRulesDialog</name>
+    <name>ColoringRulesDelegate</name>
     <message>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
+        <source>the &quot;@&quot; symbol will be ignored.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ColoringRulesDialog</name>
     <message>
-        <source>Filter</source>
+        <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1504,10 +1503,6 @@ PLEASE NOTE: One option MUST be selected.</source>
         <source>Apply as filter</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Coloring Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Import</source>
         <translation type="unfinished"></translation>
@@ -1525,7 +1520,7 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>the &quot;@&quot; symbol will be ignored.</source>
+        <source>Coloring Rules %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1548,8 +1543,19 @@ PLEASE NOTE: One option MUST be selected.</source>
         <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ColoringRulesModel</name>
     <message>
-        <source>Unable to save coloring rules: %s</source>
+        <source>Unable to save coloring rules: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 9be1b3a8c8fd7fe729985f0e4f53b366a2fd4236..cf0ecfe385243fd07331b775698aa5355de949df 100644 (file)
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1430,6 +1430,13 @@ NOTE: Une option DOIT être sélectionnée.</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ColoringRulesDelegate</name>
+    <message>
+        <source>the &quot;@&quot; symbol will be ignored.</source>
+        <translation type="unfinished">le caractère &quot;@&quot; sera ignoré.</translation>
+    </message>
+</context>
 <context>
     <name>ColoringRulesDialog</name>
     <message>
@@ -1438,11 +1445,11 @@ NOTE: Une option DOIT être sélectionnée.</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nom</translation>
+        <translation type="vanished">Nom</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation>Filtre</translation>
+        <translation type="vanished">Filtre</translation>
     </message>
     <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
@@ -1486,7 +1493,7 @@ NOTE: Une option DOIT être sélectionnée.</translation>
     </message>
     <message>
         <source>Coloring Rules</source>
-        <translation>Règles de coloration</translation>
+        <translation type="vanished">Règles de coloration</translation>
     </message>
     <message>
         <source>Import</source>
@@ -1506,7 +1513,11 @@ NOTE: Une option DOIT être sélectionnée.</translation>
     </message>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation>le caractère &quot;@&quot; sera ignoré.</translation>
+        <translation type="vanished">le caractère &quot;@&quot; sera ignoré.</translation>
+    </message>
+    <message>
+        <source>Coloring Rules %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
@@ -1528,10 +1539,21 @@ NOTE: Une option DOIT être sélectionnée.</translation>
         <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ColoringRulesModel</name>
     <message>
-        <source>Unable to save coloring rules: %s</source>
+        <source>Unable to save coloring rules: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished">Filtre</translation>
+    </message>
 </context>
 <context>
     <name>ColumnEditorFrame</name>

diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index df9931e5f513e62b7121320a1822523290026d38..c5f8e745e4cb9ea078e1404db10e29df9b1f2181 100644 (file)
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -841,23 +841,23 @@
     </message>
     <message numerus="yes">
         <source>%1, error after %Ln record(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, errore dopo %Ln record</numerusform>
+            <numerusform>%1, errore dopo %Ln record</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%1, timed out at %Ln data record(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, tempo scaduto a %Ln record di dati</numerusform>
+            <numerusform>%1, tempo scaduto a %Ln record di dati</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%1, %Ln data record(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1, %Ln record di dati</numerusform>
+            <numerusform>%1, %Ln record di dati</numerusform>
         </translation>
     </message>
     <message>
@@ -1453,6 +1453,13 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
         <translation>Disabilita le interfacce di cattura esterne</translation>
     </message>
 </context>
+<context>
+    <name>ColoringRulesDelegate</name>
+    <message>
+        <source>the &quot;@&quot; symbol will be ignored.</source>
+        <translation type="unfinished">il simbolo &quot;@&quot; sarà ignorato.</translation>
+    </message>
+</context>
 <context>
     <name>ColoringRulesDialog</name>
     <message>
@@ -1461,11 +1468,11 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nome</translation>
+        <translation type="vanished">Nome</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation>Filtro</translation>
+        <translation type="vanished">Filtro</translation>
     </message>
     <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
@@ -1509,7 +1516,7 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
     </message>
     <message>
         <source>Coloring Rules</source>
-        <translation>Regole di colorazione</translation>
+        <translation type="vanished">Regole di colorazione</translation>
     </message>
     <message>
         <source>Import</source>
@@ -1529,7 +1536,11 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
     </message>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation>il simbolo &quot;@&quot; sarà ignorato.</translation>
+        <translation type="vanished">il simbolo &quot;@&quot; sarà ignorato.</translation>
+    </message>
+    <message>
+        <source>Coloring Rules %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
@@ -1553,7 +1564,22 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
     </message>
     <message>
         <source>Unable to save coloring rules: %s</source>
-        <translation>Impossibile salvare le regole di colorazione: %s</translation>
+        <translation type="vanished">Impossibile salvare le regole di colorazione: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ColoringRulesModel</name>
+    <message>
+        <source>Unable to save coloring rules: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished">Filtro</translation>
     </message>
 </context>
 <context>
@@ -6620,11 +6646,11 @@ a:hover {
     </message>
     <message>
         <source>Referers</source>
-        <translation type="unfinished"></translation>
+        <translation>Referer</translation>
     </message>
     <message>
         <source>HTTP referers</source>
-        <translation type="unfinished"></translation>
+        <translation>Referer HTTP</translation>
     </message>
     <message>
         <source>Packet Lengths</source>

diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index e2a3d283bbfe080863ad95341962d86cf34a7163..256d0918894629c6eee71fdbdc9d1c9a7f315f06 100644 (file)
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1425,6 +1425,13 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ColoringRulesDelegate</name>
+    <message>
+        <source>the &quot;@&quot; symbol will be ignored.</source>
+        <translation type="unfinished">この &quot;@&quot; シンボルは無視されます</translation>
+    </message>
+</context>
 <context>
     <name>ColoringRulesDialog</name>
     <message>
@@ -1433,11 +1440,11 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <source>Name</source>
-        <translation>名前</translation>
+        <translation type="vanished">名前</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation>フィルタ</translation>
+        <translation type="vanished">フィルタ</translation>
     </message>
     <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
@@ -1481,7 +1488,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <source>Coloring Rules</source>
-        <translation>色付けルール</translation>
+        <translation type="vanished">色付けルール</translation>
     </message>
     <message>
         <source>Import</source>
@@ -1501,7 +1508,11 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation>この &quot;@&quot; シンボルは無視されます</translation>
+        <translation type="vanished">この &quot;@&quot; シンボルは無視されます</translation>
+    </message>
+    <message>
+        <source>Coloring Rules %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
@@ -1525,7 +1536,22 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <source>Unable to save coloring rules: %s</source>
-        <translation>色付けルール %s を保存できません</translation>
+        <translation type="vanished">色付けルール %s を保存できません</translation>
+    </message>
+</context>
+<context>
+    <name>ColoringRulesModel</name>
+    <message>
+        <source>Unable to save coloring rules: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">名前</translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished">フィルタ</translation>
     </message>
 </context>
 <context>

diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index b5bc1568b528b461c2935e50b2eca20404646b65..6825a52f72a5c0f78538195242178b4753ab83ab 100644 (file)
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1431,6 +1431,13 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ColoringRulesDelegate</name>
+    <message>
+        <source>the &quot;@&quot; symbol will be ignored.</source>
+        <translation type="unfinished">Symbol &quot;@&quot; będzie zignorowany.</translation>
+    </message>
+</context>
 <context>
     <name>ColoringRulesDialog</name>
     <message>
@@ -1439,11 +1446,11 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nazwa</translation>
+        <translation type="vanished">Nazwa</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation>Filtr</translation>
+        <translation type="vanished">Filtr</translation>
     </message>
     <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
@@ -1487,7 +1494,7 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
     </message>
     <message>
         <source>Coloring Rules</source>
-        <translation>Reguły kolorowania</translation>
+        <translation type="vanished">Reguły kolorowania</translation>
     </message>
     <message>
         <source>Import</source>
@@ -1507,7 +1514,11 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
     </message>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation>Symbol &quot;@&quot; będzie zignorowany.</translation>
+        <translation type="vanished">Symbol &quot;@&quot; będzie zignorowany.</translation>
+    </message>
+    <message>
+        <source>Coloring Rules %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
@@ -1531,7 +1542,22 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
     </message>
     <message>
         <source>Unable to save coloring rules: %s</source>
-        <translation>Nie można zapisać reguł kolorowania: %s</translation>
+        <translation type="vanished">Nie można zapisać reguł kolorowania: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ColoringRulesModel</name>
+    <message>
+        <source>Unable to save coloring rules: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Nazwa</translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished">Filtr</translation>
     </message>
 </context>
 <context>

diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index e00dcbb16009f9b60cbe3b2b58f65436b16bd505..3e4e0d5536c4415676553c498348e91b83d028e9 100644 (file)
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1446,6 +1446,13 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ColoringRulesDelegate</name>
+    <message>
+        <source>the &quot;@&quot; symbol will be ignored.</source>
+        <translation type="unfinished">忽略&quot;@&quot;符号。</translation>
+    </message>
+</context>
 <context>
     <name>ColoringRulesDialog</name>
     <message>
@@ -1454,11 +1461,11 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <source>Name</source>
-        <translation>名称</translation>
+        <translation type="vanished">名称</translation>
     </message>
     <message>
         <source>Filter</source>
-        <translation>过滤器</translation>
+        <translation type="vanished">过滤器</translation>
     </message>
     <message>
         <source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
@@ -1502,7 +1509,7 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <source>Coloring Rules</source>
-        <translation>着色规则</translation>
+        <translation type="vanished">着色规则</translation>
     </message>
     <message>
         <source>Import</source>
@@ -1522,7 +1529,11 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <source>the &quot;@&quot; symbol will be ignored.</source>
-        <translation>忽略&quot;@&quot;符号。</translation>
+        <translation type="vanished">忽略&quot;@&quot;符号。</translation>
+    </message>
+    <message>
+        <source>Coloring Rules %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
@@ -1546,7 +1557,22 @@ PLEASE NOTE: One option MUST be selected.</source>
     </message>
     <message>
         <source>Unable to save coloring rules: %s</source>
-        <translation>无法保存着色规则: %s</translation>
+        <translation type="vanished">无法保存着色规则: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ColoringRulesModel</name>
+    <message>
+        <source>Unable to save coloring rules: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">名称</translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished">过滤器</translation>
     </message>
 </context>
 <context>