summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-10-09 08:12:24 -0700
committerGerald Combs <gerald@wireshark.org>2016-10-09 15:12:30 +0000
commit83df30ee53e9a7ec77e07e4566fd5ec0f67c0cf4 (patch)
tree5b372406db181947d4f94b0c4646458516a63bdc
parenta10b505b84c384fbcf70d4f0310790ae8cd72466 (diff)
downloadwireshark-83df30ee53e9a7ec77e07e4566fd5ec0f67c0cf4.tar.gz
[Automatic update for 2016-10-09]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I84adcfee2652783d1b3b7d7e3ff9b209f8b23d96 Reviewed-on: https://code.wireshark.org/review/18130 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r--AUTHORS4
-rw-r--r--epan/enterprise-numbers206
-rw-r--r--epan/sminmpec.c47
-rw-r--r--manuf63
-rw-r--r--services5
-rw-r--r--ui/qt/wireshark_de.ts80
-rw-r--r--ui/qt/wireshark_en.ts77
-rw-r--r--ui/qt/wireshark_fr.ts80
-rw-r--r--ui/qt/wireshark_it.ts80
-rw-r--r--ui/qt/wireshark_ja_JP.ts80
-rw-r--r--ui/qt/wireshark_pl.ts80
-rw-r--r--ui/qt/wireshark_zh_CN.ts80
12 files changed, 600 insertions, 282 deletions
diff --git a/AUTHORS b/AUTHORS
index a6ae3725e1..0f628bc39b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4101,6 +4101,7 @@ Jeroen Sack <jeroen[AT]jeroensack.nl>
Jesse Gross <jesse[AT]kernel.org>
Jim Young <jyoung[AT]gsu.edu>
Jo Rueschel <wireshark[AT]rueschel.de>
+Joakim Karlsson <oakimk[AT]gmail.com>
Johan Wahl <johan.wahl[AT]ericsson.com>
John A. Thacker <johnthacker[AT]gmail.com>
John Miner <optommp[AT]gmail.com>
@@ -4188,6 +4189,7 @@ Orgad Shaneh <orgads[AT]gmail.com>
Oscar Gonzalez de Dios <oscar.gonzalezdedios[AT]telefonica.com>
Osman Sakalla <osman.sakalla[AT]ericsson.com>
Owen Williams <williams.owen[AT]gmail.com>
+PHO <pho[AT]cielonegro.org>
Parav Pandit <paravpandit[AT]yahoo.com>
Pascal Artho <pascalartho[AT]gmail.com>
Patrice Fournier <patrice.fournier[AT]ifax.com>
@@ -4277,6 +4279,7 @@ Tobias Stoeckmann <tobias[AT]stoeckmann.org>
Tom <tom916[AT]qq.com>
Tom Haynes <loghyr[AT]primarydata.com>
Trond Myklebust <trond.myklebust[AT]primarydata.com>
+Uli Heilmeier <openid[AT]heilmeier.eu>
Umberto Corponi <umberto.corponi[AT]athonet.com>
Uri Simchoni <urisimchoni[AT]gmail.com>
Vasil Velichckov <vvvelichkov[AT]gmail.com>
@@ -4309,6 +4312,7 @@ anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
+shuai xiao <iamhihi[AT]gmail.com>
Øyvind Rønningstad <ronningstad[AT]gmail.com>
Дмитрий Цветцих <dmitrycvet[AT]gmail.com>
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 807bcaf35b..cf23b1ec6f 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2016-10-02)
+(last updated 2016-10-09)
SMI Network Management Private Enterprise Codes:
@@ -35872,7 +35872,7 @@ Decimal
8979
The Real Asset Company Limited
Reece Robinson
- reecerobinson&hotmail.com
+ mail&trac-group.co.nz
8980
Collective Technologies
Uma Vaiyapuri
@@ -66436,8 +66436,8 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
frederic&ossservice.com
16721
Chronos Technology Ltd
- Simon Gray
- simon.gray&chronos.co.uk
+ Software Development Team
+ software&chronos.co.uk
16722
Methics Oy
Lennart Löfberg
@@ -95182,9 +95182,9 @@ Bahia
Pep Turro
pep&cargol.net
23904
- Arbitron Inc.
- Shardul Rao
- shardul.rao&arbitron.com
+ The Nielsen Company (formerly 'Arbitron Inc.')
+ Nick Mannion
+ nick.mannion&nielsen.com
23905
VOCAL Technologies, Ltd.
Tim Powell
@@ -125523,9 +125523,9 @@ Decentralization / Helenic Public Administra
Markus Ruppert
info&flexsecure.de
31486
- Logica Norr AB
- Magnus Määttä
- registry&linnea.net
+ CGI Sweden AB (formerly 'Logica Norr AB')
+ Henrik Andreasson
+ se.certificateservice&cgi.com
31487
The Transaction Company
Vladimir Dzhuvinov
@@ -130191,9 +130191,9 @@ Decentralization / Helenic Public Administra
Darren Hildebrand
sysadmin&franticfilms.com
32653
- ioko365 Ltd
- Senior Technical Architect (ULS)
- martin.conolly&ioko.com
+ Piksel Ltd.
+ GIS - Global Infrastructure Design
+ gis-gid&piksel.com
32654
Institut für Experimentelle Kernphysik, KIT
Thomas Kuhr
@@ -134616,8 +134616,8 @@ Decentralization / Helenic Public Administra
jack_mckinney&inquinox.com
33759
Golden Micro Systems Corporation
- Amano, Naomi
- amano1&attglobal.net
+ Yukiko Suzuki
+ suzuki&g-micro.co.jp
33760
Ministerstvo Finansov Chelyabinskoy oblasti
Alexander Povyshev
@@ -190166,7 +190166,7 @@ Decentralization / Helenic Public Administra
47646
Beijing Qianxin Technology Co., LTD.
Jiming Gao
- gaojiming&360.cn
+ gaojiming&b.360.cn
47647
barox Kommunikation
Angelo Banfi
@@ -191781,8 +191781,8 @@ Decentralization / Helenic Public Administra
clemens.blank&new.de
48050
International Personal Finance
- Greg Pope
- greg.pope&ipfin.co.uk
+ Nic Tomlinson
+ nic.tomlinson&ipfin.co.uk
48051
Sato America
Zayar Tun
@@ -192930,7 +192930,7 @@ Decentralization / Helenic Public Administra
48337
TD Avidis LLC
Pereverzev Sergey
- pereverzev.s.a&gmail.com
+ support&avidis.kiev.ua
48338
Orion Power Systems
Robert Bridenbaugh
@@ -193853,8 +193853,8 @@ Decentralization / Helenic Public Administra
petr.kraus&linet.cz
48568
First Orion LLC
- Joshua Lange
- jlange&privacystar.com
+ Keith Rogers
+ krogers&privacystar.com
48569
Midland States Bancorp, Inc
Tim Krampe
@@ -194151,6 +194151,170 @@ Decentralization / Helenic Public Administra
Wangarden
Edouard Bonnet
system&wangarden.com
+48643
+ Graytech Computers
+ Chris Gray
+ domain&graytech.com.au
+48644
+ UNION NATIONALE DES MAISONS FAMILIALES RURALES D'EDUCATION et D'ORIENTATION
+ HURLAIN Arnaud
+ union&mfr.asso.fr
+48645
+ Haldor Topsoe
+ Kim Bauer
+ kbj&topsoe.dk
+48646
+ Aralink Tecnologias de la Informacion SL
+ Departamento de Administracion
+ administracion&aralink.com
+48647
+ Jan Vana
+ Jan Vana
+ jan&janvana.cz
+48648
+ New Mexico Oncology Hematology Center, Ltd
+ Cookie Santamaria
+ cookies&nmohc.com
+48649
+ Practical Design Group, LLC
+ Tim Paulson
+ tpaulson&practicaldesign.com
+48650
+ MAILEVA
+ Mekki GHERNATI
+ mekki.ghernati&docapost.fr
+48651
+ Vint
+ Rémi Lapeyre
+ remi.lapeyre&vint.fr
+48652
+ Lokithor Sécurité
+ Jacques Beauregard
+ dtln&netcourrier.com
+48653
+ HUGO BOSS AG
+ Rainer Koch
+ rainer_koch&hugoboss.com
+48654
+ P3KI GmbH
+ Gregor Jehle
+ hadez&p3ki.com
+48655
+ Sky Brasil
+ Welber Neto
+ skyengnetwork&sky.com.br
+48656
+ HighJump Software Inc.
+ Timothy R. Simmons
+ Tim.Simmons&Highjump.com
+48657
+ Tobias Tilgner
+ Tobias Tilgner
+ tt&totis.net
+48658
+ Martin Balint
+ Martin Balint
+ martin&balint.cz
+48659
+ Tecnotel Servizi Tecnologici SRL
+ Sergio Tosti
+ noc&tecnoadsl.it
+48660
+ Netz-Weise
+ Holger Voges
+ holger.voges&netz-weise.de
+48661
+ Dialamerica
+ Bryan Dorry
+ bdorry&dialamerica.com
+48662
+ bDigital Indonesia
+ Adiwijaya Hadinoto
+ technology&bdigital.id
+48663
+ T38Fax Incorporated
+ Patrice Fournier
+ patrice.fournier&t38fax.com
+48664
+ eth2 networks
+ Martijn Reening
+ m.reening&eth2.link
+48665
+ Telcom d.o.o.
+ Sasa Galjak
+ sasa.galjak&telcom.co.rs
+48666
+ 24-7 Entertainment ApS
+ Andrzej Soinski
+ doms&247e.com
+48667
+ ibes AG
+ Marian Wendt
+ mwendt&ibes.ag
+48668
+ Czech University of Life Sciences Prague (CULS)
+ Jan Richter
+ apacheadmin&czu.cz
+48669
+ WIPO
+ Thierry Crouzier
+ thierry.crouzier&wipo.int
+48670
+ Nuco Technologies LTD (Host-IT Internet Solutions)
+ Maxim Wilson (Host-IT Technical Support)
+ support&host-it.co.uk
+48671
+ Giax GmbH
+ Andreas Blohmann
+ ab&giax.de
+48672
+ Symbotic LLC
+ John Cole
+ iana-admin&symbotic.com
+48673
+ iCONX solutions
+ Shane O'Keeffe
+ shane.okeeffe&iconxsolutions.com
+48674
+ Jano
+ Edward Antony Muchiri
+ ed&jano.co.ke
+48675
+ Heerscharen.Net
+ Thies Müller
+ webmaster&hosting.heerscharen.net
+48676
+ Zaba Industries
+ Vsevolod Kozlov
+ zaba&mm.st
+48677
+ SEPSA
+ Vincenzo Auteri
+ vincenzo.auteri&sepsa.es
+48678
+ RNAV CDG
+ CARRIERE Arnaud
+ arnaud.carriere&aviation-civile.gouv.fr
+48679
+ dataWeapons
+ songjun choe
+ 10gic&dataweapons.org
+48680
+ abas-usa
+ Jeremy Sheridan
+ jeremysheridan&abas-usa.com
+48681
+ Guangzhou Caipin Communication Technology Co., Ltd.
+ Huan Yong, Qin
+ 287042313&qq.com
+48682
+ NETSTARS CO., LTD.
+ WangKun
+ wang.kun&netstars.co.jp
+48683
+ Elastifile
+ Modi Finkelstein
+ modi.finkelstein&elastifile.com
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index b5b9ddace6..16ad0c244f 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -23924,7 +23924,7 @@ const value_string sminmpec_values[] = {
{ 23901, "Digigram" },
{ 23902, "ABB STOTZ-KONTAKT GmbH" },
{ 23903, "Cargol.net Solucions Lliures S.L.L." },
- { 23904, "Arbitron Inc." },
+ { 23904, "The Nielsen Company (formerly 'Arbitron Inc.')" },
{ 23905, "VOCAL Technologies, Ltd." },
{ 23906, "Axalto Inc." },
{ 23907, "Advantage Security, S. de R.L. de C.V." },
@@ -31506,7 +31506,7 @@ const value_string sminmpec_values[] = {
{ 31483, "Universidad Rey Juan Carlos" },
{ 31484, "Basset AB (formerly 'BassetLabs AB')" },
{ 31485, "FlexSecure GmbH" },
- { 31486, "Logica Norr AB" },
+ { 31486, "CGI Sweden AB (formerly 'Logica Norr AB')" },
{ 31487, "The Transaction Company" },
{ 31488, "oxylane" },
{ 31489, "Manchester Computing Ltd" },
@@ -32673,7 +32673,7 @@ const value_string sminmpec_values[] = {
{ 32650, "Namtrac Kft." },
{ 32651, "Newtec Communications GmbH" },
{ 32652, "Machine VFX" },
- { 32653, "ioko365 Ltd" },
+ { 32653, "Piksel Ltd." },
{ 32654, "Institut f\0303\0274r Experimentelle Kernphysik, KIT" },
{ 32655, "Classics Animated" },
{ 32656, "Hypios" },
@@ -48663,6 +48663,47 @@ const value_string sminmpec_values[] = {
{ 48640, "Electronic Technology Inc." },
{ 48641, "Det Norske Studentersamfund" },
{ 48642, "Wangarden" },
+ { 48643, "Graytech Computers" },
+ { 48644, "UNION NATIONALE DES MAISONS FAMILIALES RURALES D'EDUCATION et D'ORIENTATION" },
+ { 48645, "Haldor Topsoe" },
+ { 48646, "Aralink Tecnologias de la Informacion SL" },
+ { 48647, "Jan Vana" },
+ { 48648, "New Mexico Oncology Hematology Center, Ltd" },
+ { 48649, "Practical Design Group, LLC" },
+ { 48650, "MAILEVA" },
+ { 48651, "Vint" },
+ { 48652, "Lokithor S\0303\0251curit\0303\0251" },
+ { 48653, "HUGO BOSS AG" },
+ { 48654, "P3KI GmbH" },
+ { 48655, "Sky Brasil" },
+ { 48656, "HighJump Software Inc." },
+ { 48657, "Tobias Tilgner" },
+ { 48658, "Martin Balint" },
+ { 48659, "Tecnotel Servizi Tecnologici SRL" },
+ { 48660, "Netz-Weise" },
+ { 48661, "Dialamerica" },
+ { 48662, "bDigital Indonesia" },
+ { 48663, "T38Fax Incorporated" },
+ { 48664, "eth2 networks" },
+ { 48665, "Telcom d.o.o." },
+ { 48666, "24-7 Entertainment ApS" },
+ { 48667, "ibes AG" },
+ { 48668, "Czech University of Life Sciences Prague (CULS)" },
+ { 48669, "WIPO" },
+ { 48670, "Nuco Technologies LTD (Host-IT Internet Solutions)" },
+ { 48671, "Giax GmbH" },
+ { 48672, "Symbotic LLC" },
+ { 48673, "iCONX solutions" },
+ { 48674, "Jano" },
+ { 48675, "Heerscharen.Net" },
+ { 48676, "Zaba Industries" },
+ { 48677, "SEPSA" },
+ { 48678, "RNAV CDG" },
+ { 48679, "dataWeapons" },
+ { 48680, "abas-usa" },
+ { 48681, "Guangzhou Caipin Communication Technology Co., Ltd." },
+ { 48682, "NETSTARS CO., LTD." },
+ { 48683, "Elastifile" },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index 7b7d914791..33983c49e3 100644
--- a/manuf
+++ b/manuf
@@ -389,7 +389,7 @@
00:01:4C Berkeley # Berkeley Process Control
00:01:4D ShinKinE # Shin Kin Enterprises Co., Ltd
00:01:4E WinEnter # WIN Enterprises, Inc.
-00:01:4F Adtran # ADTRAN INC
+00:01:4F Adtran # Adtran Inc
00:01:50 Megahert # Megahertz (now 3com) modem
00:01:51 Ensemble # Ensemble Communications
00:01:52 Chromate # CHROMATEK INC.
@@ -6572,7 +6572,7 @@
00:19:8F AlcatelB # Alcatel Bell N.V.
00:19:90 ElmData # ELM DATA Co., Ltd.
00:19:91 Avinfo
-00:19:92 Adtran # ADTRAN INC.
+00:19:92 Adtran # Adtran Inc
00:19:93 Changshu # Changshu Switchgear MFG. Co.,Ltd. (Former Changshu Switchgea
00:19:94 JorjinTe # Jorjin Technologies Inc.
00:19:95 JurongHi # Jurong Hi-Tech (Suzhou)Co.ltd
@@ -9288,7 +9288,7 @@
00:23:62 Goldline # Goldline Controls
00:23:63 ZhuhaiRa # Zhuhai Raysharp Technology Co.,Ltd
00:23:64 PowerIns # Power Instruments Pte Ltd
-00:23:65 Elka-Ele # ELKA-Elektronik GmbH
+00:23:65 InstaEle # Insta Elektro GmbH
00:23:66 BeijingS # Beijing Siasun Electronic System Co.,Ltd.
00:23:67 Unicontr # UniControls a.s.
00:23:68 ZebraTec # Zebra Technologies Inc
@@ -9510,7 +9510,7 @@
00:24:42 Axona # Axona Limited
00:24:43 NortelNe # Nortel Networks
00:24:44 Nintendo # Nintendo Co., Ltd.
-00:24:45 Commscop # CommScope Canada Inc.
+00:24:45 Adtran # Adtran Inc
00:24:46 MmbResea # MMB Research Inc.
00:24:47 Kaztek # Kaztek Systems
00:24:48 Spidercl # SpiderCloud Wireless, Inc
@@ -17556,6 +17556,7 @@
08:97:58 Shenzhen # Shenzhen Strong Rising Electronics Co.,Ltd DongGuan Subsidiary
08:9B:4B IkuaiNet # iKuai Networks
08:9E:01 QuantaCo # QUANTA COMPUTER INC.
+08:9E:08 Google # Google, Inc.
08:9F:97 LeroyAut # LEROY AUTOMATION
08:A1:2B Shenzhen # ShenZhen EZL Technology Co., Ltd
08:A5:C8 SunnovoI # Sunnovo International Limited
@@ -17632,6 +17633,7 @@
0C:38:3E FanvilTe # Fanvil Technology Co., Ltd.
0C:39:56 Observat # Observator instruments
0C:3C:65 DomeImag # Dome Imaging Inc
+0C:3C:CD Universa # Universal Global Scientific Industrial Co., Ltd.
0C:3E:9F Apple # Apple, Inc.
0C:41:3E Microsof # Microsoft Corporation
0C:45:BA HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
@@ -17894,6 +17896,7 @@
10:A9:32 BeijingC # Beijing Cyber Cloud Technology Co. ,Ltd.
10:AE:60 Private
10:AF:78 Shenzhen # Shenzhen ATUE Technology Co., Ltd
+10:B1:F8 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
10:B2:6B Base # base Co.,Ltd.
10:B7:13 Private
10:B7:F6 Plastofo # Plastoform Industries Ltd.
@@ -18054,6 +18057,7 @@
14:A7:8B Zhejiang # Zhejiang Dahua Technology Co., Ltd.
14:A8:6B Shenzhen # ShenZhen Telacom Science&Technology Co., Ltd
14:A9:E3 Mst # MST CORPORATION
+14:AB:C5 IntelCor # Intel Corporate
14:AB:F0 ArrisGro # ARRIS Group, Inc.
14:AE:DB VtechTel # VTech Telecommunications Ltd.
14:B1:26 Industri # Industrial Software Co
@@ -18455,6 +18459,7 @@
1C:B1:7F NecPlatf # NEC Platforms, Ltd.
1C:B2:43 Tdc # TDC A/S
1C:B7:2C AsustekC # ASUSTek COMPUTER INC.
+1C:B8:57 BeconTec # Becon Technologies Co,.Ltd.
1C:B9:C4 RuckusWi # Ruckus Wireless
1C:BA:8C TexasIns # Texas Instruments
1C:BB:A8 OjscUfim # OJSC Ufimskiy Zavod Promsvyaz
@@ -18817,6 +18822,7 @@
24:CF:21 Shenzhen # Shenzhen State Micro Technology Co., Ltd
24:D1:3F Mexus # MEXUS CO.,LTD
24:D2:CC Smartdri # SmartDrive Systems Inc.
+24:D5:1C Zhongtia # Zhongtian broadband technology co., LTD
24:D9:21 Avaya # Avaya Inc
24:DA:11 NoNda # NO NDA Inc
24:DA:9B Motorola # Motorola Mobility LLC, a Lenovo Company
@@ -18856,6 +18862,7 @@
28:10:7B D-LinkIn # D-Link International
28:14:71 Lantis # Lantis co., LTD.
28:16:2E 2wire # 2Wire Inc
+28:16:AD IntelCor # Intel Corporate
28:17:CE Omnisens # Omnisense Ltd
28:18:78 Microsof # Microsoft Corporation
28:18:FD AdityaIn # Aditya Infotech Ltd.
@@ -18904,6 +18911,7 @@
28:4E:D7 Outsmart # OutSmart Power Systems, Inc.
28:4F:CE Liaoning # Liaoning Wontel Science and Technology Development Co.,Ltd.
28:51:32 Shenzhen # Shenzhen Prayfly Technology Co.,Ltd
+28:52:61 Cisco # Cisco Systems, Inc
28:52:E0 LayonInt # Layon international Electronic & Telecom Co.,Ltd
28:56:5A HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
28:57:67 Echostar # Echostar Technologies Corp
@@ -18919,6 +18927,7 @@
28:6C:07 XiaomiEl # XIAOMI Electronics,CO.,LTD
28:6D:97 Samjin # SAMJIN Co., Ltd.
28:6E:D4 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
+28:6F:7F Cisco # Cisco Systems, Inc
28:71:84 SpirePay # Spire Payments
28:72:C5 Smartmat # Smartmatic Corp
28:72:F0 Athena
@@ -19033,6 +19042,7 @@
28:FD:80:D0:00:00/28 Grandway # Grandway Technology (Shenzhen) Limited
28:FD:80:E0:00:00/28 T-RadioA # T-Radio AS
28:FD:80:F0:00:00/28 Private
+28:FE:CD Lemobile # Lemobile Information Technology (Beijing) Co., Ltd.
2C:00:2C Unowhy
2C:00:33 Econtrol # EControls, LLC
2C:00:F7 Xos
@@ -19380,11 +19390,14 @@
34:04:9E:40:00:00/28 HarbinYa # Harbin Yantuo Science and Technology Development Co., Ltd
34:04:9E:50:00:00/28 SeeinerT # Seeiner Technology Co.,LTD
34:04:9E:60:00:00/28 LifeInte # Life Interface Co., Ltd.
+34:04:9E:70:00:00/28 PebbleTe # Pebble Technology
34:04:9E:80:00:00/28 EclipseI # Eclipse Information Technologies
34:04:9E:90:00:00/28 Private
34:04:9E:A0:00:00/28 I3Intern # i3 International Inc.
34:04:9E:B0:00:00/28 Eginity # Eginity, Inc.
+34:04:9E:C0:00:00/28 Private
34:04:9E:D0:00:00/28 Uikismar # uikismart
+34:04:9E:E0:00:00/28 NdSatcom # ND SatCom GmbH
34:07:4F Accelsto # AccelStor, Inc.
34:07:FB Ericsson # Ericsson AB
34:08:04 D-Link # D-Link Corporation
@@ -19609,6 +19622,7 @@
38:42:33 Wildeboe # Wildeboer Bauteile GmbH
38:42:A6 Ingenieu # Ingenieurbuero Stahlkopf
38:43:69 PatrolPr # Patrol Products Consortium LLC
+38:45:4C LightLab # Light Labs, Inc.
38:45:8C MycloudT # MyCloud Technology corporation
38:46:08 Zte # zte corporation
38:48:4C Apple # Apple, Inc.
@@ -20724,6 +20738,7 @@
44:D2:44 SeikoEps # Seiko Epson Corporation
44:D2:CA AnviaTvO # Anvia TV Oy
44:D3:CA Cisco # Cisco Systems, Inc
+44:D4:37 IntenoBr # Inteno Broadband Technology AB
44:D4:E0 SonyMobi # Sony Mobile Communications AB
44:D6:3D TalariNe # Talari Networks
44:D6:E1 SnuzaInt # Snuza International Pty. Ltd.
@@ -20915,6 +20930,7 @@
4C:11:BF Zhejiang # Zhejiang Dahua Technology Co., Ltd.
4C:14:80 Noregon # NOREGON SYSTEMS, INC
4C:14:A3 TclTechn # TCL Technoly Electronics (Huizhou) Co., Ltd.
+4C:16:94 Shenzhen # shenzhen sibituo Technology Co., Ltd
4C:16:F1 Zte # zte corporation
4C:17:EB Sagemcom # Sagemcom Broadband SAS
4C:1A:3A PrimaRes # PRIMA Research And Production Enterprise Ltd.
@@ -21060,6 +21076,7 @@
50:01:6B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
50:01:BB SamsungE # Samsung Electronics Co.,Ltd
50:01:D9 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
+50:04:B8 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
50:05:3D CyweeGro # CyWee Group Ltd
50:06:04 Cisco # Cisco Systems, Inc
50:06:AB Cisco # Cisco Systems, Inc
@@ -21172,6 +21189,8 @@
50:A0:54 Actineon
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:60:00:00/28 Pointgra # PointGrab
50:A6:E3 DavidCla # David Clark Company
50:A7:15 Aboundi # Aboundi, Inc.
50:A7:2B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
@@ -21265,6 +21284,7 @@
54:20:18 TelyLabs # Tely Labs
54:21:60 Resoluti # Resolution Products
54:22:F8 Zte # zte corporation
+54:25:EA HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
54:26:96 Apple # Apple, Inc.
54:27:1E Azurewav # AzureWave Technology Inc.
54:27:58 Motorola # Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
@@ -21859,6 +21879,7 @@
60:C5:47 Apple # Apple, Inc.
60:C5:A8 BeijingL # Beijing LT Honway Technology Co.,Ltd
60:C5:AD SamsungE # Samsung Electronics Co.,Ltd
+60:C6:58 Phytroni # PHYTRONIX Co.,Ltd.
60:C7:98 Verifone
60:C9:80 Trymus
60:CB:FB Airscape # AirScape Inc.
@@ -22101,6 +22122,7 @@
68:1E:8B Infosigh # InfoSight Corporation
68:1F:D8 SiemensI # Siemens Industry, Inc.
68:23:4B NihonDen # Nihon Dengyo Kousaku
+68:27:37 SamsungE # Samsung Electronics Co.,Ltd
68:28:BA Dejai
68:28:F6 VubiqNet # Vubiq Networks, Inc.
68:2D:DC WuhanCha # Wuhan Changjiang Electro-Communication Equipment CO.,LTD
@@ -22496,6 +22518,7 @@
70:8B:78 Citygrow # citygrow technology co., ltd
70:8B:CD AsustekC # ASUSTek COMPUTER INC.
70:8D:09 Nokia # Nokia Corporation
+70:91:8F Weber-St # Weber-Stephen Products LLC
70:93:83 Intellig # Intelligent Optical Network High Tech CO.,LTD.
70:93:F8 SpaceMon # Space Monkey, Inc.
70:97:56 Happyele # Happyelectronics Co.,Ltd
@@ -22628,6 +22651,7 @@
70:B3:D5:11:90:00/36 Private
70:B3:D5:11:C0:00/36 Samriddi # Samriddi Automations Pvt. Ltd.
70:B3:D5:11:D0:00/36 TexkaLab # Texka Labs
+70:B3:D5:11:F0:00/36 Geppetto # Geppetto Electronics
70:B3:D5:12:00:00/36 GspSprac # GSP Sprachtechnologie GmbH
70:B3:D5:12:40:00/36 Forschun # Forschungs- und Transferzentrum Leipzig e.V.
70:B3:D5:12:B0:00/36 RicElect # RIC Electronics
@@ -22636,6 +22660,7 @@
70:B3:D5:12:F0:00/36 Dsp4you # DSP4YOU LTd
70:B3:D5:13:10:00/36 InovaDes # Inova Design Solutions Ltd
70:B3:D5:13:40:00/36 ConjingN # Conjing Networks Inc.
+70:B3:D5:13:60:00/36 MiguelCo # Miguel Corporate Services Pte Ltd
70:B3:D5:13:90:00/36 Tunstall # Tunstall A/S
70:B3:D5:13:A0:00/36 Deuta-We # DEUTA-WERKE GmbH
70:B3:D5:13:B0:00/36 Sienna # Sienna Corporation
@@ -22674,6 +22699,7 @@
70:B3:D5:18:60:00/36 Rohde&Sc # Rohde&Schwarz Topex SA
70:B3:D5:18:70:00/36 Elektron # Elektronik & Präzisionsbau Saalfeld GmbH
70:B3:D5:18:B0:00/36 AplexTec # Aplex Technology Inc.
+70:B3:D5:18:C0:00/36 CmcIndus # CMC Industrial Electronics Ltd
70:B3:D5:18:D0:00/36 ForoTel # Foro Tel
70:B3:D5:19:00:00/36 FantomWi # Fantom Wireless, Inc.
70:B3:D5:19:40:00/36 HustyMSt # Husty M.Styczen J.Hupert Sp.J.
@@ -22841,6 +22867,7 @@
70:B3:D5:36:D0:00/36 Cybertea # Cyberteam Sp z o o
70:B3:D5:37:60:00/36 Private
70:B3:D5:37:70:00/36 Monnit # Monnit Corporation
+70:B3:D5:37:A0:00/36 ApgCashD # APG Cash Drawer, LLC
70:B3:D5:37:B0:00/36 Power # Power Ltd.
70:B3:D5:37:D0:00/36 DxShop # The DX Shop Limited
70:B3:D5:37:F0:00/36 IdsInnom # IDS Innomic GmbH
@@ -23041,6 +23068,7 @@
70:B3:D5:59:30:00/36 AsisPro # Asis Pro
70:B3:D5:59:40:00/36 Ate # ATE Systems Inc
70:B3:D5:59:50:00/36 PlrPruef # PLR Prueftechnik Linke und Ruehe GmbH
+70:B3:D5:59:70:00/36 VapeRail # VAPE RAIL INTERNATIONAL
70:B3:D5:59:90:00/36 Leco # LECO Corporation
70:B3:D5:59:D0:00/36 Servicio # servicios de consultoria independiente S.L.
70:B3:D5:5A:00:00/36 AsconTec # Ascon Tecnologic S.r.l.
@@ -23061,6 +23089,7 @@
70:B3:D5:5C:C0:00/36 AkseSrl # Akse srl
70:B3:D5:5C:D0:00/36 MvtVideo # MVT Video Technologies R + H Maedler GbR
70:B3:D5:5D:10:00/36 Software # Software Motor Corp
+70:B3:D5:5D:50:00/36 Ct # CT Company
70:B3:D5:5D:60:00/36 BmtMesst # BMT Messtechnik Gmbh
70:B3:D5:5E:40:00/36 DspDesig # DSP DESIGN
70:B3:D5:5E:60:00/36 Mechatro # Mechatronics Systems Private Limited
@@ -23143,6 +23172,7 @@
70:B3:D5:6C:50:00/36 Cjsc«Rus # CJSC «Russian telecom equipment company» (CJSC RTEC)
70:B3:D5:6C:70:00/36 BectonDi # Becton Dickinson
70:B3:D5:6C:D0:00/36 Northbou # NORTHBOUND NETWORKS PTY. LTD.
+70:B3:D5:6C:F0:00/36 Private
70:B3:D5:6D:10:00/36 VisualEn # Visual Engineering Technologies Ltd
70:B3:D5:6D:30:00/36 Deuta-We # DEUTA-WERKE GmbH
70:B3:D5:6D:60:00/36 Kmtronic # KMtronic Ltd.
@@ -23294,6 +23324,7 @@
70:B3:D5:84:90:00/36 Rf-Tuote # RF-Tuote Oy
70:B3:D5:84:A0:00/36 MogLabor # MOG Laboratories Pty Ltd
70:B3:D5:84:E0:00/36 Chromalo # Chromalox, Inc.
+70:B3:D5:85:00:00/36 Reo # REO AG
70:B3:D5:85:20:00/36 Netboxsc # NetBoxSC, LLC
70:B3:D5:85:40:00/36 AdimecAd # Adimec Advanced Image Systems
70:B3:D5:85:50:00/36 Crde
@@ -23333,6 +23364,7 @@
70:B3:D5:8B:30:00/36 FireflyR # Firefly RFID Solutions
70:B3:D5:8B:90:00/36 Toptech # Toptech Systems, Inc.
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:B0:00/36 Welt # WELT Corporation
70:B3:D5:8C:E0:00/36 Cores # CORES Corporation
@@ -23515,6 +23547,7 @@
70:B3:D5:AB:E0:00/36 MartNetw # MART NETWORK SOLUTIONS LTD
70:B3:D5:AB:F0:00/36 AgrInter # AGR International
70:B3:D5:AC:30:00/36 Novoptel # Novoptel GmbH
+70:B3:D5:AC:50:00/36 AtomGike # ATOM GIKEN Co.,Ltd.
70:B3:D5:AC:60:00/36 Smtc # SMTC Corporation
70:B3:D5:AC:80:00/36 Heartlan # Heartland.Data Inc.
70:B3:D5:AC:90:00/36 TrinityS # Trinity Solutions LLC
@@ -23543,6 +23576,7 @@
70:B3:D5:AF:A0:00/36 PowerSec # Power Security Systems Ltd.
70:B3:D5:AF:B0:00/36 Shanghai # Shanghai Tianhe Automation Instrumentation Co., Ltd.
70:B3:D5:AF:E0:00/36 Mesotech # MESOTECHNIC
+70:B3:D5:AF:F0:00/36 Digital- # digital-spice
70:B3:D5:B0:20:00/36 NordicAu # Nordic Automation Systems AS
70:B3:D5:B0:50:00/36 E-PlusTe # E-PLUS TECHNOLOGY CO., LTD
70:B3:D5:B0:80:00/36 Secuinfo # Secuinfo Co. Ltd
@@ -23654,6 +23688,7 @@
70:B3:D5:C3:90:00/36 Meshwork # MeshWorks Wireless Oy
70:B3:D5:C3:B0:00/36 Vironova # Vironova AB
70:B3:D5:C3:C0:00/36 PeekTraf # PEEK TRAFFIC
+70:B3:D5:C3:D0:00/36 CistechS # CISTECH Solutions
70:B3:D5:C3:E0:00/36 Dosadore # DOSADORES ALLTRONIC
70:B3:D5:C3:F0:00/36 CodeBlue # Code Blue Corporation
70:B3:D5:C4:30:00/36 FutureSk # Future Skies
@@ -23673,6 +23708,7 @@
70:B3:D5:C7:30:00/36 CDN # C.D.N.CORPORATION
70:B3:D5:C7:70:00/36 YönnetAk # Yönnet Akıllı Bina ve Otomasyon Sistemleri
70:B3:D5:C7:80:00/36 NetaElek # NETA Elektronik AS
+70:B3:D5:C7:E0:00/36 BirddogA # BirdDog Australia
70:B3:D5:C7:F0:00/36 TattileS # TATTILE SRL
70:B3:D5:C8:00:00/36 LinkCare # Link Care Services
70:B3:D5:C8:10:00/36 DspDesig # DSP DESIGN
@@ -23821,6 +23857,7 @@
70:B3:D5:E0:80:00/36 Olssen
70:B3:D5:E0:D0:00/36 SigmaCon # Sigma Connectivity AB
70:B3:D5:E0:F0:00/36 VtronPty # Vtron Pty Ltd
+70:B3:D5:E1:A0:00/36 BizerbaL # BIZERBA LUCEO
70:B3:D5:E1:C0:00/36 XcenterA # Xcenter AS
70:B3:D5:E2:00:00/36 Signatur # Signature Control Systems, LLC.
70:B3:D5:E2:10:00/36 Llvision # LLVISION TECHNOLOGY CO.,LTD
@@ -23907,6 +23944,7 @@
70:B3:D5:EF:E0:00/36 MeidenSy # MEIDEN SYSTEM SOLUTIONS
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: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
@@ -26367,6 +26405,7 @@ A4:5D:A1 AdbBroad # ADB Broadband Italia
A4:5E:60 Apple # Apple, Inc.
A4:60:11 Verifone
A4:60:32 MrvCommu # MRV Communications (Networks) LTD
+A4:62:DF DsGlobal # DS Global. Co., LTD
A4:67:06 Apple # Apple, Inc.
A4:68:BC Private
A4:6C:2A Cisco # Cisco Systems, Inc
@@ -26828,6 +26867,7 @@ B0:35:8D Nokia # Nokia Corporation
B0:38:29 Siliconw # Siliconware Precision Industries Co., Ltd.
B0:38:50 NanjingC # Nanjing CAS-ZDC IOT SYSTEM CO.,LTD
B0:3E:B0 Microdia # MICRODIA Ltd.
+B0:40:89 Senient # Senient Systems LTD
B0:41:1D IttimTec # ITTIM Technologies
B0:43:5D Nuleds # NuLEDs, Inc.
B0:45:15 MiraFitn # mira fitness,LLC.
@@ -26952,6 +26992,7 @@ B0:E2:35 XiaomiCo # Xiaomi Communications Co Ltd
B0:E2:E5 Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD
B0:E3:9D CatSyste # CAT SYSTEM CO.,LTD.
B0:E5:0E Nrg # NRG SYSTEMS INC
+B0:E5:ED HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
B0:E7:54 2wire # 2Wire Inc
B0:E8:92 SeikoEps # Seiko Epson Corporation
B0:E9:7E Advanced # Advanced Micro Peripherals
@@ -27747,6 +27788,7 @@ 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:85:08 IntelCor # Intel Corporate
+C4:86:E9 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
C4:88:E5 SamsungE # Samsung Electronics Co.,Ltd
C4:8E:8F HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
C4:8F:07 Shenzhen # Shenzhen Yihao Hulian Science and Technology Co., Ltd.
@@ -27817,6 +27859,7 @@ C8:0E:14 AvmAudio # AVM Audiovisuelles Marketing und Computersyste
C8:0E:77 LeShiZhi # Le Shi Zhi Xin Electronic Technology (Tianjin) Limited
C8:0E:95 Omnilync # OmniLync Inc.
C8:10:73 CenturyO # CENTURY OPTICOMM CO.,LTD
+C8:14:51 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
C8:14:79 SamsungE # Samsung Electronics Co.,Ltd
C8:16:A5 Masimo # Masimo Corporation
C8:16:BD QingdaoH # Qingdao Hisense Communications Co.,Ltd.
@@ -27905,6 +27948,7 @@ C8:90:3E PaktonTe # Pakton Technologies
C8:91:F9 Sagemcom # Sagemcom Broadband SAS
C8:93:46 Mxchip # MXCHIP Company Limited
C8:93:83 Embedded # Embedded Automation, Inc.
+C8:94:BB HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
C8:94:D2 JiangsuD # Jiangsu Datang Electronic Products Co., Ltd
C8:97:9F Nokia # Nokia Corporation
C8:9C:1D Cisco # Cisco Systems, Inc
@@ -28374,6 +28418,7 @@ D0:F7:3B HelmutMa # Helmut Mauell GmbH Werk Weida
D0:FA:1D Qihoo360 # Qihoo 360 Technology Co.,Ltd
D0:FC:CC SamsungE # Samsung Electronics Co.,Ltd
D0:FF:50 TexasIns # Texas Instruments
+D0:FF:98 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
D4:00:0D PhoenixB # Phoenix Broadband Technologies, LLC.
D4:00:57 McTechno # MC Technologies GmbH
D4:01:29 Broadcom
@@ -28497,6 +28542,7 @@ D4:AC:4E BodiRsLl # BODi rS, LLC
D4:AD:2D Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD
D4:AE:52 Dell # Dell Inc.
D4:B1:10 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
+D4:B1:69 LeShiZhi # Le Shi Zhi Xin Electronic Technology (Tianjin) Limited
D4:B4:3E Messcomp # Messcomp Datentechnik GmbH
D4:B8:FF HomeCont # Home Control Singapore Pte Ltd
D4:BE:D9 Dell # Dell Inc.
@@ -28666,6 +28712,7 @@ D8:C3:FB Detracom
D8:C4:6A MurataMa # Murata Manufacturing Co., Ltd.
D8:C4:E9 SamsungE # Samsung Electronics Co.,Ltd
D8:C6:91 HichanTe # Hichan Technology Corp.
+D8:C7:71 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
D8:C7:C8 ArubaNet # Aruba Networks
D8:C9:9D EaDispla # EA DISPLAY LIMITED
D8:CB:8A Micro-St # Micro-Star INTL CO., LTD.
@@ -28684,6 +28731,7 @@ D8:DD:FD TexasIns # Texas Instruments
D8:DE:CE Isung # ISUNG CO.,LTD
D8:DF:0D Beronet # beroNet GmbH
D8:E0:B8 BulatLlc # BULAT LLC
+D8:E0:E1 SamsungE # Samsung Electronics Co.,Ltd
D8:E3:AE CirtecMe # CIRTEC MEDICAL SYSTEMS
D8:E5:6D TctMobil # TCT mobile ltd
D8:E7:2B Netscout # NetScout Systems, Inc.
@@ -28850,6 +28898,7 @@ DC:EB:94 Cisco # Cisco Systems, Inc
DC:EC:06 HeimiNet # Heimi Network Technology Co., Ltd.
DC:EE:06 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
DC:EF:09 Netgear
+DC:EF:CA MurataMa # Murata Manufacturing Co., Ltd.
DC:F0:5D LettaTek # Letta Teknoloji
DC:F0:90 Private
DC:F1:10 Nokia # Nokia Corporation
@@ -29074,6 +29123,7 @@ E4:3F:A2 WuxiDspT # Wuxi DSP Technologies Inc.
E4:40:E2 SamsungE # Samsung Electronics Co.,Ltd
E4:41:E6 OttecTec # Ottec Technology GmbH
E4:46:BD C&CTechn # C&C TECHNIC TAIWAN CO., LTD.
+E4:47:90 Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
E4:48:C7 CiscoSpv # Cisco SPVTG
E4:4C:6C Shenzhen # Shenzhen Guo Wei Electronic Co,. Ltd.
E4:4E:18 Gardasof # Gardasoft VisionLimited
@@ -29274,6 +29324,7 @@ E8:61:7E LiteonTe # Liteon Technology Corporation
E8:61:83 BlackDia # Black Diamond Advanced Technology, LLC
E8:61:BE Melec # Melec Inc.
E8:65:49 Cisco # Cisco Systems, Inc
+E8:65:D4 TendaTec # Tenda Technology Co.,Ltd.Dongguan branch
E8:66:C4 Diamanti
E8:6C:DA Supercom # Supercomputers and Neurocomputers Research Center
E8:6D:52 ArrisGro # ARRIS Group, Inc.
@@ -29401,7 +29452,7 @@ EC:3F:05 Institut # Institute 706, The Second Academy China Aerosp
EC:42:F0 AdlEmbed # ADL Embedded Solutions, Inc.
EC:43:8B Yaptv
EC:43:E6 Awcer # AWCER Ltd.
-EC:43:F6 5420
+EC:43:F6 ZyxelCom # ZyXEL Communications Corporation
EC:44:76 Cisco # Cisco Systems, Inc
EC:46:44 TtkSas # TTK SAS
EC:46:70 Meinberg # Meinberg Funkuhren GmbH & Co. KG
@@ -29477,6 +29528,7 @@ EC:D9:D1 Shenzhen # Shenzhen TG-NET Botone Technology Co.,Ltd.
EC:DE:3D LampreyN # Lamprey Networks, Inc.
EC:DF:3A VivoMobi # vivo Mobile Communication Co., Ltd.
EC:E0:9B SamsungE # Samsung Electronics Co.,Ltd
+EC:E1:54 BeijingU # Beijing Unisound Information Technology Co.,Ltd.
EC:E1:A9 Cisco # Cisco Systems, Inc
EC:E2:FD SkgElect # SKG Electric Group(Thailand) Co., Ltd.
EC:E5:12 Tado # tado GmbH
@@ -29627,6 +29679,7 @@ F0:C1:F1 Apple # Apple, Inc.
F0:C2:4C Zhejiang # Zhejiang FeiYue Digital Technology Co., Ltd
F0:C2:7C Mianyang # Mianyang Netop Telecom Equipment Co.,Ltd.
F0:C7:7F TexasIns # Texas Instruments
+F0:C8:50 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
F0:C8:8C Leddarte # LeddarTech Inc.
F0:CB:A1 Apple # Apple, Inc.
F0:D1:4F LinearLl # LINEAR LLC
diff --git a/services b/services
index 83f7c08564..37de7e5bf3 100644
--- a/services
+++ b/services
@@ -8203,6 +8203,8 @@ snap 4752/tcp # Simple Network Audio Protocol [Dameon_Wagner] [Dameo
snap 4752/udp # Simple Network Audio Protocol [Dameon_Wagner] [Dameon_Wagner] 2002-02
simon 4753/tcp # Simple Invocation of Methods Over Network (SIMON) [Alexander_Christian] [Alexander_Christian] 2012-04-19
simon-disc 4753/udp # Simple Invocation of Methods Over Network (SIMON) Discovery [Alexander_Christian] [Alexander_Christian] 2012-04-19
+gre-in-udp 4754/udp # GRE-in-UDP Encapsulation [IESG] [IETF_Chair] 2016-10-05 [RFC-ietf-tsvwg-gre-in-udp-encap-19]
+gre-udp-dtls 4755/udp # GRE-in-UDP Encapsulation with DTLS [IESG] [IETF_Chair] 2016-10-05 [RFC-ietf-tsvwg-gre-in-udp-encap-19]
converge 4774/tcp # Converge RPC [Asteris_LLC] [Steven_Borrelli] 2016-09-16
bfd-multi-ctl 4784/tcp # BFD Multihop Control [Dave_Katz][Dave_Ward] [Dave_Katz][Dave_Ward] 2006-02
bfd-multi-ctl 4784/udp # BFD Multihop Control [Dave_Katz][Dave_Ward] [Dave_Katz][Dave_Ward] 2006-02
@@ -10242,6 +10244,8 @@ swa-4 9026/tcp # Secure Web Access - 4 [Tim_McGranaghan] [Tim_McGrana
swa-4 9026/udp # Secure Web Access - 4 [Tim_McGranaghan] [Tim_McGranaghan]
versiera 9050/tcp # Versiera Agent Listener [Frank_Pikelner] [Frank_Pikelner] 2010-01-15
fio-cmgmt 9051/tcp # Fusion-io Central Manager Service [Jim_Sermersheim] [Jim_Sermersheim] 2010-01-15
+CardWeb-IO 9060/tcp # CardWeb request-response I/O exchange [Virtual_Electric_Inc] [David_Wyatt] 2016-10-07
+CardWeb-RT 9060/udp # CardWeb realtime device data [Virtual_Electric_Inc] [David_Wyatt] 2016-10-07
glrpc 9080/tcp # Groove GLRPC [Adrian_Popescu] [Adrian_Popescu] 2002-09
glrpc 9080/udp # Groove GLRPC [Adrian_Popescu] [Adrian_Popescu] 2002-09
lcs-ap 9082/sctp # LCS Application Protocol [Kimmo_Kymalainen] [Kimmo_Kymalainen] 2010-06-04
@@ -10833,6 +10837,7 @@ cps 14250/tcp # Fencing Server [Mayank_Vasa] [Mayank_Vasa] 2008-04-0
cps 14250/udp # Fencing Server [Mayank_Vasa] [Mayank_Vasa] 2008-04-03
ca-web-update 14414/tcp # CA eTrust Web Update Service [Robert_Ciochon] [Robert_Ciochon] 2006-08
ca-web-update 14414/udp # CA eTrust Web Update Service [Robert_Ciochon] [Robert_Ciochon] 2006-08
+xpra 14500/tcp # xpra network protocol [Xpra] [Antoine_Martin] 2016-10-05
hde-lcesrvr-1 14936/tcp # hde-lcesrvr-1 [Horizon_Digital_Ente] [Horizon_Digital_Ente]
hde-lcesrvr-1 14936/udp # hde-lcesrvr-1 [Horizon_Digital_Ente] [Horizon_Digital_Ente]
hde-lcesrvr-2 14937/tcp # hde-lcesrvr-2 [Horizon_Digital_Ente] [Horizon_Digital_Ente]
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 0a5de4dd82..295f2181b1 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -23,32 +23,32 @@
<translation>Wireshark</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="72"/>
+ <location filename="about_dialog.ui" line="75"/>
<source>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Network Protocol Analyzer&lt;/span&gt;</source>
<translation>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Programm zur Netzwerkprotokollanalyse&lt;/span&gt;</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="153"/>
+ <location filename="about_dialog.ui" line="156"/>
<source>Authors</source>
<translation>Autoren</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="167"/>
+ <location filename="about_dialog.ui" line="170"/>
<source>Folders</source>
<translation>Ordner</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="193"/>
+ <location filename="about_dialog.ui" line="196"/>
<source>Plugins</source>
<translation>Plugins</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="210"/>
+ <location filename="about_dialog.ui" line="213"/>
<source>Keyboard Shortcuts</source>
<translation>Tastaturkürzel</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="227"/>
+ <location filename="about_dialog.ui" line="230"/>
<source>License</source>
<translation>Lizenzen</translation>
</message>
@@ -1788,33 +1788,37 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>das &quot;@&quot; Symbol wird ignoriert.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="201"/>
+ <location filename="coloring_rules_dialog.cpp" line="202"/>
<source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
<translation>Doppelklicken zum Editieren. Ziehen zum Verschieben. Die Regeln werden der Reihe nach abgearbeitet bis zum ersten Treffer.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="324"/>
+ <location filename="coloring_rules_dialog.cpp" line="326"/>
<source>Import Coloring Rules</source>
<translation>Einfärbungsregeln importieren</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="340"/>
+ <location filename="coloring_rules_dialog.cpp" line="342"/>
<source>Export %1 Coloring Rules</source>
<translation>%1 Einfärbungsregeln exportieren</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="361"/>
+ <location filename="coloring_rules_dialog.cpp" line="363"/>
<source>Your coloring rules file contains unknown rules</source>
<translation>Die Einfärbungsregelndatei enthält unbekannte Regeln</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="362"/>
+ <location filename="coloring_rules_dialog.cpp" line="364"/>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
<oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
- <translation type="unfinished">Wireshark erkennt eine oder mehrere der Einfärbungsregeln nicht. Speichern verwirft diese.</translation>
+ <translation type="obsolete">Wireshark erkennt eine oder mehrere der Einfärbungsregeln nicht. Speichern verwirft diese.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="375"/>
+ <location filename="coloring_rules_dialog.cpp" line="376"/>
<source>Unable to save coloring rules: %s</source>
<translation>Einfärbungsregeln können nicht gespeichert werden: %s</translation>
</message>
@@ -2005,22 +2009,22 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>Dieses Dissektionsverhalten kopieren.</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="84"/>
+ <location filename="decode_as_dialog.cpp" line="86"/>
<source>Decode As</source>
<translation>Dekodieren als</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="383"/>
+ <location filename="decode_as_dialog.cpp" line="385"/>
<source>String</source>
<translation>Zeichenkette</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="385"/>
+ <location filename="decode_as_dialog.cpp" line="387"/>
<source>Integer, base </source>
<translation>Integer, base</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="397"/>
+ <location filename="decode_as_dialog.cpp" line="399"/>
<source>unknown</source>
<translation>unbekannt</translation>
</message>
@@ -4646,12 +4650,11 @@ für die Filterdateien kann nicht erstellt werden:
</message>
<message>
<location filename="interface_frame.ui" line="44"/>
- <location filename="interface_frame.cpp" line="161"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="66"/>
+ <location filename="interface_frame.ui" line="79"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4744,32 +4747,37 @@ für die Filterdateien kann nicht erstellt werden:
<context>
<name>InterfaceTreeModel</name>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="79"/>
+ <source>No Interfaces found!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Addresses</source>
<translation type="unfinished">Adressen</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Address</source>
<translation type="unfinished">Adresse</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="187"/>
+ <location filename="interface_tree_model.cpp" line="240"/>
<source>Extcap interface: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="192"/>
+ <location filename="interface_tree_model.cpp" line="245"/>
<source>No addresses</source>
<translation type="unfinished">Keine Adressen</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="199"/>
+ <location filename="interface_tree_model.cpp" line="252"/>
<source>No capture filter</source>
<translation type="unfinished">Kein Mitschnittfilter</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="204"/>
+ <location filename="interface_tree_model.cpp" line="257"/>
<source>Capture filter</source>
<translation type="unfinished">Mitschnittfilter</translation>
</message>
@@ -10303,7 +10311,7 @@ text-decoration: underline;
<translation>eine Einstellung</translation>
</message>
<message>
- <location filename="preference_editor_frame.cpp" line="77"/>
+ <location filename="preference_editor_frame.cpp" line="79"/>
<source>Open %1 preferences</source>
<translation>%1 Einstellungen öffnen</translation>
</message>
@@ -10372,7 +10380,7 @@ text-decoration: underline;
<translation>Wert</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="441"/>
+ <location filename="preferences_dialog.cpp" line="452"/>
<source>Preferences</source>
<translation>Einstellungen</translation>
</message>
@@ -10685,22 +10693,22 @@ text-decoration: underline;
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="109"/>
+ <location filename="preferences_dialog.cpp" line="111"/>
<source>Default</source>
<translation type="unfinished">Standard</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="111"/>
+ <location filename="preferences_dialog.cpp" line="113"/>
<source>Changed</source>
<translation type="unfinished">Geändert</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="129"/>
+ <location filename="preferences_dialog.cpp" line="131"/>
<source>Has this preference been changed?</source>
<translation>Wurde diese Einstellung geändert?</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="139"/>
+ <location filename="preferences_dialog.cpp" line="141"/>
<source>Default value is empty</source>
<translation>Standardwert ist leer</translation>
</message>
@@ -10977,12 +10985,12 @@ text-decoration: underline;
<translation>%1 Einträge.</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="182"/>
+ <location filename="module_preferences_scroll_area.cpp" line="184"/>
<source>Edit</source>
<translation>Editieren</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="209"/>
+ <location filename="module_preferences_scroll_area.cpp" line="211"/>
<source>Browse</source>
<translation>Öffnen</translation>
</message>
@@ -11233,7 +11241,7 @@ text-decoration: underline;
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
- <location filename="preferences_dialog.cpp" line="107"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
<source>Unknown</source>
<translation>Unbekannt</translation>
</message>
@@ -15360,12 +15368,12 @@ text-decoration: underline;
<translation>Öffnen</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="417"/>
+ <location filename="uat_dialog.cpp" line="419"/>
<source>Uneven number of chars hex string (%1)</source>
<translation>Ungerade Anzahl an Hexzeichen (%1)</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="424"/>
+ <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
<translation>Fehler beim Parsen der Hex Zeichenkette</translation>
</message>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index ce76631969..50aa20afdd 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -23,32 +23,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="about_dialog.ui" line="72"/>
+ <location filename="about_dialog.ui" line="75"/>
<source>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Network Protocol Analyzer&lt;/span&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="about_dialog.ui" line="153"/>
+ <location filename="about_dialog.ui" line="156"/>
<source>Authors</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="about_dialog.ui" line="167"/>
+ <location filename="about_dialog.ui" line="170"/>
<source>Folders</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="about_dialog.ui" line="193"/>
+ <location filename="about_dialog.ui" line="196"/>
<source>Plugins</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="about_dialog.ui" line="210"/>
+ <location filename="about_dialog.ui" line="213"/>
<source>Keyboard Shortcuts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="about_dialog.ui" line="227"/>
+ <location filename="about_dialog.ui" line="230"/>
<source>License</source>
<translation type="unfinished"></translation>
</message>
@@ -1728,33 +1728,32 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="201"/>
+ <location filename="coloring_rules_dialog.cpp" line="202"/>
<source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="324"/>
+ <location filename="coloring_rules_dialog.cpp" line="326"/>
<source>Import Coloring Rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="340"/>
+ <location filename="coloring_rules_dialog.cpp" line="342"/>
<source>Export %1 Coloring Rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="361"/>
+ <location filename="coloring_rules_dialog.cpp" line="363"/>
<source>Your coloring rules file contains unknown rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="362"/>
- <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
- <oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
+ <location filename="coloring_rules_dialog.cpp" line="364"/>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="375"/>
+ <location filename="coloring_rules_dialog.cpp" line="376"/>
<source>Unable to save coloring rules: %s</source>
<translation type="unfinished"></translation>
</message>
@@ -1945,22 +1944,22 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="84"/>
+ <location filename="decode_as_dialog.cpp" line="86"/>
<source>Decode As</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="383"/>
+ <location filename="decode_as_dialog.cpp" line="385"/>
<source>String</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="385"/>
+ <location filename="decode_as_dialog.cpp" line="387"/>
<source>Integer, base </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="397"/>
+ <location filename="decode_as_dialog.cpp" line="399"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
@@ -4540,12 +4539,11 @@ for filter files: %2.</source>
</message>
<message>
<location filename="interface_frame.ui" line="44"/>
- <location filename="interface_frame.cpp" line="161"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="66"/>
+ <location filename="interface_frame.ui" line="79"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4603,32 +4601,37 @@ for filter files: %2.</source>
<context>
<name>InterfaceTreeModel</name>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="79"/>
+ <source>No Interfaces found!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Addresses</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="187"/>
+ <location filename="interface_tree_model.cpp" line="240"/>
<source>Extcap interface: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="192"/>
+ <location filename="interface_tree_model.cpp" line="245"/>
<source>No addresses</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="199"/>
+ <location filename="interface_tree_model.cpp" line="252"/>
<source>No capture filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="204"/>
+ <location filename="interface_tree_model.cpp" line="257"/>
<source>Capture filter</source>
<translation type="unfinished"></translation>
</message>
@@ -10086,7 +10089,7 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="preference_editor_frame.cpp" line="77"/>
+ <location filename="preference_editor_frame.cpp" line="79"/>
<source>Open %1 preferences</source>
<translation type="unfinished"></translation>
</message>
@@ -10155,7 +10158,7 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="441"/>
+ <location filename="preferences_dialog.cpp" line="452"/>
<source>Preferences</source>
<translation type="unfinished"></translation>
</message>
@@ -10456,22 +10459,22 @@ a:hover {
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="109"/>
+ <location filename="preferences_dialog.cpp" line="111"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="111"/>
+ <location filename="preferences_dialog.cpp" line="113"/>
<source>Changed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="129"/>
+ <location filename="preferences_dialog.cpp" line="131"/>
<source>Has this preference been changed?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="139"/>
+ <location filename="preferences_dialog.cpp" line="141"/>
<source>Default value is empty</source>
<translation type="unfinished"></translation>
</message>
@@ -10740,12 +10743,12 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="182"/>
+ <location filename="module_preferences_scroll_area.cpp" line="184"/>
<source>Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="209"/>
+ <location filename="module_preferences_scroll_area.cpp" line="211"/>
<source>Browse</source>
<translation type="unfinished"></translation>
</message>
@@ -10996,7 +10999,7 @@ a:hover {
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
- <location filename="preferences_dialog.cpp" line="107"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
<source>Unknown</source>
<translation type="unfinished"></translation>
</message>
@@ -15018,12 +15021,12 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="417"/>
+ <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="424"/>
+ <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 611efe6bf8..680e29d435 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -23,32 +23,32 @@
<translation>Wireshark</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="72"/>
+ <location filename="about_dialog.ui" line="75"/>
<source>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Network Protocol Analyzer&lt;/span&gt;</source>
<translation>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Analyseur de Protocole réseau&lt;/span&gt;</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="153"/>
+ <location filename="about_dialog.ui" line="156"/>
<source>Authors</source>
<translation>Auteurs</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="167"/>
+ <location filename="about_dialog.ui" line="170"/>
<source>Folders</source>
<translation>Dossiers</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="193"/>
+ <location filename="about_dialog.ui" line="196"/>
<source>Plugins</source>
<translation>Modules complémentaires</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="210"/>
+ <location filename="about_dialog.ui" line="213"/>
<source>Keyboard Shortcuts</source>
<translation>Raccourcis clavier</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="227"/>
+ <location filename="about_dialog.ui" line="230"/>
<source>License</source>
<translation>Licence</translation>
</message>
@@ -1789,33 +1789,37 @@ si vous voulez utiliser des fichiers multiples.</translation>
<translation>le caractère &quot;@&quot; sera ignoré.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="201"/>
+ <location filename="coloring_rules_dialog.cpp" line="202"/>
<source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
<translation>Double-cliquer pour éditer. Glisser pour déplacer. Les règles sont traitées dans l&apos;ordre jusqu&apos;à trouver une correspondance.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="324"/>
+ <location filename="coloring_rules_dialog.cpp" line="326"/>
<source>Import Coloring Rules</source>
<translation>Importer des règles de coloration</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="340"/>
+ <location filename="coloring_rules_dialog.cpp" line="342"/>
<source>Export %1 Coloring Rules</source>
<translation>Exporter %1 règles de coloration</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="361"/>
+ <location filename="coloring_rules_dialog.cpp" line="363"/>
<source>Your coloring rules file contains unknown rules</source>
<translation>Votre fichier de règles de coloriage contient des règles inconnues.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="362"/>
+ <location filename="coloring_rules_dialog.cpp" line="364"/>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
<oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
- <translation type="unfinished">Wireshark ne reconnaît pas une ou plusieurs de vos règles de coloriage. Sauvegarder les supprimera.</translation>
+ <translation type="obsolete">Wireshark ne reconnaît pas une ou plusieurs de vos règles de coloriage. Sauvegarder les supprimera.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="375"/>
+ <location filename="coloring_rules_dialog.cpp" line="376"/>
<source>Unable to save coloring rules: %s</source>
<translation type="unfinished"></translation>
</message>
@@ -2006,22 +2010,22 @@ si vous voulez utiliser des fichiers multiples.</translation>
<translation>Copier la dissection.</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="84"/>
+ <location filename="decode_as_dialog.cpp" line="86"/>
<source>Decode As</source>
<translation>Décoder comme</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="383"/>
+ <location filename="decode_as_dialog.cpp" line="385"/>
<source>String</source>
<translation>Chaine de Caractères</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="385"/>
+ <location filename="decode_as_dialog.cpp" line="387"/>
<source>Integer, base </source>
<translation>Nombre</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="397"/>
+ <location filename="decode_as_dialog.cpp" line="399"/>
<source>unknown</source>
<translation>inconnu</translation>
</message>
@@ -4649,12 +4653,11 @@ pour fichiers de filtre : %2.</translation>
</message>
<message>
<location filename="interface_frame.ui" line="44"/>
- <location filename="interface_frame.cpp" line="161"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="66"/>
+ <location filename="interface_frame.ui" line="79"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4747,32 +4750,37 @@ pour fichiers de filtre : %2.</translation>
<context>
<name>InterfaceTreeModel</name>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="79"/>
+ <source>No Interfaces found!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Addresses</source>
<translation type="unfinished">Adresses</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Address</source>
<translation type="unfinished">Adresse</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="187"/>
+ <location filename="interface_tree_model.cpp" line="240"/>
<source>Extcap interface: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="192"/>
+ <location filename="interface_tree_model.cpp" line="245"/>
<source>No addresses</source>
<translation type="unfinished">Pas d&apos;adresse</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="199"/>
+ <location filename="interface_tree_model.cpp" line="252"/>
<source>No capture filter</source>
<translation type="unfinished">Pas de filtre de capture</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="204"/>
+ <location filename="interface_tree_model.cpp" line="257"/>
<source>Capture filter</source>
<translation type="unfinished">Filtre de capture</translation>
</message>
@@ -10277,7 +10285,7 @@ a:hover {
<translation>une préférence</translation>
</message>
<message>
- <location filename="preference_editor_frame.cpp" line="77"/>
+ <location filename="preference_editor_frame.cpp" line="79"/>
<source>Open %1 preferences</source>
<translation>Ouvrir les préférences %1</translation>
</message>
@@ -10346,7 +10354,7 @@ a:hover {
<translation>Valeur</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="441"/>
+ <location filename="preferences_dialog.cpp" line="452"/>
<source>Preferences</source>
<translation>Préférences</translation>
</message>
@@ -10659,22 +10667,22 @@ a:hover {
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="109"/>
+ <location filename="preferences_dialog.cpp" line="111"/>
<source>Default</source>
<translation type="unfinished">Défaut</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="111"/>
+ <location filename="preferences_dialog.cpp" line="113"/>
<source>Changed</source>
<translation type="unfinished">Modifier</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="129"/>
+ <location filename="preferences_dialog.cpp" line="131"/>
<source>Has this preference been changed?</source>
<translation>Cette préférence a été changé?</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="139"/>
+ <location filename="preferences_dialog.cpp" line="141"/>
<source>Default value is empty</source>
<translation>La valeur par défaut est vide</translation>
</message>
@@ -10951,12 +10959,12 @@ a:hover {
<translation>%1 entrées.</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="182"/>
+ <location filename="module_preferences_scroll_area.cpp" line="184"/>
<source>Edit</source>
<translation>Editer</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="209"/>
+ <location filename="module_preferences_scroll_area.cpp" line="211"/>
<source>Browse</source>
<translation>Parcourir</translation>
</message>
@@ -11207,7 +11215,7 @@ a:hover {
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
- <location filename="preferences_dialog.cpp" line="107"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
<source>Unknown</source>
<translation>Inconnu</translation>
</message>
@@ -15306,12 +15314,12 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Ouvrir </translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="417"/>
+ <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>
</message>
<message>
- <location filename="uat_dialog.cpp" line="424"/>
+ <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
<translation>Erreur de conversion de la chaine hex</translation>
</message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 3b72c980cd..01c87b6a8e 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -23,32 +23,32 @@
<translation>Wireshark</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="72"/>
+ <location filename="about_dialog.ui" line="75"/>
<source>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Network Protocol Analyzer&lt;/span&gt;</source>
<translation>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Analizzatore di protocolli di rete&lt;/span&gt;</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="153"/>
+ <location filename="about_dialog.ui" line="156"/>
<source>Authors</source>
<translation>Autori</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="167"/>
+ <location filename="about_dialog.ui" line="170"/>
<source>Folders</source>
<translation>Cartelle</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="193"/>
+ <location filename="about_dialog.ui" line="196"/>
<source>Plugins</source>
<translation>Plugin</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="210"/>
+ <location filename="about_dialog.ui" line="213"/>
<source>Keyboard Shortcuts</source>
<translation>Scorciatoie da tastiera</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="227"/>
+ <location filename="about_dialog.ui" line="230"/>
<source>License</source>
<translation>Licenza</translation>
</message>
@@ -1788,33 +1788,37 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>il simbolo &quot;@&quot; sarà ignorato.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="201"/>
+ <location filename="coloring_rules_dialog.cpp" line="202"/>
<source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
<translation>Doppio clic per modificare. Trascina per spostare. Le regole sono elaborate in ordine fino alla prima corrispondenza.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="324"/>
+ <location filename="coloring_rules_dialog.cpp" line="326"/>
<source>Import Coloring Rules</source>
<translation>Importazione regole di colorazione</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="340"/>
+ <location filename="coloring_rules_dialog.cpp" line="342"/>
<source>Export %1 Coloring Rules</source>
<translation>Esporta %1 regole di colorazione</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="361"/>
+ <location filename="coloring_rules_dialog.cpp" line="363"/>
<source>Your coloring rules file contains unknown rules</source>
<translation>Il file delle tue regole di colorazione contiene regole sconosciute</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="362"/>
+ <location filename="coloring_rules_dialog.cpp" line="364"/>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
<oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
- <translation type="unfinished">Wireshark non riconosce una o più delle tue regole di colorazione. Il salvataggio le rimuoverà.</translation>
+ <translation type="obsolete">Wireshark non riconosce una o più delle tue regole di colorazione. Il salvataggio le rimuoverà.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="375"/>
+ <location filename="coloring_rules_dialog.cpp" line="376"/>
<source>Unable to save coloring rules: %s</source>
<translation>Impossibile salvare le regole di colorazione: %s</translation>
</message>
@@ -2005,22 +2009,22 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>Copia il comportamento di questa decodifica.</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="84"/>
+ <location filename="decode_as_dialog.cpp" line="86"/>
<source>Decode As</source>
<translation>Decodifica come</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="383"/>
+ <location filename="decode_as_dialog.cpp" line="385"/>
<source>String</source>
<translation>Stringa</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="385"/>
+ <location filename="decode_as_dialog.cpp" line="387"/>
<source>Integer, base </source>
<translation>Intero, base </translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="397"/>
+ <location filename="decode_as_dialog.cpp" line="399"/>
<source>unknown</source>
<translation>sconosciuto</translation>
</message>
@@ -4644,12 +4648,11 @@ per i file di filtro: %2.</translation>
</message>
<message>
<location filename="interface_frame.ui" line="44"/>
- <location filename="interface_frame.cpp" line="161"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="66"/>
+ <location filename="interface_frame.ui" line="79"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4742,32 +4745,37 @@ per i file di filtro: %2.</translation>
<context>
<name>InterfaceTreeModel</name>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="79"/>
+ <source>No Interfaces found!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Addresses</source>
<translation type="unfinished">Indirizzi</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Address</source>
<translation type="unfinished">Indirizzo</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="187"/>
+ <location filename="interface_tree_model.cpp" line="240"/>
<source>Extcap interface: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="192"/>
+ <location filename="interface_tree_model.cpp" line="245"/>
<source>No addresses</source>
<translation type="unfinished">Nessun indirizzo</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="199"/>
+ <location filename="interface_tree_model.cpp" line="252"/>
<source>No capture filter</source>
<translation type="unfinished">Nessun filtro di cattura</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="204"/>
+ <location filename="interface_tree_model.cpp" line="257"/>
<source>Capture filter</source>
<translation type="unfinished">Filtro di cattura</translation>
</message>
@@ -10301,7 +10309,7 @@ a:hover {
<translation>una preferenza</translation>
</message>
<message>
- <location filename="preference_editor_frame.cpp" line="77"/>
+ <location filename="preference_editor_frame.cpp" line="79"/>
<source>Open %1 preferences</source>
<translation>Apri le preferenze di %1</translation>
</message>
@@ -10370,7 +10378,7 @@ a:hover {
<translation>Valore</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="441"/>
+ <location filename="preferences_dialog.cpp" line="452"/>
<source>Preferences</source>
<translation>Preferenze</translation>
</message>
@@ -10683,22 +10691,22 @@ a:hover {
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="109"/>
+ <location filename="preferences_dialog.cpp" line="111"/>
<source>Default</source>
<translation type="unfinished">Predefinito</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="111"/>
+ <location filename="preferences_dialog.cpp" line="113"/>
<source>Changed</source>
<translation type="unfinished">Modificato</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="129"/>
+ <location filename="preferences_dialog.cpp" line="131"/>
<source>Has this preference been changed?</source>
<translation>Questa impostazione è stata cambiata?</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="139"/>
+ <location filename="preferences_dialog.cpp" line="141"/>
<source>Default value is empty</source>
<translation>Il valore predefinito è vuoto</translation>
</message>
@@ -10975,12 +10983,12 @@ a:hover {
<translation>%1 voci.</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="182"/>
+ <location filename="module_preferences_scroll_area.cpp" line="184"/>
<source>Edit</source>
<translation>Modifica</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="209"/>
+ <location filename="module_preferences_scroll_area.cpp" line="211"/>
<source>Browse</source>
<translation>Sfoglia</translation>
</message>
@@ -11231,7 +11239,7 @@ a:hover {
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
- <location filename="preferences_dialog.cpp" line="107"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
<source>Unknown</source>
<translation>Sconosciuto</translation>
</message>
@@ -15353,12 +15361,12 @@ a:hover {
<translation>Apri </translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="417"/>
+ <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>
</message>
<message>
- <location filename="uat_dialog.cpp" line="424"/>
+ <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
<translation>Errore di elaborazione della stringa esadecimale</translation>
</message>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 0510b667cd..9f67339d63 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -23,32 +23,32 @@
<translation>Wireshark</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="72"/>
+ <location filename="about_dialog.ui" line="75"/>
<source>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Network Protocol Analyzer&lt;/span&gt;</source>
<translation>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;ネットワークプロトコルアナライザ&lt;/span&gt;</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="153"/>
+ <location filename="about_dialog.ui" line="156"/>
<source>Authors</source>
<translation>作者</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="167"/>
+ <location filename="about_dialog.ui" line="170"/>
<source>Folders</source>
<translation>フォルダ</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="193"/>
+ <location filename="about_dialog.ui" line="196"/>
<source>Plugins</source>
<translation>プラグイン</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="210"/>
+ <location filename="about_dialog.ui" line="213"/>
<source>Keyboard Shortcuts</source>
<translation>キーボードショートカット</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="227"/>
+ <location filename="about_dialog.ui" line="230"/>
<source>License</source>
<translation>ライセンス</translation>
</message>
@@ -1785,33 +1785,37 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>この &quot;@&quot; シンボルは無視されます</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="201"/>
+ <location filename="coloring_rules_dialog.cpp" line="202"/>
<source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
<translation>ダブルクリックして編集します。ドラッグして動かします。ルールは一致が見つかるまで順番に処理されます</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="324"/>
+ <location filename="coloring_rules_dialog.cpp" line="326"/>
<source>Import Coloring Rules</source>
<translation>色付けルールをインポート</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="340"/>
+ <location filename="coloring_rules_dialog.cpp" line="342"/>
<source>Export %1 Coloring Rules</source>
<translation>%1 色付けルールをエクスポート</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="361"/>
+ <location filename="coloring_rules_dialog.cpp" line="363"/>
<source>Your coloring rules file contains unknown rules</source>
<translation>あなたの色付けルールのファイルは未知のルールを含んでいます。</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="362"/>
+ <location filename="coloring_rules_dialog.cpp" line="364"/>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
<oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
- <translation type="unfinished">Wiresharkはひとつかそれ以上の色付けルールを認識できません。保存は破棄されます。</translation>
+ <translation type="obsolete">Wiresharkはひとつかそれ以上の色付けルールを認識できません。保存は破棄されます。</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="375"/>
+ <location filename="coloring_rules_dialog.cpp" line="376"/>
<source>Unable to save coloring rules: %s</source>
<translation>色付けルール %s を保存できません</translation>
</message>
@@ -2002,22 +2006,22 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>このダイセクターの振る舞いをコピーします</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="84"/>
+ <location filename="decode_as_dialog.cpp" line="86"/>
<source>Decode As</source>
<translation>としてデコード</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="383"/>
+ <location filename="decode_as_dialog.cpp" line="385"/>
<source>String</source>
<translation>文字列</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="385"/>
+ <location filename="decode_as_dialog.cpp" line="387"/>
<source>Integer, base </source>
<translation>整数型, 基数</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="397"/>
+ <location filename="decode_as_dialog.cpp" line="399"/>
<source>unknown</source>
<translation>不明</translation>
</message>
@@ -4629,12 +4633,11 @@ for filter files: %2.</source>
</message>
<message>
<location filename="interface_frame.ui" line="44"/>
- <location filename="interface_frame.cpp" line="161"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="66"/>
+ <location filename="interface_frame.ui" line="79"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4727,32 +4730,37 @@ for filter files: %2.</source>
<context>
<name>InterfaceTreeModel</name>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="79"/>
+ <source>No Interfaces found!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Addresses</source>
<translation type="unfinished">アドレス</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Address</source>
<translation type="unfinished">アドレス</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="187"/>
+ <location filename="interface_tree_model.cpp" line="240"/>
<source>Extcap interface: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="192"/>
+ <location filename="interface_tree_model.cpp" line="245"/>
<source>No addresses</source>
<translation type="unfinished">アドレスなし</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="199"/>
+ <location filename="interface_tree_model.cpp" line="252"/>
<source>No capture filter</source>
<translation type="unfinished">キャプチャフィルタなし</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="204"/>
+ <location filename="interface_tree_model.cpp" line="257"/>
<source>Capture filter</source>
<translation type="unfinished">キャプチャフィルタ</translation>
</message>
@@ -10257,7 +10265,7 @@ a:hover {
<translation>設定</translation>
</message>
<message>
- <location filename="preference_editor_frame.cpp" line="77"/>
+ <location filename="preference_editor_frame.cpp" line="79"/>
<source>Open %1 preferences</source>
<translation>%1 設定を開く</translation>
</message>
@@ -10326,7 +10334,7 @@ a:hover {
<translation>値</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="441"/>
+ <location filename="preferences_dialog.cpp" line="452"/>
<source>Preferences</source>
<translation>設定</translation>
</message>
@@ -10639,22 +10647,22 @@ a:hover {
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="109"/>
+ <location filename="preferences_dialog.cpp" line="111"/>
<source>Default</source>
<translation type="unfinished">デフォルト</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="111"/>
+ <location filename="preferences_dialog.cpp" line="113"/>
<source>Changed</source>
<translation type="unfinished">変更された</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="129"/>
+ <location filename="preferences_dialog.cpp" line="131"/>
<source>Has this preference been changed?</source>
<translation>この設定を変更されましたか?</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="139"/>
+ <location filename="preferences_dialog.cpp" line="141"/>
<source>Default value is empty</source>
<translation>デフォルト値は空です</translation>
</message>
@@ -10931,12 +10939,12 @@ a:hover {
<translation>%1 エントリ</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="182"/>
+ <location filename="module_preferences_scroll_area.cpp" line="184"/>
<source>Edit</source>
<translation>編集</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="209"/>
+ <location filename="module_preferences_scroll_area.cpp" line="211"/>
<source>Browse</source>
<translation>参照</translation>
</message>
@@ -11187,7 +11195,7 @@ a:hover {
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
- <location filename="preferences_dialog.cpp" line="107"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
<source>Unknown</source>
<translation>不明</translation>
</message>
@@ -15287,12 +15295,12 @@ a:hover {
<translation>開く </translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="417"/>
+ <location filename="uat_dialog.cpp" line="419"/>
<source>Uneven number of chars hex string (%1)</source>
<translation>奇数番号の16進数文字(%1)</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="424"/>
+ <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
<translation>16進数文字列の解釈エラー</translation>
</message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 2aedad240d..c395d4c254 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -23,32 +23,32 @@
<translation>Wireshark</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="72"/>
+ <location filename="about_dialog.ui" line="75"/>
<source>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Network Protocol Analyzer&lt;/span&gt;</source>
<translation>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Analizator Protokołów&lt;/span&gt;</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="153"/>
+ <location filename="about_dialog.ui" line="156"/>
<source>Authors</source>
<translation>Autorzy</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="167"/>
+ <location filename="about_dialog.ui" line="170"/>
<source>Folders</source>
<translation>Foldery</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="193"/>
+ <location filename="about_dialog.ui" line="196"/>
<source>Plugins</source>
<translation>Wtyczki</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="210"/>
+ <location filename="about_dialog.ui" line="213"/>
<source>Keyboard Shortcuts</source>
<translation>Skróty klawiaturowe</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="227"/>
+ <location filename="about_dialog.ui" line="230"/>
<source>License</source>
<translation>Licencja</translation>
</message>
@@ -1787,33 +1787,37 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<translation>Symbol &quot;@&quot; będzie zignorowany.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="201"/>
+ <location filename="coloring_rules_dialog.cpp" line="202"/>
<source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
<translation>Kliknij podwójnie by edytować. Przeciągnij by przenieść. Reguły są przetwarzane zgodnie z kolejnością aż do znalezienia pasującej reguły.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="324"/>
+ <location filename="coloring_rules_dialog.cpp" line="326"/>
<source>Import Coloring Rules</source>
<translation>Importuj reguły kolorowania</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="340"/>
+ <location filename="coloring_rules_dialog.cpp" line="342"/>
<source>Export %1 Coloring Rules</source>
<translation>Wyeksportuj %1 reguły kolorowania</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="361"/>
+ <location filename="coloring_rules_dialog.cpp" line="363"/>
<source>Your coloring rules file contains unknown rules</source>
<translation>Twój plik z regułami kolorowania zawiera błędną regułę</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="362"/>
+ <location filename="coloring_rules_dialog.cpp" line="364"/>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
<oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
- <translation type="unfinished">Wireshark nie rozpoznał jednej lub wększej ilości twoich reguł kolorowania.Zapis spowoduje usunięcie ich.</translation>
+ <translation type="obsolete">Wireshark nie rozpoznał jednej lub wększej ilości twoich reguł kolorowania.Zapis spowoduje usunięcie ich.</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="375"/>
+ <location filename="coloring_rules_dialog.cpp" line="376"/>
<source>Unable to save coloring rules: %s</source>
<translation>Nie można zapisać reguł kolorowania: %s</translation>
</message>
@@ -2004,22 +2008,22 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<translation>Kopiuj regułę.</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="84"/>
+ <location filename="decode_as_dialog.cpp" line="86"/>
<source>Decode As</source>
<translation>Dekoduj jako</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="383"/>
+ <location filename="decode_as_dialog.cpp" line="385"/>
<source>String</source>
<translation>String</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="385"/>
+ <location filename="decode_as_dialog.cpp" line="387"/>
<source>Integer, base </source>
<translation>Integer, o podstawie </translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="397"/>
+ <location filename="decode_as_dialog.cpp" line="399"/>
<source>unknown</source>
<translation>nieznany</translation>
</message>
@@ -4643,12 +4647,11 @@ dla plików filtrów: %2.</translation>
</message>
<message>
<location filename="interface_frame.ui" line="44"/>
- <location filename="interface_frame.cpp" line="161"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="66"/>
+ <location filename="interface_frame.ui" line="79"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4741,32 +4744,37 @@ dla plików filtrów: %2.</translation>
<context>
<name>InterfaceTreeModel</name>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="79"/>
+ <source>No Interfaces found!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Addresses</source>
<translation type="unfinished">Adresy</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Address</source>
<translation type="unfinished">Adres</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="187"/>
+ <location filename="interface_tree_model.cpp" line="240"/>
<source>Extcap interface: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="192"/>
+ <location filename="interface_tree_model.cpp" line="245"/>
<source>No addresses</source>
<translation type="unfinished">Brak adresu</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="199"/>
+ <location filename="interface_tree_model.cpp" line="252"/>
<source>No capture filter</source>
<translation type="unfinished">Brak filtru przechwytywania</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="204"/>
+ <location filename="interface_tree_model.cpp" line="257"/>
<source>Capture filter</source>
<translation type="unfinished">Filtr przechwytywania</translation>
</message>
@@ -10302,7 +10310,7 @@ text-decoration: underline;
<translation>ustawienie</translation>
</message>
<message>
- <location filename="preference_editor_frame.cpp" line="77"/>
+ <location filename="preference_editor_frame.cpp" line="79"/>
<source>Open %1 preferences</source>
<translation>Otwiera ustawienia %1</translation>
</message>
@@ -10371,7 +10379,7 @@ text-decoration: underline;
<translation>Wartość</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="441"/>
+ <location filename="preferences_dialog.cpp" line="452"/>
<source>Preferences</source>
<translation>Preferencje</translation>
</message>
@@ -10684,22 +10692,22 @@ text-decoration: underline;
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="109"/>
+ <location filename="preferences_dialog.cpp" line="111"/>
<source>Default</source>
<translation type="unfinished">Domyślne</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="111"/>
+ <location filename="preferences_dialog.cpp" line="113"/>
<source>Changed</source>
<translation type="unfinished">Zmienione</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="129"/>
+ <location filename="preferences_dialog.cpp" line="131"/>
<source>Has this preference been changed?</source>
<translation>Czy to ustawienie zostało zmienione?</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="139"/>
+ <location filename="preferences_dialog.cpp" line="141"/>
<source>Default value is empty</source>
<translation>Domyślna wartość jest pusta</translation>
</message>
@@ -10976,12 +10984,12 @@ text-decoration: underline;
<translation>%1 wpisów.</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="182"/>
+ <location filename="module_preferences_scroll_area.cpp" line="184"/>
<source>Edit</source>
<translation>Edytuj</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="209"/>
+ <location filename="module_preferences_scroll_area.cpp" line="211"/>
<source>Browse</source>
<translation>Przeglądaj</translation>
</message>
@@ -11232,7 +11240,7 @@ text-decoration: underline;
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
- <location filename="preferences_dialog.cpp" line="107"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
<source>Unknown</source>
<translation>Nienany</translation>
</message>
@@ -15358,12 +15366,12 @@ text-decoration: underline;
<translation>Otwórz</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="417"/>
+ <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>
</message>
<message>
- <location filename="uat_dialog.cpp" line="424"/>
+ <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
<translation>Błąd analizowania szesnastkowego strumienia znaków</translation>
</message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 7bf2196207..4d7c0b974e 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -23,32 +23,32 @@
<translation>Wireshark</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="72"/>
+ <location filename="about_dialog.ui" line="75"/>
<source>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;Network Protocol Analyzer&lt;/span&gt;</source>
<translation>&lt;span size=\&quot;x-large\&quot; weight=\&quot;bold\&quot;&gt;网络协议分析器&lt;/span&gt;</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="153"/>
+ <location filename="about_dialog.ui" line="156"/>
<source>Authors</source>
<translation>作者</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="167"/>
+ <location filename="about_dialog.ui" line="170"/>
<source>Folders</source>
<translation>文件夹</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="193"/>
+ <location filename="about_dialog.ui" line="196"/>
<source>Plugins</source>
<translation>插件</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="210"/>
+ <location filename="about_dialog.ui" line="213"/>
<source>Keyboard Shortcuts</source>
<translation>快捷键</translation>
</message>
<message>
- <location filename="about_dialog.ui" line="227"/>
+ <location filename="about_dialog.ui" line="230"/>
<source>License</source>
<translation>许可</translation>
</message>
@@ -1787,33 +1787,37 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>忽略&quot;@&quot;符号。</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="201"/>
+ <location filename="coloring_rules_dialog.cpp" line="202"/>
<source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
<translation>双击编辑。拖拽移动。规则按顺序进行处理,直到找到一个匹配的。</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="324"/>
+ <location filename="coloring_rules_dialog.cpp" line="326"/>
<source>Import Coloring Rules</source>
<translation>导入着色规则</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="340"/>
+ <location filename="coloring_rules_dialog.cpp" line="342"/>
<source>Export %1 Coloring Rules</source>
<translation>导出 %1 着色规则</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="361"/>
+ <location filename="coloring_rules_dialog.cpp" line="363"/>
<source>Your coloring rules file contains unknown rules</source>
<translation>您的着色规则文件包含未知规则</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="362"/>
+ <location filename="coloring_rules_dialog.cpp" line="364"/>
+ <source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will disable them.</source>
<oldsource>Wireshark doesn&apos;t recognize one or more of your coloring rules. Saving will discard them.</oldsource>
- <translation type="unfinished">Wireshark 无法识别您的一个或多个着色规则。保存将会丢弃它们。</translation>
+ <translation type="obsolete">Wireshark 无法识别您的一个或多个着色规则。保存将会丢弃它们。</translation>
</message>
<message>
- <location filename="coloring_rules_dialog.cpp" line="375"/>
+ <location filename="coloring_rules_dialog.cpp" line="376"/>
<source>Unable to save coloring rules: %s</source>
<translation>无法保存着色规则: %s</translation>
</message>
@@ -2004,22 +2008,22 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>复制解析行为。</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="84"/>
+ <location filename="decode_as_dialog.cpp" line="86"/>
<source>Decode As</source>
<translation>解码</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="383"/>
+ <location filename="decode_as_dialog.cpp" line="385"/>
<source>String</source>
<translation>字符串</translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="385"/>
+ <location filename="decode_as_dialog.cpp" line="387"/>
<source>Integer, base </source>
<translation>整数,底数 </translation>
</message>
<message>
- <location filename="decode_as_dialog.cpp" line="397"/>
+ <location filename="decode_as_dialog.cpp" line="399"/>
<source>unknown</source>
<translation>未知</translation>
</message>
@@ -4636,12 +4640,11 @@ for filter files: %2.</source>
</message>
<message>
<location filename="interface_frame.ui" line="44"/>
- <location filename="interface_frame.cpp" line="161"/>
<source>No interfaces found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.ui" line="66"/>
+ <location filename="interface_frame.ui" line="79"/>
<source>Show Interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4734,32 +4737,37 @@ for filter files: %2.</source>
<context>
<name>InterfaceTreeModel</name>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="79"/>
+ <source>No Interfaces found!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Addresses</source>
<translation type="unfinished">地址</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="180"/>
+ <location filename="interface_tree_model.cpp" line="233"/>
<source>Address</source>
<translation type="unfinished">地址</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="187"/>
+ <location filename="interface_tree_model.cpp" line="240"/>
<source>Extcap interface: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="192"/>
+ <location filename="interface_tree_model.cpp" line="245"/>
<source>No addresses</source>
<translation type="unfinished">无地址</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="199"/>
+ <location filename="interface_tree_model.cpp" line="252"/>
<source>No capture filter</source>
<translation type="unfinished">无捕获过滤器</translation>
</message>
<message>
- <location filename="interface_tree_model.cpp" line="204"/>
+ <location filename="interface_tree_model.cpp" line="257"/>
<source>Capture filter</source>
<translation type="unfinished">捕获过滤器</translation>
</message>
@@ -10289,7 +10297,7 @@ text-decoration: underline;
<translation>一个首选项</translation>
</message>
<message>
- <location filename="preference_editor_frame.cpp" line="77"/>
+ <location filename="preference_editor_frame.cpp" line="79"/>
<source>Open %1 preferences</source>
<translation>打开 %1 首选项</translation>
</message>
@@ -10358,7 +10366,7 @@ text-decoration: underline;
<translation>值</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="441"/>
+ <location filename="preferences_dialog.cpp" line="452"/>
<source>Preferences</source>
<translation>首选项</translation>
</message>
@@ -10671,22 +10679,22 @@ text-decoration: underline;
<context>
<name>QObject</name>
<message>
- <location filename="preferences_dialog.cpp" line="109"/>
+ <location filename="preferences_dialog.cpp" line="111"/>
<source>Default</source>
<translation type="unfinished">默认</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="111"/>
+ <location filename="preferences_dialog.cpp" line="113"/>
<source>Changed</source>
<translation type="unfinished">已更改</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="129"/>
+ <location filename="preferences_dialog.cpp" line="131"/>
<source>Has this preference been changed?</source>
<translation>此首选项已被更改?</translation>
</message>
<message>
- <location filename="preferences_dialog.cpp" line="139"/>
+ <location filename="preferences_dialog.cpp" line="141"/>
<source>Default value is empty</source>
<translation>默认值为空</translation>
</message>
@@ -10963,12 +10971,12 @@ text-decoration: underline;
<translation>%1 项。</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="182"/>
+ <location filename="module_preferences_scroll_area.cpp" line="184"/>
<source>Edit</source>
<translation>编辑</translation>
</message>
<message>
- <location filename="module_preferences_scroll_area.cpp" line="209"/>
+ <location filename="module_preferences_scroll_area.cpp" line="211"/>
<source>Browse</source>
<translation>浏览</translation>
</message>
@@ -11219,7 +11227,7 @@ text-decoration: underline;
</message>
<message>
<location filename="lte_rlc_statistics_dialog.cpp" line="176"/>
- <location filename="preferences_dialog.cpp" line="107"/>
+ <location filename="preferences_dialog.cpp" line="109"/>
<source>Unknown</source>
<translation>未知</translation>
</message>
@@ -15315,12 +15323,12 @@ text-decoration: underline;
<translation>打开</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="417"/>
+ <location filename="uat_dialog.cpp" line="419"/>
<source>Uneven number of chars hex string (%1)</source>
<translation>字符十六进制字符串 (%1) 的奇数</translation>
</message>
<message>
- <location filename="uat_dialog.cpp" line="424"/>
+ <location filename="uat_dialog.cpp" line="426"/>
<source>Error parsing hex string</source>
<translation>解析十六进制字符串出错</translation>
</message>