summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--epan/enterprise-numbers98
-rw-r--r--epan/sminmpec.c24
-rw-r--r--manuf170
-rw-r--r--services1
-rw-r--r--ui/qt/wireshark_de.qmbin342506 -> 343746 bytes
-rw-r--r--ui/qt/wireshark_de.ts309
-rw-r--r--ui/qt/wireshark_en.ts297
-rw-r--r--ui/qt/wireshark_fr.qmbin317612 -> 318877 bytes
-rw-r--r--ui/qt/wireshark_fr.ts297
-rw-r--r--ui/qt/wireshark_it.qmbin348025 -> 349530 bytes
-rw-r--r--ui/qt/wireshark_it.ts317
-rw-r--r--ui/qt/wireshark_ja_JP.qmbin265148 -> 266204 bytes
-rw-r--r--ui/qt/wireshark_ja_JP.ts297
-rw-r--r--ui/qt/wireshark_pl.qmbin334062 -> 335260 bytes
-rw-r--r--ui/qt/wireshark_pl.ts309
-rw-r--r--ui/qt/wireshark_zh_CN.qmbin250920 -> 251148 bytes
-rw-r--r--ui/qt/wireshark_zh_CN.ts376
18 files changed, 2049 insertions, 447 deletions
diff --git a/AUTHORS b/AUTHORS
index c04a90a85d..39bac5458e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4113,6 +4113,7 @@ Michael Cistera <michael.cistera[AT]netscout.com>
Michael McConville <mmcco[AT]mykolab.com>
Michael Oed <michael.oed[AT]gmail.com>
Michael Pergament <mpergament[AT]googlemail.com>
+Michael Vigovsky <upliner[AT]gmail.com>
Michal Pazdera <michal.pazdera[AT]gmail.com>
Michal Prívozník <mprivozn[AT]redhat.com>
Michele Baldessari <michele[AT]acksyn.org>
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index b7637e4e4d..57cca0d1e0 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2016-06-03)
+(last updated 2016-06-11)
SMI Network Management Private Enterprise Codes:
@@ -191335,6 +191335,102 @@ Decentralization / Helenic Public Administra
Alloy Software, Inc.
Ivan Samoylov
ivans&alloy-software.com
+47939
+ Audio Export GmbH
+ Jürgen Schenk
+ j.schenk&audioexport.de
+47940
+ clAIRvision Corporation
+ Jun Ogawa
+ enmng&clairvision.co.jp
+47941
+ Mendix B.V.
+ Hans van Kranenburg
+ iana&mendix.net
+47942
+ Tachyons .NET
+ Joel Studtmann
+ joel&tachyons.net
+47943
+ Oesterreichischer Mantrailing Verband - Mantrailing Austria
+ Doris Bruckner
+ info&mantrailing-austria.org
+47944
+ Center for International Private Enterprise
+ Christopher Bolcik
+ cbolcik&cipe.org
+47945
+ Fukoku Matual Life Insurance Company
+ Ryouichi Mukai
+ ryouichi.mukai&fi.fukoku-life.co.jp
+47946
+ OOO "Eko Paper"
+ Sergey V. Kurochkin
+ serge&volga-paper.ru
+47947
+ Hoermann GmbH
+ Matthias Müllner
+ info&hoermann-gmbh.de
+47948
+ Systemtechnik LEBER GmbH & Co. KG
+ Stefan Angele
+ info&leber-ingenieure.de
+47949
+ SYMACORP
+ Cedric LEFIEF
+ dtechnique&symamobile.com
+47950
+ Balkantel Ltd.
+ Georgi Georgiev
+ ggeorgiev&balkantel.net
+47951
+ Foundation for Trusted Identity
+ Sam Dibrell
+ sam&strac.org
+47952
+ NETIO products a.s.
+ Jan Rehak
+ info&netio.eu
+47953
+ D11
+ Peter Ahlgren
+ peter.ahlgren&kalundborg.dk
+47954
+ Punkt Creative LLC
+ Ethan Brooks
+ punktcreative&gmail.com
+47955
+ Max Planck Institute for the Physics of Complex Systems
+ Thomas Mueller
+ mueller&pks.mpg.de
+47956
+ KAV Danubia
+ Sebastian Ecker
+ calimero&danubia.wien
+47957
+ Equiis Technologies Inc.
+ Valdemar Tadeu Mendonca
+ tmendonca&equiis.com
+47958
+ Cloud Cantábrico Siglo XXI, S.L.U
+ Óscar Flor Lozano
+ oscar.flor&cc3m.com
+47959
+ Snapchat, Inc.
+ Eric Mak
+ eric.mak&snapchat.com
+47960
+ Hartmann GmbH
+ Lutz Polosek
+ lutz.polosek&hartmann-gmbh.eu
+47961
+ Gerhard D. Wempe KG - Division Chronometerwerke
+ Christian Blanck
+ chrono&wempe.de
+47962
+ Ezam Automotive Parts
+ Ali Karimi
+ Karimi&ezamco.com
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index a064a1e860..5a1aebb43f 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -47959,6 +47959,30 @@ const value_string sminmpec_values[] = {
{ 47936, "HansBeerman B.V." },
{ 47937, "Ophir Energy PLC" },
{ 47938, "Alloy Software, Inc." },
+ { 47939, "Audio Export GmbH" },
+ { 47940, "clAIRvision Corporation" },
+ { 47941, "Mendix B.V." },
+ { 47942, "Tachyons .NET" },
+ { 47943, "Oesterreichischer Mantrailing Verband - Mantrailing Austria" },
+ { 47944, "Center for International Private Enterprise" },
+ { 47945, "Fukoku Matual Life Insurance Company" },
+ { 47946, "OOO \"Eko Paper\"" },
+ { 47947, "Hoermann GmbH" },
+ { 47948, "Systemtechnik LEBER GmbH & Co. KG" },
+ { 47949, "SYMACORP" },
+ { 47950, "Balkantel Ltd." },
+ { 47951, "Foundation for Trusted Identity" },
+ { 47952, "NETIO products a.s." },
+ { 47953, "D11" },
+ { 47954, "Punkt Creative LLC" },
+ { 47955, "Max Planck Institute for the Physics of Complex Systems" },
+ { 47956, "KAV Danubia" },
+ { 47957, "Equiis Technologies Inc." },
+ { 47958, "Cloud Cant\0303\0241brico Siglo XXI, S.L.U" },
+ { 47959, "Snapchat, Inc." },
+ { 47960, "Hartmann GmbH" },
+ { 47961, "Gerhard D. Wempe KG - Division Chronometerwerke" },
+ { 47962, "Ezam Automotive Parts" },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index 0b6cc1c6a9..53b952b032 100644
--- a/manuf
+++ b/manuf
@@ -1706,7 +1706,7 @@
00:06:75 Banderac # Banderacom, Inc.
00:06:76 NovraTec # Novra Technologies Inc.
00:06:77 SickAg # SICK AG
-00:06:78 MarantzB # Marantz Brand Company
+00:06:78 D&MHoldi # D&M Holdings Inc.
00:06:79 KonamiCo # Konami Corporation
00:06:7A JmpSyste # JMP Systems
00:06:7B ToplinkC # Toplink C&C Corporation
@@ -2013,7 +2013,7 @@
00:07:A8 HaierGro # Haier Group Technologies Ltd.
00:07:A9 Novasoni # Novasonics
00:07:AA QuantumD # Quantum Data Inc.
-00:07:AB 5481 # 5481
+00:07:AB SamsungE # Samsung Electronics Co.,Ltd
00:07:AC Eolring # Eolring
00:07:AD Pentacon # Pentacon GmbH Foto-und Feinwerktechnik
00:07:AE Britestr # Britestream Networks, Inc.
@@ -5694,7 +5694,7 @@
00:16:25 Impinj # Impinj, Inc.
00:16:26 ArrisGro # ARRIS Group, Inc.
00:16:27 Embedded # embedded-logic DESIGN AND MORE GmbH
-00:16:28 UltraEle # Ultra Electronics Manufacturing and Card Systems
+00:16:28 Magicard # Magicard Ltd
00:16:29 NivusGmb # Nivus GmbH
00:16:2A AntikCom # Antik computers & communications s.r.o.
00:16:2B TogamiEl # Togami Electric Mfg.co.,Ltd.
@@ -8363,7 +8363,7 @@
00:1F:C9 CiscoInc # Cisco Systems, Inc
00:1F:CA CiscoInc # Cisco Systems, Inc
00:1F:CB NiwSolut # NIW Solutions
-00:1F:CC 5481 # 5481
+00:1F:CC SamsungE # Samsung Electronics Co.,Ltd
00:1F:CD SamsungE # Samsung Electronics Co.,Ltd
00:1F:CE QtechLlc # QTECH LLC
00:1F:CF MsiTechn # MSI Technology GmbH
@@ -8880,8 +8880,8 @@
00:21:CE Ntc-Metr # NTC-Metrotek
00:21:CF CryptoGr # The Crypto Group
00:21:D0 GlobalDi # Global Display Solutions Spa
-00:21:D1 5481 # 5481
-00:21:D2 5481 # 5481
+00:21:D1 SamsungE # Samsung Electronics Co.,Ltd
+00:21:D2 SamsungE # Samsung Electronics Co.,Ltd
00:21:D3 BocomSec # BOCOM SECURITY(ASIA PACIFIC) LIMITED
00:21:D4 VollmerW # Vollmer Werke GmbH
00:21:D5 X2eGmbh # X2E GmbH
@@ -9241,14 +9241,14 @@
00:23:37 GlobalSt # Global Star Solutions ULC
00:23:38 Oj-Elect # OJ-Electronics A/S
00:23:39 SamsungE # Samsung Electronics Co.,Ltd
-00:23:3A 5481 # 5481
+00:23:3A SamsungE # Samsung Electronics Co.,Ltd
00:23:3B C-MaticL # C-Matic Systems Ltd
00:23:3C Alflex # Alflex
00:23:3D NoveroBV # Novero holding B.V.
00:23:3E Alcatel- # Alcatel-Lucent IPD
00:23:3F Purechoi # Purechoice Inc
00:23:40 Mixtelem # MiXTelematics
-00:23:41 SiemensI # Siemens AB, Infrastructure & Cities, Building Technologies Division, IC BT SSP SP BA PR
+00:23:41 Vanderbi # Vanderbilt International (SWE) AB
00:23:42 CoffeeEq # Coffee Equipment Company
00:23:43 TemAg # TEM AG
00:23:44 Objectiv # Objective Interface Systems, Inc.
@@ -9792,7 +9792,7 @@
00:25:63 LuxteraI # Luxtera Inc
00:25:64 Dell # Dell Inc.
00:25:65 Vizimax # Vizimax Inc.
-00:25:66 5481 # 5481
+00:25:66 SamsungE # Samsung Electronics Co.,Ltd
00:25:67 SamsungE # Samsung Electronics Co.,Ltd
00:25:68 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
00:25:69 Sagemcom # Sagemcom Broadband SAS
@@ -10038,7 +10038,7 @@
00:26:5C HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
00:26:5D SamsungE # Samsung Electronics Co.,Ltd
00:26:5E HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
-00:26:5F 5481 # 5481
+00:26:5F SamsungE # Samsung Electronics Co.,Ltd
00:26:60 Logiways # Logiways
00:26:61 Irumtek # Irumtek Co., Ltd.
00:26:62 Actionte # Actiontec Electronics, Inc
@@ -10786,6 +10786,7 @@
00:45:01 VersusTe # Versus Technology, Inc.
00:46:4B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
00:48:54 DigitalS # Digital SemiConductor 21143/2 based 10/100
+00:4A:77 ZteCorpo # zte corporation
00:4D:32 AndonHea # Andon Health Co.,Ltd.
00:4F:49 Realtek
00:4F:4B PineTech # Pine Technology Ltd.
@@ -16809,7 +16810,7 @@
00:D0:F3 SolariDi # SOLARI DI UDINE SPA
00:D0:F4 Carinthi # CARINTHIAN TECH INSTITUTE
00:D0:F5 OrangeMi # ORANGE MICRO, INC.
-00:D0:F6 Alcatel- # Alcatel-Lucent Canada
+00:D0:F6 Nokia # Nokia
00:D0:F7 NextNets # NEXT NETS CORPORATION
00:D0:F8 FujianSt # FUJIAN STAR TERMINAL
00:D0:F9 AcuteCom # ACUTE COMMUNICATIONS CORP.
@@ -17154,7 +17155,7 @@
04:0C:CE Apple # Apple, Inc.
04:0E:C2 Viewsoni # ViewSonic Mobile China Limited
04:15:52 Apple # Apple, Inc.
-04:18:0F 5481 # 5481
+04:18:0F SamsungE # Samsung Electronics Co.,Ltd
04:18:B6 Private # Private
04:18:D6 Ubiquiti # Ubiquiti Networks
04:1A:04 Waveip # WaveIP
@@ -17517,6 +17518,7 @@
08:80:39 CiscoSpv # Cisco SPVTG
08:81:BC Hongkong # HongKong Ipro Technology Co., Limited
08:81:F4 JuniperN # Juniper Networks
+08:86:20 TecnoMob # TECNO MOBILE LIMITED
08:86:3B BelkinIn # Belkin International Inc.
08:8C:2C SamsungE # Samsung Electronics Co.,Ltd
08:8D:C8 RyowaEle # Ryowa Electronics Co.,Ltd
@@ -17616,7 +17618,7 @@
0C:51:01 Apple # Apple, Inc.
0C:51:F7 ChauvinA # CHAUVIN ARNOUX
0C:54:A5 Pegatron # PEGATRON CORPORATION
-0C:54:B9 Alcatel- # Alcatel-Lucent Canada
+0C:54:B9 Nokia # Nokia
0C:55:21 AxirosGm # Axiros GmbH
0C:56:5C HybroadV # HyBroad Vision (Hong Kong) Technology Co Ltd
0C:57:EB MuellerS # Mueller Systems
@@ -17702,7 +17704,7 @@
0C:DA:41 Hangzhou # Hangzhou H3C Technologies Co., Limited
0C:DC:CC InalaTec # Inala Technologies
0C:DD:EF NokiaCor # Nokia Corporation
-0C:DF:A4 5481 # 5481
+0C:DF:A4 SamsungE # Samsung Electronics Co.,Ltd
0C:E0:E4 Plantron # PLANTRONICS, INC.
0C:E5:D3 DhElectr # DH electronics GmbH
0C:E7:09 FoxCrypt # Fox Crypto B.V.
@@ -17780,12 +17782,13 @@
10:12:12 VivoInte # Vivo International Corporation Pty Ltd
10:12:18 Korins # Korins Inc.
10:12:48 Itg # ITG, Inc.
+10:12:50 Integrat # Integrated Device Technology (Malaysia) Sdn. Bhd.
10:13:EE JustecIn # Justec International Technology INC.
10:18:9E ElmoMoti # Elmo Motion Control
10:1B:54 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
10:1C:0C Apple # Apple, Inc.
10:1D:51 On-QLlcD # ON-Q LLC dba ON-Q Mesh Networks
-10:1D:C0 5481 # 5481
+10:1D:C0 SamsungE # Samsung Electronics Co.,Ltd
10:1F:74 HewlettP # Hewlett Packard
10:22:79 Zerodesk # ZeroDesktop, Inc.
10:27:BE Tvip # TVIP
@@ -17869,6 +17872,7 @@
10:C2:BA Utt # UTT Co., Ltd.
10:C3:7B AsustekC # ASUSTek COMPUTER INC.
10:C5:86 BioSound # BIO SOUND LAB CO., LTD.
+10:C6:0C DominoUk # Domino UK Ltd
10:C6:1F HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
10:C6:7E Shenzhen # SHENZHEN JUCHIN TECHNOLOGY CO., LTD
10:C6:FC GarminIn # Garmin International
@@ -17891,7 +17895,7 @@
10:E4:AF AprLlc # APR, LLC
10:E6:8F Kwangsun # KWANGSUNG ELECTRONICS KOREA CO.,LTD.
10:E6:AE SourceTe # Source Technologies, LLC
-10:E8:78 Alcatel- # Alcatel-Lucent Canada
+10:E8:78 Nokia # Nokia
10:E8:EE Phasespa # PhaseSpace
10:EA:59 CiscoSpv # Cisco SPVTG
10:EE:D9 CanogaPe # Canoga Perkins Corporation
@@ -17955,6 +17959,7 @@
14:30:7A Avermetr # Avermetrics
14:30:C6 Motorola # Motorola Mobility LLC, a Lenovo Company
14:32:D1 SamsungE # Samsung Electronics Co.,Ltd
+14:33:65 TemMobil # TEM Mobile Limited
14:35:8B Mediabri # Mediabridge Products, LLC.
14:35:B3 FutureDe # Future Designs, Inc.
14:36:05 NokiaCor # Nokia Corporation
@@ -17962,7 +17967,7 @@
14:37:3B ProcomSy # PROCOM Systems
14:3A:EA Dynapowe # Dynapower Company LLC
14:3D:F2 BeijingS # Beijing Shidai Hongyuan Network Communication Co.,Ltd
-14:3E:60 Alcatel- # Alcatel-Lucent Canada
+14:3E:60 Nokia # Nokia
14:3E:BF ZteCorpo # zte corporation
14:41:46 Honeywel # Honeywell (China) Co., LTD
14:41:E2 MonacoEn # Monaco Enterprises, Inc.
@@ -18356,7 +18361,7 @@
1C:88:79:50:00:00/28 Shenzhen # SHENZHENFREELINK ELECTRONIC CO.,LTD
1C:88:79:60:00:00/28 EolosItC # Eolos IT Corp
1C:88:79:70:00:00/28 SensysNe # Sensys Networks, Inc.
-1C:88:79:80:00:00/28 ToshibaT # Toshiba Toko meter systems co., LTD.
+1C:88:79:80:00:00/28 ToshibaT # Toshiba Toko Meter Systems Co., LTD.
1C:88:79:90:00:00/28 Xingtera # Xingtera China Ltd
1C:88:79:A0:00:00/28 Itw-Feg # ITW-FEG
1C:88:79:B0:00:00/28 Gekartel # gekartel AG
@@ -18433,7 +18438,7 @@
1C:E6:2B Apple # Apple, Inc.
1C:E6:C7 CiscoInc # Cisco Systems, Inc
1C:E8:5D CiscoInc # Cisco Systems, Inc
-1C:EA:1B Alcatel- # Alcatel-Lucent Canada
+1C:EA:1B Nokia # Nokia
1C:EE:E8 IlshinEl # Ilshin Elecom
1C:F0:3E Wearhaus # Wearhaus Inc.
1C:F0:61 ScapsGmb # SCAPS GmbH
@@ -18454,7 +18459,7 @@
20:10:7A GemtekTe # Gemtek Technology Co., Ltd.
20:12:57 MostLuck # Most Lucky Trading Ltd
20:12:D5 Scientec # Scientech Materials Corporation
-20:13:E0 5481 # 5481
+20:13:E0 SamsungE # Samsung Electronics Co.,Ltd
20:16:D8 LiteonTe # Liteon Technology Corporation
20:18:0E Shenzhen # Shenzhen Sunchip Technology Co., Ltd
20:1A:06 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD.
@@ -18498,6 +18503,7 @@
20:5B:2A Private # Private
20:5B:5E Shenzhen # Shenzhen Wonhe Technology Co., Ltd
20:5C:FA Yangzhou # Yangzhou ChangLian Network Technology Co,ltd.
+20:5D:47 VivoMobi # vivo Mobile Communication Co., Ltd.
20:5E:F7 SamsungE # Samsung Electronics Co.,Ltd
20:62:74 Microsof # Microsoft Corporation
20:63:5F Abeeway # Abeeway
@@ -18633,6 +18639,7 @@
24:4B:81 SamsungE # Samsung Electronics Co.,Ltd
24:4C:07 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
24:4F:1D IruleLlc # iRule LLC
+24:59:0B WhiteSky # White Sky Inc. Limited
24:5B:F0 Liteon # Liteon, Inc.
24:5E:BE Qnap # QNAP Systems, Inc.
24:5F:DF KyoceraC # KYOCERA Corporation
@@ -19333,7 +19340,7 @@
34:A8:43 KyoceraD # KYOCERA Display Corporation
34:A8:4E CiscoInc # Cisco Systems, Inc
34:AA:8B SamsungE # Samsung Electronics Co.,Ltd
-34:AA:99 Alcatel- # Alcatel-Lucent Canada
+34:AA:99 Nokia # Nokia
34:AA:EE Mikrovis # Mikrovisatos Servisas UAB
34:AB:37 Apple # Apple, Inc.
34:AD:E4 Shanghai # Shanghai Chint Power Systems Co., Ltd.
@@ -19409,7 +19416,7 @@
38:0F:4A Apple # Apple, Inc.
38:0F:E4 Dedicate # Dedicated Network Partners Oy
38:10:D5 AvmAudio # AVM Audiovisuelles Marketing und Computersysteme GmbH
-38:16:D1 5481 # 5481
+38:16:D1 SamsungE # Samsung Electronics Co.,Ltd
38:17:66 Promzaka # PROMZAKAZ LTD.
38:19:2F NokiaCor # Nokia Corporation
38:1C:1A CiscoInc # Cisco Systems, Inc
@@ -19442,7 +19449,7 @@
38:4C:4F HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
38:4C:90 ArrisGro # ARRIS Group, Inc.
38:4F:F0 Azurewav # AzureWave Technology Inc.
-38:52:1A Alcatel- # Alcatel-Lucent Canada
+38:52:1A Nokia # Nokia
38:56:10 CandyHou # CANDY HOUSE, Inc.
38:58:0C Panacces # Panaccess Systems GmbH
38:59:F8 Mindmade # MindMade Sp. z o.o.
@@ -19815,6 +19822,7 @@
40:78:75 Imbel-In # IMBEL - Industria de Material Belico do Brasil
40:7A:80 NokiaCor # Nokia Corporation
40:7B:1B MettleNe # Mettle Networks Inc.
+40:7C:7D Nokia # Nokia
40:7F:E0 GlorySta # Glory Star Technics (ShenZhen) Limited
40:82:56 Continen # Continental Automotive GmbH
40:83:DE ZebraTec # Zebra Technologies Inc
@@ -20430,7 +20438,7 @@
44:4A:65 Silverfl # Silverflare Ltd.
44:4C:0C Apple # Apple, Inc.
44:4C:A8 AristaNe # Arista Networks
-44:4E:1A 5481 # 5481
+44:4E:1A SamsungE # Samsung Electronics Co.,Ltd
44:4F:5E PanStudi # Pan Studios Co.,Ltd.
44:51:DB Raytheon # Raytheon BBN Technologies
44:54:C0 Thompson # Thompson Aerospace
@@ -20655,9 +20663,9 @@
48:F3:17 Private # Private
48:F4:7D Techvisi # TechVision Holding Internation Limited
48:F7:C0 Technico # Technicolor CH USA Inc.
-48:F7:F1 Alcatel- # Alcatel-Lucent Canada
+48:F7:F1 Nokia # Nokia
48:F8:B3 Cisco-Li # Cisco-Linksys, LLC
-48:F8:E1 Alcatel- # Alcatel-Lucent Canada
+48:F8:E1 Nokia # Nokia
48:F9:25 Maestron # Maestronic
48:FC:B6 LavaInte # LAVA INTERNATIONAL(H.K) LIMITED
48:FC:B8 Woodstre # Woodstream Corporation
@@ -20772,7 +20780,7 @@
4C:C4:52 ShangHai # Shang Hai Tyd. Electon Technology Ltd.
4C:C6:02 Radios # Radios, Inc.
4C:C6:81 Shenzhen # Shenzhen Aisat Electronic Co., Ltd.
-4C:C9:4F Alcatel- # Alcatel-Lucent Canada
+4C:C9:4F Nokia # Nokia
4C:CA:53 Skyera # Skyera, Inc.
4C:CB:F5 ZteCorpo # zte corporation
4C:CC:34 Motorola # Motorola Solutions Inc.
@@ -20803,6 +20811,7 @@
50:05:3D CyweeGro # CyWee Group Ltd
50:06:04 CiscoInc # Cisco Systems, Inc
50:06:AB CiscoInc # Cisco Systems, Inc
+50:09:59 Technico # Technicolor CH USA Inc.
50:0B:32 FoxdaTec # Foxda Technology Industrial(ShenZhen)Co.,LTD
50:0E:6D Trafficc # TrafficCast International
50:11:EB Silverne # SilverNet Ltd
@@ -21034,7 +21043,7 @@
54:89:22 ZelfyInc # Zelfy Inc
54:89:98 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
54:8C:A0 LiteonTe # Liteon Technology Corporation
-54:92:BE 5481 # 5481
+54:92:BE SamsungE # Samsung Electronics Co.,Ltd
54:93:59 Shenzhen # SHENZHEN TWOWING TECHNOLOGIES CO.,LTD.
54:94:78 Silversh # Silvershore Technology Partners
54:9A:11 IeeeRegi # IEEE Registration Authority
@@ -21527,7 +21536,7 @@
60:9C:9F BrocadeC # Brocade Communications Systems, Inc.
60:9E:64 VivonicG # Vivonic GmbH
60:9F:9D Cloudswi # CloudSwitch
-60:A1:0A 5481 # 5481
+60:A1:0A SamsungE # Samsung Electronics Co.,Ltd
60:A3:7D Apple # Apple, Inc.
60:A4:4C AsustekC # ASUSTek COMPUTER INC.
60:A8:FE Nokia # Nokia
@@ -21557,7 +21566,7 @@
60:CB:FB Airscape # AirScape Inc.
60:CD:A9 Abloomy # Abloomy
60:CD:C5 TaiwanCa # Taiwan Carol Electronics., Ltd
-60:D0:A9 5481 # 5481
+60:D0:A9 SamsungE # Samsung Electronics Co.,Ltd
60:D1:AA VishalTe # Vishal Telecommunications Pvt Ltd
60:D2:B9 RealandB # REALAND BIO CO., LTD.
60:D3:0A QuatiusL # Quatius Limited
@@ -21647,6 +21656,7 @@
64:5D:D7 Shenzhen # Shenzhen Lifesense Medical Electronics Co., Ltd.
64:5E:BE Yahoo!Ja # Yahoo! JAPAN
64:5F:FF NicoletN # Nicolet Neuro
+64:61:84 Velux # VELUX
64:62:23 Cellient # Cellient Co., Ltd.
64:64:9B JuniperN # Juniper Networks
64:65:C0 NuvonInc # Nuvon, Inc
@@ -21900,7 +21910,7 @@
68:E1:66 Private # Private
68:E4:1F Unglaube # Unglaube Identech GmbH
68:E8:EB LinktelT # Linktel Technologies Co.,Ltd
-68:EB:AE 5481 # 5481
+68:EB:AE SamsungE # Samsung Electronics Co.,Ltd
68:EB:C5 Angstrem # Angstrem Telecom
68:EC:62 YodoTech # YODO Technology Corp. Ltd.
68:ED:43 Blackber # BlackBerry RTS
@@ -22071,7 +22081,7 @@
70:1D:7F ComtechT # Comtech Technology Co., Ltd.
70:1D:C4 Northsta # NorthStar Battery Company, LLC
70:23:93 Fos4xGmb # fos4X GmbH
-70:25:26 Alcatel- # Alcatel-Lucent Canada
+70:25:26 Nokia # Nokia
70:25:59 Cybertan # CyberTAN Technology Inc.
70:28:8B SamsungE # Samsung Electronics Co.,Ltd
70:29:00 Shenzhen # Shenzhen ChipTrip Technology Co,Ltd
@@ -22079,6 +22089,7 @@
70:2B:1D E-DomusI # E-Domus International Limited
70:2C:1F Wisol # Wisol
70:2D:D1 NewingsC # Newings Communication CO., LTD.
+70:2E:22 ZteCorpo # zte corporation
70:2F:4B Polyvisi # PolyVision Inc.
70:2F:97 AavaMobi # Aava Mobile Oy
70:30:18 AvayaInc # Avaya Inc
@@ -22312,6 +22323,7 @@
70:B3:D5:16:70:00/36 Eiden # Eiden Co.,Ltd.
70:B3:D5:16:E0:00/36 JemacSwe # Jemac Sweden AB
70:B3:D5:17:20:00/36 Lumigrow # LumiGrow, Inc
+70:B3:D5:17:40:00/36 CarlsonW # Carlson Wireless Technologies Inc.
70:B3:D5:17:90:00/36 AltranUk # ALTRAN UK
70:B3:D5:17:D0:00/36 EntechEl # Entech Electronics
70:B3:D5:17:E0:00/36 OculiVis # OCULI VISION
@@ -22543,6 +22555,7 @@
70:B3:D5:43:B0:00/36 Kalycito # Kalycito Infotech Private Limited
70:B3:D5:43:D0:00/36 VeryxTec # Veryx Technologies Private Limited
70:B3:D5:44:00:00/36 Discover # Discover Video
+70:B3:D5:44:80:00/36 B/EAeros # B/E Aerospace, Inc.
70:B3:D5:44:B0:00/36 OpenSyst # Open System Solutions Limited
70:B3:D5:44:E0:00/36 Solace # Solace Systems Inc.
70:B3:D5:45:50:00/36 Heartlan # Heartlandmicropayments
@@ -22636,12 +22649,15 @@
70:B3:D5:57:D0:00/36 Wicom1Gm # WICOM1 GmbH
70:B3:D5:58:00:00/36 Private # Private
70:B3:D5:58:30:00/36 Ducommun # Ducommun Inc.
+70:B3:D5:58:40:00/36 SertoneA # Sertone, a division of Opti-Knights Ltd
70:B3:D5:58:70:00/36 IncaaCom # INCAA Computers
70:B3:D5:58:90:00/36 Cityntel # Cityntel OU
+70:B3:D5:58:D0:00/36 DorletSa # DORLET SAU
70:B3:D5:58:E0:00/36 Veilux # Veilux Inc.
70:B3:D5:58:F0:00/36 LslSyste # LSL systems
70:B3:D5:59:20:00/36 Crde # CRDE
70:B3:D5:59:50:00/36 PlrPruef # PLR Prueftechnik Linke und Ruehe GmbH
+70:B3:D5:59:90:00/36 LecoCorp # 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.
70:B3:D5:5A:20:00/36 WallnerA # Wallner Automation GmbH
@@ -22710,6 +22726,7 @@
70:B3:D5:67:90:00/36 Emac # EMAC, Inc.
70:B3:D5:68:20:00/36 Rosslare # Rosslare Enterprises Limited
70:B3:D5:68:D0:00/36 Meta-Chr # Meta-chrom Co. Ltd.
+70:B3:D5:69:20:00/36 HosinInd # HOSIN INDUSTRIAL LIMITED
70:B3:D5:69:40:00/36 Movither # MoviTHERM
70:B3:D5:69:60:00/36 OpenGrow # Open Grow
70:B3:D5:69:E0:00/36 Ptype # PTYPE Co., LTD.
@@ -22746,6 +22763,7 @@
70:B3:D5:6F:90:00/36 Envitech # ENVItech s.r.o.
70:B3:D5:6F:A0:00/36 Datafort # Dataforth Corporation
70:B3:D5:6F:B0:00/36 Shachiha # Shachihata Inc.
+70:B3:D5:6F:F0:00/36 AkeoPlus # AKEO PLUS
70:B3:D5:70:20:00/36 SensorHi # Sensor Highway Ltd
70:B3:D5:70:30:00/36 Stromide # StromIdee GmbH
70:B3:D5:70:80:00/36 IbmResea # IBM Research GmbH
@@ -22822,6 +22840,7 @@
70:B3:D5:7C:D0:00/36 Molekule # Molekuler Goruntuleme A.S.
70:B3:D5:7C:E0:00/36 AplexTec # Aplex Technology Inc.
70:B3:D5:7C:F0:00/36 OrcaTech # ORCA Technologies, LLC
+70:B3:D5:7D:50:00/36 SicsSwed # SICS Swedish ICT
70:B3:D5:7D:90:00/36 AtomGike # ATOM GIKEN Co.,Ltd.
70:B3:D5:7D:D0:00/36 ExcelMed # Excel Medical Electronics LLC
70:B3:D5:7D:E0:00/36 Telaeris # Telaeris, Inc.
@@ -22863,6 +22882,7 @@
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:20:00/36 Netboxsc # NetBoxSC, LLC
+70:B3:D5:85:B0:00/36 Tsubakim # TSUBAKIMOTO CHAIN CO.
70:B3:D5:85:C0:00/36 RobotPub # Robot Pub Group
70:B3:D5:86:60:00/36 MepsReal # MEPS Realtime
70:B3:D5:86:D0:00/36 CensusDi # Census Digital Incorporated
@@ -22874,6 +22894,7 @@
70:B3:D5:88:10:00/36 TattileS # TATTILE SRL
70:B3:D5:88:20:00/36 SimonTec # SIMON TECH, S.L.
70:B3:D5:88:50:00/36 Quirklog # QuirkLogic
+70:B3:D5:88:90:00/36 Innovati # Innovative Circuit Technology
70:B3:D5:88:A0:00/36 Percepti # Perceptics, LLC
70:B3:D5:88:B0:00/36 WuhanEas # WUHAN EASYLINKIN TECHNOLOGY co.,LTD
70:B3:D5:88:F0:00/36 QuaestaI # Quaesta Instruments, LLC
@@ -22881,6 +22902,7 @@
70:B3:D5:89:20:00/36 Abb # ABB
70:B3:D5:89:30:00/36 Cubitech # Cubitech
70:B3:D5:89:50:00/36 Integrat # Integrated Control Corp.
+70:B3:D5:89:60:00/36 Shanghai # Shanghai Longpal Communication Equipment Co., Ltd.
70:B3:D5:8A:00:00/36 DmRadioc # DM RADIOCOM
70:B3:D5:8A:40:00/36 PhytonMi # Phyton, Inc. Microsystems and Development Tools
70:B3:D5:8A:60:00/36 Crde # CRDE
@@ -22889,6 +22911,7 @@
70:B3:D5:8B:00:00/36 IesSRL # IES S.r.l.
70:B3:D5:8B:10:00/36 M-TechIn # M-Tech Innovations Limited
70:B3:D5:8B:20:00/36 NpfModem # NPF Modem, LLC
+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:50:00/36 HmicroIn # HMicro Inc
@@ -23146,6 +23169,7 @@
70:B3:D5:C0:10:00/36 Smartgua # SmartGuard LLC
70:B3:D5:C0:30:00/36 XaviTech # XAVi Technologies Corp.
70:B3:D5:C0:70:00/36 Areco # ARECO
+70:B3:D5:C0:E0:00/36 SysdevSr # SYSDEV Srl
70:B3:D5:C1:B0:00/36 Labinven # Labinvent JSC
70:B3:D5:C2:10:00/36 AplexTec # Aplex Technology Inc.
70:B3:D5:C2:20:00/36 Skyriver # Skyriver Communications Inc.
@@ -23329,6 +23353,7 @@
70:B3:D5:E6:D0:00/36 DomusSC # Domus S.C.
70:B3:D5:E6:E0:00/36 LieronBv # Lieron BVBA
70:B3:D5:E7:00:00/36 DiskMult # DISK Multimedia s.r.o.
+70:B3:D5:E7:10:00/36 SisTechn # SiS Technology
70:B3:D5:E7:40:00/36 Exfronti # Exfrontier Co., Ltd.
70:B3:D5:E7:50:00/36 Nke # Nke
70:B3:D5:E7:60:00/36 DorsettT # Dorsett Technologies, Inc.
@@ -23427,6 +23452,7 @@
70:B3:D5:FA:10:00/36 BbiEngin # BBI Engineering, Inc.
70:B3:D5:FA:20:00/36 SarokalT # Sarokal Test Systems Oy
70:B3:D5:FA:40:00/36 Energybo # Energybox Limited
+70:B3:D5:FA:A0:00/36 LogimSof # LogiM GmbH Software und Entwicklung
70:B3:D5:FB:00:00/36 Rohde&Sc # Rohde&Schwarz Topex SA
70:B3:D5:FB:50:00/36 OrangeTr # Orange Tree Technologies Ltd
70:B3:D5:FB:60:00/36 Kronotec # KRONOTECH SRL
@@ -23493,9 +23519,17 @@
70:F3:95 Universa # Universal Global Scientific Industrial Co., Ltd.
70:F8:E7 IeeeRegi # IEEE Registration Authority
70:F8:E7:00:00:00/28 Shenzhen # SHENZHEN Xin JiuNing Electronics Co Ltd
+70:F8:E7:20:00:00/28 VoxxInte # VOXX International
70:F8:E7:40:00:00/28 Clip # CLIP Inc.
-70:F8:E7:70:00:00/28 JiangsuN # Jiangsu NST technology LIMITED
+70:F8:E7:50:00:00/28 BeijingE # Beijing Eehuu Technology Co.,Ltd.
+70:F8:E7:60:00:00/28 FleximSe # Flexim Security Oy
+70:F8:E7:70:00:00/28 NstTechn # NST Technology Limited Co.,Ltd.
+70:F8:E7:80:00:00/28 EclipseS # Eclipse Security
70:F8:E7:90:00:00/28 KontechE # Kontech Electronics Co., Ltd
+70:F8:E7:A0:00:00/28 TivaciPt # TiVACI CORPORATION PTE LTD
+70:F8:E7:B0:00:00/28 Photonfo # Photonfocus AG
+70:F8:E7:C0:00:00/28 Fixstars # Fixstars Corporation
+70:F8:E7:D0:00:00/28 System-O # System-on-Chip engineering
70:F9:27 SamsungE # Samsung Electronics Co.,Ltd
70:F9:6D Hangzhou # Hangzhou H3C Technologies Co., Limited
70:FC:8C Oneacces # OneAccess SA
@@ -23740,7 +23774,7 @@
78:45:61 Cybertan # CyberTAN Technology Inc.
78:45:C4 Dell # Dell Inc.
78:46:C4 DaehapHy # DAEHAP HYPER-TECH
-78:47:1D 5481 # 5481
+78:47:1D SamsungE # Samsung Electronics Co.,Ltd
78:48:59 HewlettP # Hewlett Packard
78:49:1D Will-Bur # The Will-Burt Company
78:4B:08 FRobotic # f.robotics acquisitions ltd
@@ -24303,7 +24337,7 @@
84:25:A4 TarioxLi # Tariox Limited
84:25:DB SamsungE # Samsung Electronics Co.,Ltd
84:26:15 AdbBroad # ADB Broadband Italia
-84:26:2B Alcatel- # Alcatel-Lucent Canada
+84:26:2B Nokia # Nokia
84:26:90 BeijingT # BEIJING THOUGHT SCIENCE CO.,LTD.
84:27:CE OfPresid # Corporation of the Presiding Bishop of The Church of Jesus Christ of Latter-day Saints
84:28:5A SaffronS # Saffron Solutions Inc
@@ -24433,7 +24467,7 @@
84:D9:C8 Unipatte # Unipattern Co.,
84:DB:2F SierraWi # Sierra Wireless Inc
84:DB:AC HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
-84:DB:FC Alcatel- # Alcatel-Lucent Canada
+84:DB:FC Nokia # Nokia
84:DD:20 TexasIns # Texas Instruments
84:DD:B7 CilagInt # Cilag GmbH International
84:DE:3D CrystalV # Crystal Vision Ltd
@@ -24511,6 +24545,7 @@
88:46:2A Telechip # Telechips Inc.
88:4A:EA TexasIns # Texas Instruments
88:4B:39 SiemensH # Siemens AG, Healthcare Sector
+88:4C:CF PulzzeIn # Pulzze Systems, Inc
88:50:DD Infiniba # Infiniband Trade Association
88:51:FB HewlettP # Hewlett Packard
88:53:2E IntelCor # Intel Corporate
@@ -24697,10 +24732,10 @@
8C:6A:E4 ViogemLi # Viogem Limited
8C:6D:50 Shenzhen # SHENZHEN MTC CO LTD
8C:70:5A IntelCor # Intel Corporate
-8C:71:F8 5481 # 5481
+8C:71:F8 SamsungE # Samsung Electronics Co.,Ltd
8C:73:6E FujitsuL # FUJITSU LIMITED
8C:76:C1 GodenTec # Goden Tech Limited
-8C:77:12 5481 # 5481
+8C:77:12 SamsungE # Samsung Electronics Co.,Ltd
8C:77:16 Longchee # LONGCHEER TELECOMMUNICATION LIMITED
8C:79:67 ZteCorpo # zte corporation
8C:7B:9D Apple # Apple, Inc.
@@ -24718,7 +24753,7 @@
8C:8B:83 TexasIns # Texas Instruments
8C:8E:76 TaskitGm # taskit GmbH
8C:8E:F2 Apple # Apple, Inc.
-8C:90:D3 Alcatel- # Alcatel-Lucent Canada
+8C:90:D3 Nokia # Nokia
8C:91:09 Toyoshim # Toyoshima Electric Technoeogy(Suzhou) Co.,Ltd.
8C:92:36 AusLinxT # Aus.Linx Technology Co., Ltd.
8C:94:CF EncellTe # Encell Technology, Inc.
@@ -24811,7 +24846,7 @@
90:35:6E Vodafone # Vodafone Omnitel N.V.
90:38:09 Ericsson # Ericsson AB
90:38:DF Changzho # Changzhou Tiannengbo System Co. Ltd.
-90:3A:A0 Alcatel- # Alcatel-Lucent Canada
+90:3A:A0 Nokia # Nokia
90:3A:E6 ParrotSa # PARROT SA
90:3C:92 Apple # Apple, Inc.
90:3C:AE YunnanKs # Yunnan KSEC Digital Technology Co.,Ltd.
@@ -25002,7 +25037,7 @@
94:61:1E WataElec # Wata Electronics Co.,Ltd.
94:61:24 PasonSys # Pason Systems
94:62:69 ArrisGro # ARRIS Group, Inc.
-94:63:D1 5481 # 5481
+94:63:D1 SamsungE # Samsung Electronics Co.,Ltd
94:65:9C IntelCor # Intel Corporate
94:66:E7 WomEngin # WOM Engineering
94:70:D2 WinfirmT # WINFIRM TECHNOLOGY
@@ -25026,6 +25061,7 @@
94:92:BC SyntechH # SYNTECH(HK) TECHNOLOGY LIMITED
94:94:26 Apple # Apple, Inc.
94:98:A2 Shanghai # Shanghai LISTEN TECH.LTD
+94:9A:A9 Microsof # Microsoft Corporation
94:9B:FD TransNew # Trans New Technology, Inc.
94:9C:55 AltaData # Alta Data Technologies
94:9F:3E Sonos # Sonos, Inc.
@@ -25086,7 +25122,7 @@
94:E8:48 FyldeMic # FYLDE MICRO LTD
94:E8:C5 ArrisGro # ARRIS Group, Inc.
94:E9:6A Apple # Apple, Inc.
-94:E9:8C Alcatel- # Alcatel-Lucent Canada
+94:E9:8C Nokia # Nokia
94:EB:2C Google # Google, Inc.
94:EB:CD Blackber # BlackBerry RTS
94:F1:9E HuizhouM # HUIZHOU MAORONG INTELLIGENT TECHNOLOGY CO.,LTD
@@ -25128,6 +25164,7 @@
98:0D:2E HtcCorpo # HTC Corporation
98:0E:E4 Private # Private
98:10:94 Shenzhen # Shenzhen Vsun communication technology Co.,ltd
+98:13:33 ZteCorpo # zte corporation
98:16:EC IcIntrac # IC Intracom
98:1D:FA SamsungE # Samsung Electronics Co.,Ltd
98:1E:0F JeelanSh # Jeelan (Shanghai Jeelan Technology Information Inc
@@ -25217,7 +25254,7 @@
98:A7:B0 McstZao # MCST ZAO
98:AA:3C WillI-Te # Will i-tech Co., Ltd.
98:AA:D7 BlueWave # BLUE WAVE NETWORKING CO LTD
-98:B0:39 Alcatel- # Alcatel-Lucent Canada
+98:B0:39 Nokia # Nokia
98:B8:E3 Apple # Apple, Inc.
98:BB:1E BydPreci # BYD Precision Manufacture Company Ltd.
98:BC:57 SvaTechn # SVA TECHNOLOGIES CO.LTD
@@ -25493,7 +25530,7 @@ A0:6E:50 NanotekE # Nanotek Elektronik Sistemler Ltd. Sti.
A0:71:A9 NokiaCor # Nokia Corporation
A0:73:32 Cashmast # Cashmaster International Limited
A0:73:FC RancoreT # Rancore Technologies Private Limited
-A0:75:91 5481 # 5481
+A0:75:91 SamsungE # Samsung Electronics Co.,Ltd
A0:77:71 VialisBv # Vialis BV
A0:78:BA Pantech # Pantech Co., Ltd.
A0:82:1F SamsungE # Samsung Electronics Co.,Ltd
@@ -25610,6 +25647,7 @@ A4:0C:C3 CiscoInc # Cisco Systems, Inc
A4:0D:BC XiamenIn # Xiamen Intretech Inc.
A4:12:42 NecPlatf # NEC Platforms, Ltd.
A4:13:4E Luxul # Luxul
+A4:14:37 Hangzhou # Hangzhou Hikvision Digital Technology Co.,Ltd.
A4:15:66 WeiFangG # Wei Fang Goertek Electronics Co.,Ltd
A4:15:88 ArrisGro # ARRIS Group, Inc.
A4:17:31 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
@@ -25622,6 +25660,7 @@ A4:24:B3 Flatfrog # FlatFrog Laboratories AB
A4:24:DD Cambrion # Cambrionix Ltd
A4:25:1B AvayaInc # Avaya Inc
A4:29:40 Shenzhen # Shenzhen YOUHUA Technology Co., Ltd
+A4:29:83 BoeingDe # Boeing Defence Australia
A4:29:B7 Bluesky # bluesky
A4:2B:8C Netgear # NETGEAR
A4:2B:B0 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD.
@@ -25679,6 +25718,7 @@ A4:4F:29:F0:00:00/28 Private # Private
A4:50:55 BuswareD # busware.de
A4:51:6F Microsof # Microsoft Mobile Oy
A4:52:6F AdbBroad # ADB Broadband Italia
+A4:53:85 WeifangG # Weifang GoerTek Electronics Co., Ltd.
A4:56:02 Fenglian # fenglian Technology Co.,Ltd.
A4:56:1B McotCorp # MCOT Corporation
A4:56:30 CiscoInc # Cisco Systems, Inc
@@ -25700,7 +25740,7 @@ A4:77:60 NokiaCor # Nokia Corporation
A4:79:E4 KlinfoCo # KLINFO Corp
A4:7A:A4 ArrisGro # ARRIS Group, Inc.
A4:7A:CF VibicomC # VIBICOM COMMUNICATIONS INC.
-A4:7B:2C Alcatel- # Alcatel-Lucent Canada
+A4:7B:2C Nokia # Nokia
A4:7B:85 Ultimedi # ULTIMEDIA Co Ltd,
A4:7C:14 Chargest # ChargeStorm AB
A4:7C:1F CobhamPl # Cobham plc
@@ -25979,6 +26019,7 @@ AC:61:23 Drivven # Drivven, Inc.
AC:61:75 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
AC:61:EA Apple # Apple, Inc.
AC:62:0D JabilCir # Jabil Circuit(Wuxi) Co.,Ltd
+AC:63:BE AmazonTe # Amazon Technologies Inc.
AC:64:62 ZteCorpo # zte corporation
AC:67:06 RuckusWi # Ruckus Wireless
AC:67:6F Electroc # Electrocompaniet A.S.
@@ -26021,6 +26062,7 @@ AC:A3:1E ArubaNet # Aruba Networks
AC:A4:30 Peerless # Peerless AV
AC:A9:19 Trekstor # TrekStor GmbH
AC:A9:A0 Audioeng # Audioengine, Ltd.
+AC:AB:2E BeijingL # Beijing LasNubes Technology Co., Ltd.
AC:AB:8D LyngsoMa # Lyngso Marine A/S
AC:AB:BF Athentek # AthenTek Inc.
AC:B3:13 ArrisGro # ARRIS Group, Inc.
@@ -26143,7 +26185,7 @@ B0:69:71 DeiSales # DEI Sales, Inc.
B0:6C:BF 3alityDi # 3ality Digital Systems GmbH
B0:72:BF MurataMa # Murata Manufacturing Co., Ltd.
B0:75:0C QaCafe # QA Cafe
-B0:75:4D Alcatel- # Alcatel-Lucent Canada
+B0:75:4D Nokia # Nokia
B0:75:D5 ZteCorpo # zte corporation
B0:77:AC ArrisGro # ARRIS Group, Inc.
B0:78:70 Wi-Next # Wi-NEXT, Inc.
@@ -26625,14 +26667,14 @@ BC:44:34 Shenzhen # Shenzhen TINNO Mobile Technology Corp.
BC:44:86 SamsungE # Samsung Electronics Co.,Ltd
BC:44:B0 Elastifi # Elastifile
BC:46:99 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD.
-BC:47:60 5481 # 5481
+BC:47:60 SamsungE # Samsung Electronics Co.,Ltd
BC:4B:79 Sensingt # SensingTek
BC:4C:C4 Apple # Apple, Inc.
BC:4D:FB HitronTe # Hitron Technologies. Inc
BC:4E:3C CoreStaf # CORE STAFF CO., LTD.
BC:4E:5D Zhongmia # ZhongMiao Technology Co., Ltd.
BC:51:FE SwannCom # Swann communications Pty Ltd
-BC:52:B4 Alcatel- # Alcatel-Lucent Canada
+BC:52:B4 Nokia # Nokia
BC:52:B7 Apple # Apple, Inc.
BC:54:36 Apple # Apple, Inc.
BC:54:F9 DrogooTe # Drogoo Technology Co., Ltd.
@@ -26668,7 +26710,7 @@ BC:6A:16 Tdvine # tdvine
BC:6A:29 TexasIns # Texas Instruments
BC:6A:2F HengeDoc # Henge Docks LLC
BC:6A:44 CommendI # Commend International GmbH
-BC:6B:4D Alcatel- # Alcatel-Lucent Canada
+BC:6B:4D Nokia # Nokia
BC:6C:21 Apple # Apple, Inc.
BC:6E:64 SonyMobi # Sony Mobile Communications AB
BC:6E:76 GreenEne # Green Energy Options Ltd
@@ -26692,7 +26734,7 @@ BC:88:93 Villbau # VILLBAU Ltd.
BC:8A:A3 NhnEnter # NHN Entertainment
BC:8B:55 NppEliks # NPP ELIKS America Inc. DBA T&M Atlantic
BC:8C:CD SamsungE # SAMSUNG ELECTRO-MECHANICS(THAILAND)
-BC:8D:0E Alcatel- # Alcatel-Lucent Canada
+BC:8D:0E Nokia # Nokia
BC:92:6B Apple # Apple, Inc.
BC:96:80 Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd
BC:98:89 Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD
@@ -26824,6 +26866,7 @@ C0:98:E5 Universi # University of Michigan
C0:9A:71 XiamenMe # XIAMEN MEITU MOBILE TECHNOLOGY CO.LTD
C0:9C:92 Coby # COBY
C0:9D:26 TopiconH # Topicon HK Lmd.
+C0:9F:05 Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
C0:9F:42 Apple # Apple, Inc.
C0:A0:BB D-LinkIn # D-Link International
C0:A0:C7 Fairfiel # FAIRFIELD INDUSTRIES
@@ -26886,7 +26929,7 @@ C0:F2:FB Apple # Apple, Inc.
C0:F6:36 Hangzhou # Hangzhou Kuaiyue Technologies, Ltd.
C0:F7:9D Powercod # Powercode
C0:F8:DA HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
-C0:F9:45 ToshibaT # Toshiba Toko meter systems co., LTD.
+C0:F9:45 ToshibaT # Toshiba Toko Meter Systems Co., LTD.
C0:F9:91 GmeStand # GME Standard Communications P/L
C0:FF:D4 Netgear # NETGEAR
C4:00:06 LipiData # Lipi Data Systems Ltd.
@@ -26899,7 +26942,7 @@ C4:04:15 Netgear # NETGEAR
C4:04:7B Shenzhen # Shenzhen YOUHUA Technology Co., Ltd
C4:05:28 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
C4:07:2F HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
-C4:08:4A Alcatel- # Alcatel-Lucent Canada
+C4:08:4A Nokia # Nokia
C4:08:80 Shenzhen # Shenzhen UTEPO Tech Co., Ltd.
C4:09:38 FujianSt # FUJIAN STAR-NET COMMUNICATION CO.,LTD
C4:0A:CB CiscoInc # Cisco Systems, Inc
@@ -27123,7 +27166,7 @@ C8:77:8B ThemisCo # Themis Computer
C8:7B:5B ZteCorpo # zte corporation
C8:7C:BC Valink # Valink Co., Ltd.
C8:7D:77 Shenzhen # Shenzhen Kingtech Communication Equipment Co.,Ltd
-C8:7E:75 5481 # 5481
+C8:7E:75 SamsungE # Samsung Electronics Co.,Ltd
C8:84:39 SunriseT # Sunrise Technologies
C8:84:47 Beautifu # Beautiful Enterprise Co., Ltd
C8:85:50 Apple # Apple, Inc.
@@ -27231,7 +27274,7 @@ CC:00:80 BettiniS # BETTINI SRL
CC:03:FA Technico # Technicolor CH USA Inc.
CC:04:7C G-WayMic # G-WAY Microwave
CC:04:B4 SelectCo # Select Comfort
-CC:05:1B 5481 # 5481
+CC:05:1B SamsungE # Samsung Electronics Co.,Ltd
CC:07:AB SamsungE # Samsung Electronics Co.,Ltd
CC:07:E4 LenovoMo # Lenovo Mobile Communication Technology Ltd.
CC:08:E0 Apple # Apple, Inc.
@@ -27419,7 +27462,7 @@ D0:12:42 BiosCorp # BIOS Corporation
D0:13:1E SunrexTe # Sunrex Technology Corp
D0:13:FD LgElectr # LG Electronics (Mobile Communications)
D0:15:4A ZteCorpo # zte corporation
-D0:17:6A 5481 # 5481
+D0:17:6A SamsungE # Samsung Electronics Co.,Ltd
D0:17:C2 AsustekC # ASUSTek COMPUTER INC.
D0:1A:A7 Uniprint # UniPrint
D0:1C:BB BeijingC # Beijing Ctimes Digital Technology Co., Ltd.
@@ -27691,7 +27734,7 @@ D4:83:04 Shenzhen # SHENZHEN FAST TECHNOLOGIES CO.,LTD
D4:85:64 HewlettP # Hewlett Packard
D4:87:D8 SamsungE # Samsung Electronics Co.,Ltd
D4:88:3F Hdpro # HDPRO CO., LTD.
-D4:88:90 5481 # 5481
+D4:88:90 SamsungE # Samsung Electronics Co.,Ltd
D4:8C:B5 CiscoInc # Cisco Systems, Inc
D4:8D:D9 MeldTech # Meld Technology, Inc
D4:8F:33 Microsof # Microsoft Corporation
@@ -27744,7 +27787,7 @@ D4:D9:19 Gopro # GoPro
D4:DF:57 Alpinion # Alpinion Medical Systems
D4:E0:8E ValuehdC # ValueHD Corporation
D4:E3:2C SSiedleS # S. Siedle & Sohne
-D4:E3:3F Alcatel- # Alcatel-Lucent Canada
+D4:E3:3F Nokia # Nokia
D4:E8:B2 SamsungE # Samsung Electronics Co.,Ltd
D4:EA:0E AvayaInc # Avaya Inc
D4:EC:0C Harley-D # Harley-Davidson Motor Company
@@ -27767,6 +27810,7 @@ D8:09:C3 Cercacor # Cercacor Labs
D8:0C:CF CGVSAS # C.G.V. S.A.S.
D8:0D:E3 FxiTechn # FXI TECHNOLOGIES AS
D8:0F:99 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
+D8:14:D6 SureSyst # SURE SYSTEM Co Ltd
D8:15:0D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD.
D8:16:0A NipponEl # Nippon Electro-Sensory Devices
D8:18:2B ContiTem # Conti Temic Microelectronic GmbH
@@ -28092,6 +28136,7 @@ E0:26:30 Intrigue # Intrigue Technologies, Inc.
E0:26:36 NortelNe # Nortel Networks
E0:27:1A TtcNext- # TTC Next-generation Home Network System WG
E0:28:61 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
+E0:28:6D AvmAudio # AVM Audiovisuelles Marketing und Computersysteme GmbH
E0:2A:82 Universa # Universal Global Scientific Industrial Co., Ltd.
E0:2C:B2 LenovoMo # Lenovo Mobile Communication (Wuhan) Company Limited
E0:2F:6D CiscoInc # Cisco Systems, Inc
@@ -28129,6 +28174,7 @@ E0:63:E5 SonyMobi # Sony Mobile Communications AB
E0:64:BB Digiview # DigiView S.r.l.
E0:66:78 Apple # Apple, Inc.
E0:67:B3 C-DataTe # C-Data Technology Co., Ltd
+E0:68:6D Raybased # Raybased AB
E0:69:95 Pegatron # PEGATRON CORPORATION
E0:75:0A AlpsElec # ALPS ELECTRIC CO.,LTD.
E0:75:7D Motorola # Motorola Mobility LLC, a Lenovo Company
@@ -28302,7 +28348,7 @@ E4:7C:F9 SamsungE # Samsung Electronics Co.,Ltd
E4:7D:5A BeijingH # Beijing Hanbang Technology Corp.
E4:7E:66 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
E4:7F:B2 FujitsuL # FUJITSU LIMITED
-E4:81:84 Alcatel- # Alcatel-Lucent Canada
+E4:81:84 Nokia # Nokia
E4:81:B3 Shenzhen # Shenzhen ACT Industrial Co.,Ltd.
E4:83:99 ArrisGro # ARRIS Group, Inc.
E4:85:01 GeberitI # Geberit International AG
@@ -28386,6 +28432,7 @@ E4:FA:FD IntelCor # Intel Corporate
E4:FB:8F Mobiwire # MOBIWIRE MOBILES (NINGBO) CO.,LTD
E4:FE:D9 EdmiEuro # EDMI Europe Ltd
E4:FF:DD Electron # ELECTRON INDIA
+E8:00:36 BefsLtd # Befs co,. ltd
E8:03:9A SamsungE # Samsung Electronics Co.,Ltd
E8:04:0B Apple # Apple, Inc.
E8:04:10 Private # Private
@@ -28464,7 +28511,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 CiscoInc # Cisco Systems, Inc
-E8:66:C4 Datawise # Datawise Systems
+E8:66:C4 Diamanti # Diamanti
E8:6C:DA Supercom # Supercomputers and Neurocomputers Research Center
E8:6D:52 ArrisGro # ARRIS Group, Inc.
E8:6D:54 DigitMob # Digit Mobile Inc
@@ -28527,7 +28574,7 @@ E8:DF:F2 Prf # PRF Co., Ltd.
E8:E0:8F Gravotec # GRAVOTECH MARKING SAS
E8:E0:B7 Toshiba # Toshiba
E8:E1:E2 Energote # Energotest
-E8:E5:D6 5481 # 5481
+E8:E5:D6 SamsungE # Samsung Electronics Co.,Ltd
E8:E7:32 Alcatel- # Alcatel-Lucent
E8:E7:70 Warp9Tec # Warp9 Tech Design, Inc.
E8:E7:76 Shenzhen # Shenzhen Kootion Technology Co., Ltd
@@ -29083,6 +29130,7 @@ F8:5C:45 IcNexus # IC Nexus Co. Ltd.
F8:5C:4D Nokia # NOKIA
F8:5F:2A NokiaCor # Nokia Corporation
F8:62:AA XnSystem # xn systems
+F8:63:3F IntelCor # Intel Corporate
F8:66:01 SuzhouCh # Suzhou Chi-tek information technology Co., Ltd
F8:66:D1 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
F8:66:F2 CiscoInc # Cisco Systems, Inc
@@ -29213,7 +29261,7 @@ FC:2A:54 Connecte # Connected Data, Inc.
FC:2D:5E ZteCorpo # zte corporation
FC:2E:2D LoromInd # Lorom Industrial Co.LTD.
FC:2F:40 Calxeda # Calxeda, Inc.
-FC:2F:AA Alcatel- # Alcatel-Lucent Canada
+FC:2F:AA Nokia # Nokia
FC:2F:EF UttTechn # UTT Technologies Co., Ltd.
FC:32:88 CelotWir # CELOT Wireless Co., Ltd
FC:33:5F Polyera # Polyera
diff --git a/services b/services
index 0f557849ce..23e4c84851 100644
--- a/services
+++ b/services
@@ -11015,6 +11015,7 @@ mountd 20048/udp # NFS mount protocol [Nicolas_Williams] [Nicolas_Willi
nfsrdma 20049/tcp # Network File System (NFS) over RDMA [RFC5666]
nfsrdma 20049/udp # Network File System (NFS) over RDMA [RFC5666]
nfsrdma 20049/sctp # Network File System (NFS) over RDMA [RFC5666]
+avesterra 20057/tcp # AvesTerra Hypergraph Transfer Protocol (HGTP) [Georgetown_University] [J.C._Smart] 2016-06-06
tolfab 20167/tcp # TOLfab Data Change [Pierre_Couderc] [Pierre_Couderc] 2006-03
tolfab 20167/udp # TOLfab Data Change [Pierre_Couderc] [Pierre_Couderc] 2006-03
ipdtp-port 20202/tcp # IPD Tunneling Port [Vikki_Yin_Wei] [Vikki_Yin_Wei] 2003-01
diff --git a/ui/qt/wireshark_de.qm b/ui/qt/wireshark_de.qm
index e8ecefd0e6..97991c2918 100644
--- a/ui/qt/wireshark_de.qm
+++ b/ui/qt/wireshark_de.qm
Binary files differ
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 0c8eb25248..1fc3a29781 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -151,6 +151,195 @@
</message>
</context>
<context>
+ <name>BluetoothDeviceDialog</name>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="23"/>
+ <source>Bluetooth Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="78"/>
+ <source>BD_ADDR</source>
+ <translation type="unfinished">BD_ADDR</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="83"/>
+ <source>OUI</source>
+ <translation type="unfinished">OUI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="88"/>
+ <source>Name</source>
+ <translation type="unfinished">Name</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="93"/>
+ <source>Class of Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="98"/>
+ <source>LMP Version</source>
+ <translation type="unfinished">LMP Version</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="103"/>
+ <source>LMP Subverion</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="108"/>
+ <source>Manufacturer</source>
+ <translation type="unfinished">Hersteller</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="113"/>
+ <source>HCI Version</source>
+ <translation type="unfinished">HCI Version</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="118"/>
+ <source>HCI Revision</source>
+ <translation type="unfinished">HCI Revision</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="123"/>
+ <source>Scan</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="128"/>
+ <source>Authentication</source>
+ <translation type="unfinished">Authentifizierung</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="133"/>
+ <source>Encryption</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="138"/>
+ <source>ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="143"/>
+ <source>ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="148"/>
+ <source>SCO MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="153"/>
+ <source>SCO Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="158"/>
+ <source>LE ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="163"/>
+ <source>LE ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="168"/>
+ <source>Inquiry Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="173"/>
+ <source>Page Timeout</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="178"/>
+ <source>Simple Pairing Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="183"/>
+ <source>Voice Setting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="188"/>
+ <source>Value</source>
+ <translation type="unfinished">Wert</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="193"/>
+ <source>Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="206"/>
+ <location filename="bluetooth_device_dialog.cpp" line="586"/>
+ <source>%1 changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="223"/>
+ <source>Copy Cell</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="228"/>
+ <source>Copy Rows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="233"/>
+ <source>Copy All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="238"/>
+ <source>Save as image</source>
+ <translation type="unfinished">Als Bild speichern</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="180"/>
+ <source>Unknown</source>
+ <translation type="unfinished">Unbekannt</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="189"/>
+ <source>Bluetooth Device - %1%2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>enabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>disabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="529"/>
+ <source>%1 ms (%2 slots)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="621"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished">Tabelle als Grafik speichern</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="623"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished">PNG Bild (*.png)</translation>
+ </message>
+</context>
+<context>
<name>BluetoothDevicesDialog</name>
<message>
<location filename="bluetooth_devices_dialog.ui" line="20"/>
@@ -213,38 +402,44 @@
<translation>Einzelne Schritte anzeigen</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="156"/>
+ <location filename="bluetooth_devices_dialog.ui" line="146"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="329"/>
+ <source>%1 items; Right click for more option; Double click for device details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_devices_dialog.ui" line="163"/>
<source>Copy Cell</source>
<translation>Kopiere Zelle</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="161"/>
+ <location filename="bluetooth_devices_dialog.ui" line="168"/>
<source>Copy Rows</source>
<translation>Kopiere Zeile</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="166"/>
+ <location filename="bluetooth_devices_dialog.ui" line="173"/>
<source>Copy All</source>
<translation>Kopiere Alles</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="171"/>
+ <location filename="bluetooth_devices_dialog.ui" line="178"/>
<source>Save as image</source>
<translation>Als Bild speichern</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="274"/>
- <location filename="bluetooth_devices_dialog.cpp" line="293"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="290"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="310"/>
<source>true</source>
<translation>Wahr</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="378"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="398"/>
<source>Save Table Image</source>
<translation>Tabelle als Grafik speichern</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="380"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="400"/>
<source>PNG Image (*.png)</source>
<translation>PNG Bild (*.png)</translation>
</message>
@@ -323,8 +518,10 @@
<location filename="bluetooth_hci_summary_dialog.ui" line="330"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="359"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="388"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="417"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="446"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="475"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="504"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="533"/>
<source>0</source>
<translation>0</translation>
@@ -455,37 +652,37 @@
<translation>Als Bild speichern</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="312"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="308"/>
<source>Unknown</source>
<translation>Unbekannt</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="330"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="326"/>
<source>Adapter %1</source>
<translation>Adapter %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="418"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="468"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="505"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="539"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="576"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="610"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="414"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="464"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="501"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="535"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="572"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="606"/>
<source>Frame %1</source>
<translation>Frame %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="528"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="524"/>
<source>Pending</source>
<translation>Ausstehend</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="721"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="717"/>
<source>Save Table Image</source>
<translation>Tabelle als Grafik speichern</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="723"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="719"/>
<source>PNG Image (*.png)</source>
<translation>PNG Bild (*.png)</translation>
</message>
@@ -2172,129 +2369,139 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
</message>
<message>
<location filename="expert_info_dialog.ui" line="32"/>
+ <source>Summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="37"/>
<source>Group</source>
<translation>Gruppe</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="37"/>
+ <location filename="expert_info_dialog.ui" line="42"/>
<source>Protocol</source>
<translation>Protokoll</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="42"/>
+ <location filename="expert_info_dialog.ui" line="47"/>
<source>Count</source>
<translation>Anzahl</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="50"/>
+ <location filename="expert_info_dialog.ui" line="55"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;Hinweis&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="59"/>
+ <location filename="expert_info_dialog.ui" line="64"/>
<source>Limit to Display Filter</source>
<translation>Auf Anzeigenfilter beschränken</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="79"/>
- <location filename="expert_info_dialog.ui" line="89"/>
+ <location filename="expert_info_dialog.ui" line="84"/>
+ <source>Group by summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="107"/>
+ <location filename="expert_info_dialog.ui" line="117"/>
<source>Search expert summaries.</source>
<translation>In den Experten Informationen suchen.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="82"/>
+ <location filename="expert_info_dialog.ui" line="110"/>
<source>Search:</source>
<translation>Suchen:</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="109"/>
+ <location filename="expert_info_dialog.ui" line="137"/>
<source>Show…</source>
<oldsource>Show...</oldsource>
<translation>Zeige...</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="131"/>
+ <location filename="expert_info_dialog.ui" line="159"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="134"/>
+ <location filename="expert_info_dialog.ui" line="162"/>
<source>Show error packets.</source>
<translation>Pakete mit Fehler anzeigen.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="142"/>
+ <location filename="expert_info_dialog.ui" line="170"/>
<source>Warning</source>
<translation>Warnungen</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="145"/>
+ <location filename="expert_info_dialog.ui" line="173"/>
<source>Show warning packets.</source>
<translation>Pakete mit Warnungen anzeigen.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="153"/>
+ <location filename="expert_info_dialog.ui" line="181"/>
<source>Note</source>
<translation>Hinweise</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="156"/>
+ <location filename="expert_info_dialog.ui" line="184"/>
<source>Show note packets.</source>
<translation>Pakete mit Hinweise anzeigen.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="164"/>
+ <location filename="expert_info_dialog.ui" line="192"/>
<source>Chat</source>
<translation>Informationen</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="167"/>
+ <location filename="expert_info_dialog.ui" line="195"/>
<source>Show chat packets.</source>
<translation>Pakete mit Informationen anzeigen.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="175"/>
+ <location filename="expert_info_dialog.ui" line="203"/>
<source>Comment</source>
<translation>Kommentare</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="178"/>
+ <location filename="expert_info_dialog.ui" line="206"/>
<source>Show comment packets.</source>
<translation>Pakete mit Kommentare anzeigen.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="142"/>
+ <location filename="expert_info_dialog.cpp" line="193"/>
<source>Expert Information</source>
<translation>Experteninformationen</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="257"/>
+ <location filename="expert_info_dialog.cpp" line="308"/>
<source>Endpoint expert failed to set filter</source>
<translation>Endpunkteexperte konnte einen Filter nicht setzen</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="458"/>
- <location filename="expert_info_dialog.cpp" line="459"/>
+ <location filename="expert_info_dialog.cpp" line="529"/>
+ <location filename="expert_info_dialog.cpp" line="530"/>
<source>Capture file closed.</source>
<translation>Mitschnittdatei geschlossen.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="461"/>
+ <location filename="expert_info_dialog.cpp" line="532"/>
<source>No display filter</source>
<translation>Kein Anzeigefilter vorhanden</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="462"/>
+ <location filename="expert_info_dialog.cpp" line="533"/>
<source>No display filter set.</source>
<translation>Kein Anzeigenfilter angewendet.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="464"/>
+ <location filename="expert_info_dialog.cpp" line="535"/>
<source>Limit information to &quot;%1&quot;.</source>
<translation>Informationen beschränken auf &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="465"/>
+ <location filename="expert_info_dialog.cpp" line="536"/>
<source>Display filter: &quot;%1&quot;</source>
<translation>Anzeigefilter: &quot;%1&quot;</translation>
</message>
@@ -13494,11 +13701,13 @@ text-decoration: underline;
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</oldsource>
- <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;h3&gt;Nützliche Tastenkürzel zur Zeitersparnis&lt;/h3&gt;
&lt;table&gt;&lt;tbody&gt;
+&lt;tr&gt;&lt;th&gt;+&lt;/th&gt;&lt;td&gt;Vergrößern&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;-&lt;/th&gt;&lt;td&gt;Verkleinern&lt;/td&gt;&lt;/th&gt;
&lt;tr&gt;&lt;th&gt;0&lt;/th&gt;&lt;td&gt;Graph in Ursprungszustand zurücksetzen&lt;/td&gt;&lt;/th&gt;
&lt;tr&gt;&lt;th&gt;→&lt;/th&gt;&lt;td&gt;10 Bildpunkte nach rechts&lt;/td&gt;&lt;/th&gt;
@@ -13581,23 +13790,23 @@ text-decoration: underline;
<location filename="sequence_dialog.ui" line="235"/>
<location filename="sequence_dialog.ui" line="238"/>
<source>Zoom In</source>
- <translation type="unfinished">Vergrößern</translation>
+ <translation>Vergrößern</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="241"/>
<source>+</source>
- <translation type="unfinished">+</translation>
+ <translation>+</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="246"/>
<location filename="sequence_dialog.ui" line="249"/>
<source>Zoom Out</source>
- <translation type="unfinished">Verkleinern</translation>
+ <translation>Verkleinern</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="252"/>
<source>-</source>
- <translation type="unfinished">-</translation>
+ <translation>-</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="257"/>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 49326119ac..a1dfc1e69d 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -151,6 +151,195 @@
</message>
</context>
<context>
+ <name>BluetoothDeviceDialog</name>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="23"/>
+ <source>Bluetooth Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="78"/>
+ <source>BD_ADDR</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="83"/>
+ <source>OUI</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="88"/>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="93"/>
+ <source>Class of Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="98"/>
+ <source>LMP Version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="103"/>
+ <source>LMP Subverion</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="108"/>
+ <source>Manufacturer</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="113"/>
+ <source>HCI Version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="118"/>
+ <source>HCI Revision</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="123"/>
+ <source>Scan</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="128"/>
+ <source>Authentication</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="133"/>
+ <source>Encryption</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="138"/>
+ <source>ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="143"/>
+ <source>ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="148"/>
+ <source>SCO MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="153"/>
+ <source>SCO Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="158"/>
+ <source>LE ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="163"/>
+ <source>LE ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="168"/>
+ <source>Inquiry Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="173"/>
+ <source>Page Timeout</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="178"/>
+ <source>Simple Pairing Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="183"/>
+ <source>Voice Setting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="188"/>
+ <source>Value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="193"/>
+ <source>Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="206"/>
+ <location filename="bluetooth_device_dialog.cpp" line="586"/>
+ <source>%1 changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="223"/>
+ <source>Copy Cell</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="228"/>
+ <source>Copy Rows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="233"/>
+ <source>Copy All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="238"/>
+ <source>Save as image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="180"/>
+ <source>Unknown</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="189"/>
+ <source>Bluetooth Device - %1%2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>enabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>disabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="529"/>
+ <source>%1 ms (%2 slots)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="621"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="623"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>BluetoothDevicesDialog</name>
<message>
<location filename="bluetooth_devices_dialog.ui" line="20"/>
@@ -213,38 +402,44 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="156"/>
+ <location filename="bluetooth_devices_dialog.ui" line="146"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="329"/>
+ <source>%1 items; Right click for more option; Double click for device details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_devices_dialog.ui" line="163"/>
<source>Copy Cell</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="161"/>
+ <location filename="bluetooth_devices_dialog.ui" line="168"/>
<source>Copy Rows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="166"/>
+ <location filename="bluetooth_devices_dialog.ui" line="173"/>
<source>Copy All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="171"/>
+ <location filename="bluetooth_devices_dialog.ui" line="178"/>
<source>Save as image</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="274"/>
- <location filename="bluetooth_devices_dialog.cpp" line="293"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="290"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="310"/>
<source>true</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="378"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="398"/>
<source>Save Table Image</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="380"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="400"/>
<source>PNG Image (*.png)</source>
<translation type="unfinished"></translation>
</message>
@@ -323,8 +518,10 @@
<location filename="bluetooth_hci_summary_dialog.ui" line="330"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="359"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="388"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="417"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="446"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="475"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="504"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="533"/>
<source>0</source>
<translation type="unfinished"></translation>
@@ -455,37 +652,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="312"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="308"/>
<source>Unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="330"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="326"/>
<source>Adapter %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="418"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="468"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="505"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="539"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="576"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="610"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="414"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="464"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="501"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="535"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="572"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="606"/>
<source>Frame %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="528"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="524"/>
<source>Pending</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="721"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="717"/>
<source>Save Table Image</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="723"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="719"/>
<source>PNG Image (*.png)</source>
<translation type="unfinished"></translation>
</message>
@@ -2161,129 +2358,139 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="expert_info_dialog.ui" line="32"/>
- <source>Group</source>
+ <source>Summary</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="expert_info_dialog.ui" line="37"/>
- <source>Protocol</source>
+ <source>Group</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="expert_info_dialog.ui" line="42"/>
+ <source>Protocol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="47"/>
<source>Count</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="50"/>
+ <location filename="expert_info_dialog.ui" line="55"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="59"/>
+ <location filename="expert_info_dialog.ui" line="64"/>
<source>Limit to Display Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="79"/>
- <location filename="expert_info_dialog.ui" line="89"/>
+ <location filename="expert_info_dialog.ui" line="84"/>
+ <source>Group by summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="107"/>
+ <location filename="expert_info_dialog.ui" line="117"/>
<source>Search expert summaries.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="82"/>
+ <location filename="expert_info_dialog.ui" line="110"/>
<source>Search:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="109"/>
+ <location filename="expert_info_dialog.ui" line="137"/>
<source>Show…</source>
<oldsource>Show...</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="131"/>
+ <location filename="expert_info_dialog.ui" line="159"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="134"/>
+ <location filename="expert_info_dialog.ui" line="162"/>
<source>Show error packets.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="142"/>
+ <location filename="expert_info_dialog.ui" line="170"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="145"/>
+ <location filename="expert_info_dialog.ui" line="173"/>
<source>Show warning packets.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="153"/>
+ <location filename="expert_info_dialog.ui" line="181"/>
<source>Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="156"/>
+ <location filename="expert_info_dialog.ui" line="184"/>
<source>Show note packets.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="164"/>
+ <location filename="expert_info_dialog.ui" line="192"/>
<source>Chat</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="167"/>
+ <location filename="expert_info_dialog.ui" line="195"/>
<source>Show chat packets.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="175"/>
+ <location filename="expert_info_dialog.ui" line="203"/>
<source>Comment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="178"/>
+ <location filename="expert_info_dialog.ui" line="206"/>
<source>Show comment packets.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="142"/>
+ <location filename="expert_info_dialog.cpp" line="193"/>
<source>Expert Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="257"/>
+ <location filename="expert_info_dialog.cpp" line="308"/>
<source>Endpoint expert failed to set filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="458"/>
- <location filename="expert_info_dialog.cpp" line="459"/>
+ <location filename="expert_info_dialog.cpp" line="529"/>
+ <location filename="expert_info_dialog.cpp" line="530"/>
<source>Capture file closed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="461"/>
+ <location filename="expert_info_dialog.cpp" line="532"/>
<source>No display filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="462"/>
+ <location filename="expert_info_dialog.cpp" line="533"/>
<source>No display filter set.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="464"/>
+ <location filename="expert_info_dialog.cpp" line="535"/>
<source>Limit information to &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="465"/>
+ <location filename="expert_info_dialog.cpp" line="536"/>
<source>Display filter: &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_fr.qm b/ui/qt/wireshark_fr.qm
index e557a82b27..fbf96212f1 100644
--- a/ui/qt/wireshark_fr.qm
+++ b/ui/qt/wireshark_fr.qm
Binary files differ
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index f0b689c6c9..79b94c2a2a 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -151,6 +151,195 @@
</message>
</context>
<context>
+ <name>BluetoothDeviceDialog</name>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="23"/>
+ <source>Bluetooth Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="78"/>
+ <source>BD_ADDR</source>
+ <translation type="unfinished">BD_ADDR</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="83"/>
+ <source>OUI</source>
+ <translation type="unfinished">OUI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="88"/>
+ <source>Name</source>
+ <translation type="unfinished">Nom</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="93"/>
+ <source>Class of Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="98"/>
+ <source>LMP Version</source>
+ <translation type="unfinished">Version LMP</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="103"/>
+ <source>LMP Subverion</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="108"/>
+ <source>Manufacturer</source>
+ <translation type="unfinished">Fabricant</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="113"/>
+ <source>HCI Version</source>
+ <translation type="unfinished">Version HCI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="118"/>
+ <source>HCI Revision</source>
+ <translation type="unfinished">Révision HCI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="123"/>
+ <source>Scan</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="128"/>
+ <source>Authentication</source>
+ <translation type="unfinished">Authentification</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="133"/>
+ <source>Encryption</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="138"/>
+ <source>ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="143"/>
+ <source>ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="148"/>
+ <source>SCO MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="153"/>
+ <source>SCO Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="158"/>
+ <source>LE ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="163"/>
+ <source>LE ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="168"/>
+ <source>Inquiry Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="173"/>
+ <source>Page Timeout</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="178"/>
+ <source>Simple Pairing Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="183"/>
+ <source>Voice Setting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="188"/>
+ <source>Value</source>
+ <translation type="unfinished">Valeur</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="193"/>
+ <source>Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="206"/>
+ <location filename="bluetooth_device_dialog.cpp" line="586"/>
+ <source>%1 changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="223"/>
+ <source>Copy Cell</source>
+ <translation type="unfinished">Copier la cellule</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="228"/>
+ <source>Copy Rows</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="233"/>
+ <source>Copy All</source>
+ <translation type="unfinished">Copier Tout</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="238"/>
+ <source>Save as image</source>
+ <translation type="unfinished">Enregistrer en tant qu&apos;image</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="180"/>
+ <source>Unknown</source>
+ <translation type="unfinished">Inconnu</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="189"/>
+ <source>Bluetooth Device - %1%2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>enabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>disabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="529"/>
+ <source>%1 ms (%2 slots)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="621"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished">Sauvegarder Image Tableau</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="623"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished">Image PNG (*.png)</translation>
+ </message>
+</context>
+<context>
<name>BluetoothDevicesDialog</name>
<message>
<location filename="bluetooth_devices_dialog.ui" line="20"/>
@@ -213,38 +402,44 @@
<translation>Afficher étapes d&apos;information</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="156"/>
+ <location filename="bluetooth_devices_dialog.ui" line="146"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="329"/>
+ <source>%1 items; Right click for more option; Double click for device details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_devices_dialog.ui" line="163"/>
<source>Copy Cell</source>
<translation>Copier la cellule</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="161"/>
+ <location filename="bluetooth_devices_dialog.ui" line="168"/>
<source>Copy Rows</source>
<translation>Copier les lignes</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="166"/>
+ <location filename="bluetooth_devices_dialog.ui" line="173"/>
<source>Copy All</source>
<translation>Copier Tout</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="171"/>
+ <location filename="bluetooth_devices_dialog.ui" line="178"/>
<source>Save as image</source>
<translation>Enregistrer en tant qu&apos;image</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="274"/>
- <location filename="bluetooth_devices_dialog.cpp" line="293"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="290"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="310"/>
<source>true</source>
<translation>vrai</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="378"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="398"/>
<source>Save Table Image</source>
<translation>Sauvegarder Image Tableau</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="380"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="400"/>
<source>PNG Image (*.png)</source>
<translation>Image PNG (*.png)</translation>
</message>
@@ -323,8 +518,10 @@
<location filename="bluetooth_hci_summary_dialog.ui" line="330"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="359"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="388"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="417"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="446"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="475"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="504"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="533"/>
<source>0</source>
<translation>0</translation>
@@ -455,37 +652,37 @@
<translation>Enregistrer en tant qu&apos;image</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="312"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="308"/>
<source>Unknown</source>
<translation>Inconnu</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="330"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="326"/>
<source>Adapter %1</source>
<translation>Adaptateur %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="418"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="468"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="505"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="539"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="576"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="610"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="414"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="464"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="501"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="535"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="572"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="606"/>
<source>Frame %1</source>
<translation>Trame %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="528"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="524"/>
<source>Pending</source>
<translation>En attente</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="721"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="717"/>
<source>Save Table Image</source>
<translation>Sauvegarder Image Tableau</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="723"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="719"/>
<source>PNG Image (*.png)</source>
<translation>Image PNG (*.png)</translation>
</message>
@@ -2173,129 +2370,139 @@ si vous voulez utiliser des fichiers multiples.</translation>
</message>
<message>
<location filename="expert_info_dialog.ui" line="32"/>
+ <source>Summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="37"/>
<source>Group</source>
<translation>Groupe</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="37"/>
+ <location filename="expert_info_dialog.ui" line="42"/>
<source>Protocol</source>
<translation>Protocole</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="42"/>
+ <location filename="expert_info_dialog.ui" line="47"/>
<source>Count</source>
<translation>Compteur</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="50"/>
+ <location filename="expert_info_dialog.ui" line="55"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;Un indice.&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="59"/>
+ <location filename="expert_info_dialog.ui" line="64"/>
<source>Limit to Display Filter</source>
<translation>Limiter au Filtre d&apos;Affichage</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="79"/>
- <location filename="expert_info_dialog.ui" line="89"/>
+ <location filename="expert_info_dialog.ui" line="84"/>
+ <source>Group by summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="107"/>
+ <location filename="expert_info_dialog.ui" line="117"/>
<source>Search expert summaries.</source>
<translation>Cherche dans les résumés expert.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="82"/>
+ <location filename="expert_info_dialog.ui" line="110"/>
<source>Search:</source>
<translation>Recherche:</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="109"/>
+ <location filename="expert_info_dialog.ui" line="137"/>
<source>Show…</source>
<oldsource>Show...</oldsource>
<translation>Afficher...</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="131"/>
+ <location filename="expert_info_dialog.ui" line="159"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="134"/>
+ <location filename="expert_info_dialog.ui" line="162"/>
<source>Show error packets.</source>
<translation>Afficher les paquets d&apos;erreur.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="142"/>
+ <location filename="expert_info_dialog.ui" line="170"/>
<source>Warning</source>
<translation>Avertissement</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="145"/>
+ <location filename="expert_info_dialog.ui" line="173"/>
<source>Show warning packets.</source>
<translation>Afficher les paquets d&apos;avertissement.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="153"/>
+ <location filename="expert_info_dialog.ui" line="181"/>
<source>Note</source>
<translation>Note</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="156"/>
+ <location filename="expert_info_dialog.ui" line="184"/>
<source>Show note packets.</source>
<translation>Afficher les paquets de note.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="164"/>
+ <location filename="expert_info_dialog.ui" line="192"/>
<source>Chat</source>
<translation>Chat</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="167"/>
+ <location filename="expert_info_dialog.ui" line="195"/>
<source>Show chat packets.</source>
<translation>Afficher les paquets du chat.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="175"/>
+ <location filename="expert_info_dialog.ui" line="203"/>
<source>Comment</source>
<translation>Commentaire</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="178"/>
+ <location filename="expert_info_dialog.ui" line="206"/>
<source>Show comment packets.</source>
<translation>Montre paquets de commentaires</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="142"/>
+ <location filename="expert_info_dialog.cpp" line="193"/>
<source>Expert Information</source>
<translation>Information Expert</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="257"/>
+ <location filename="expert_info_dialog.cpp" line="308"/>
<source>Endpoint expert failed to set filter</source>
<translation>L&apos;expert endpoint n&apos;a pas pu appliquer le filtre</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="458"/>
- <location filename="expert_info_dialog.cpp" line="459"/>
+ <location filename="expert_info_dialog.cpp" line="529"/>
+ <location filename="expert_info_dialog.cpp" line="530"/>
<source>Capture file closed.</source>
<translation>Fichier de capture fermé</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="461"/>
+ <location filename="expert_info_dialog.cpp" line="532"/>
<source>No display filter</source>
<translation>Pas de filtre d&apos;affichage.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="462"/>
+ <location filename="expert_info_dialog.cpp" line="533"/>
<source>No display filter set.</source>
<translation>Filtre d&apos;affichage non défini.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="464"/>
+ <location filename="expert_info_dialog.cpp" line="535"/>
<source>Limit information to &quot;%1&quot;.</source>
<translation>Limiter l&apos;information à &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="465"/>
+ <location filename="expert_info_dialog.cpp" line="536"/>
<source>Display filter: &quot;%1&quot;</source>
<translation>Filtre d&apos;affichage: &quot;%1&quot;</translation>
</message>
diff --git a/ui/qt/wireshark_it.qm b/ui/qt/wireshark_it.qm
index 03ed2570ef..202d39335b 100644
--- a/ui/qt/wireshark_it.qm
+++ b/ui/qt/wireshark_it.qm
Binary files differ
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index ec850ffc5d..62553c9056 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -151,6 +151,195 @@
</message>
</context>
<context>
+ <name>BluetoothDeviceDialog</name>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="23"/>
+ <source>Bluetooth Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="78"/>
+ <source>BD_ADDR</source>
+ <translation type="unfinished">BD_ADDR</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="83"/>
+ <source>OUI</source>
+ <translation type="unfinished">OUI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="88"/>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="93"/>
+ <source>Class of Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="98"/>
+ <source>LMP Version</source>
+ <translation type="unfinished">Versione LMP</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="103"/>
+ <source>LMP Subverion</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="108"/>
+ <source>Manufacturer</source>
+ <translation type="unfinished">Produttore</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="113"/>
+ <source>HCI Version</source>
+ <translation type="unfinished">Versione HCI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="118"/>
+ <source>HCI Revision</source>
+ <translation type="unfinished">Revisione HCI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="123"/>
+ <source>Scan</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="128"/>
+ <source>Authentication</source>
+ <translation type="unfinished">Autenticazione</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="133"/>
+ <source>Encryption</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="138"/>
+ <source>ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="143"/>
+ <source>ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="148"/>
+ <source>SCO MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="153"/>
+ <source>SCO Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="158"/>
+ <source>LE ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="163"/>
+ <source>LE ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="168"/>
+ <source>Inquiry Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="173"/>
+ <source>Page Timeout</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="178"/>
+ <source>Simple Pairing Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="183"/>
+ <source>Voice Setting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="188"/>
+ <source>Value</source>
+ <translation type="unfinished">Valore</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="193"/>
+ <source>Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="206"/>
+ <location filename="bluetooth_device_dialog.cpp" line="586"/>
+ <source>%1 changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="223"/>
+ <source>Copy Cell</source>
+ <translation type="unfinished">Copia cella</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="228"/>
+ <source>Copy Rows</source>
+ <translation type="unfinished">Copia righe</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="233"/>
+ <source>Copy All</source>
+ <translation type="unfinished">Copia tutto</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="238"/>
+ <source>Save as image</source>
+ <translation type="unfinished">Salva come immagine</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="180"/>
+ <source>Unknown</source>
+ <translation type="unfinished">Sconosciuto</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="189"/>
+ <source>Bluetooth Device - %1%2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>enabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>disabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="529"/>
+ <source>%1 ms (%2 slots)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="621"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished">Salva immagine tabella</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="623"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished">Immagine PNG (*.png)</translation>
+ </message>
+</context>
+<context>
<name>BluetoothDevicesDialog</name>
<message>
<location filename="bluetooth_devices_dialog.ui" line="20"/>
@@ -213,38 +402,44 @@
<translation>Mostra i passaggi informativi</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="156"/>
+ <location filename="bluetooth_devices_dialog.ui" line="146"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="329"/>
+ <source>%1 items; Right click for more option; Double click for device details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_devices_dialog.ui" line="163"/>
<source>Copy Cell</source>
<translation>Copia cella</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="161"/>
+ <location filename="bluetooth_devices_dialog.ui" line="168"/>
<source>Copy Rows</source>
<translation>Copia righe</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="166"/>
+ <location filename="bluetooth_devices_dialog.ui" line="173"/>
<source>Copy All</source>
<translation>Copia tutto</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="171"/>
+ <location filename="bluetooth_devices_dialog.ui" line="178"/>
<source>Save as image</source>
<translation>Salva come immagine</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="274"/>
- <location filename="bluetooth_devices_dialog.cpp" line="293"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="290"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="310"/>
<source>true</source>
<translation>vero</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="378"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="398"/>
<source>Save Table Image</source>
<translation>Salva immagine tabella</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="380"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="400"/>
<source>PNG Image (*.png)</source>
<translation>Immagine PNG (*.png)</translation>
</message>
@@ -323,8 +518,10 @@
<location filename="bluetooth_hci_summary_dialog.ui" line="330"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="359"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="388"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="417"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="446"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="475"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="504"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="533"/>
<source>0</source>
<translation>0</translation>
@@ -455,37 +652,37 @@
<translation>Salva come immagine</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="312"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="308"/>
<source>Unknown</source>
<translation>Sconosciuto</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="330"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="326"/>
<source>Adapter %1</source>
<translation>Scheda %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="418"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="468"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="505"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="539"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="576"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="610"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="414"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="464"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="501"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="535"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="572"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="606"/>
<source>Frame %1</source>
<translation>Frame %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="528"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="524"/>
<source>Pending</source>
<translation>In corso</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="721"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="717"/>
<source>Save Table Image</source>
<translation>Salva immagine tabella</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="723"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="719"/>
<source>PNG Image (*.png)</source>
<translation>Immagine PNG (*.png)</translation>
</message>
@@ -2172,129 +2369,139 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
</message>
<message>
<location filename="expert_info_dialog.ui" line="32"/>
+ <source>Summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="37"/>
<source>Group</source>
<translation>Gruppo</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="37"/>
+ <location filename="expert_info_dialog.ui" line="42"/>
<source>Protocol</source>
<translation>Protocollo</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="42"/>
+ <location filename="expert_info_dialog.ui" line="47"/>
<source>Count</source>
<translation>Conteggio</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="50"/>
+ <location filename="expert_info_dialog.ui" line="55"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;Un suggerimento.&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="59"/>
+ <location filename="expert_info_dialog.ui" line="64"/>
<source>Limit to Display Filter</source>
<translation>Limita al filtro di visualizzazione</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="79"/>
- <location filename="expert_info_dialog.ui" line="89"/>
+ <location filename="expert_info_dialog.ui" line="84"/>
+ <source>Group by summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="107"/>
+ <location filename="expert_info_dialog.ui" line="117"/>
<source>Search expert summaries.</source>
<translation>Cerca riepiloghi per esperti.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="82"/>
+ <location filename="expert_info_dialog.ui" line="110"/>
<source>Search:</source>
<translation>Cerca:</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="109"/>
+ <location filename="expert_info_dialog.ui" line="137"/>
<source>Show…</source>
<oldsource>Show...</oldsource>
<translation>Mostra...</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="131"/>
+ <location filename="expert_info_dialog.ui" line="159"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="134"/>
+ <location filename="expert_info_dialog.ui" line="162"/>
<source>Show error packets.</source>
<translation>Mostra i pacchetti di errore.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="142"/>
+ <location filename="expert_info_dialog.ui" line="170"/>
<source>Warning</source>
<translation>Avviso</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="145"/>
+ <location filename="expert_info_dialog.ui" line="173"/>
<source>Show warning packets.</source>
<translation>Mostra i pacchetti di avviso.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="153"/>
+ <location filename="expert_info_dialog.ui" line="181"/>
<source>Note</source>
<translation>Nota</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="156"/>
+ <location filename="expert_info_dialog.ui" line="184"/>
<source>Show note packets.</source>
<translation>Mostra i pacchetti di nota.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="164"/>
+ <location filename="expert_info_dialog.ui" line="192"/>
<source>Chat</source>
<translation>Conversazione</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="167"/>
+ <location filename="expert_info_dialog.ui" line="195"/>
<source>Show chat packets.</source>
<translation>Mostra i pacchetti di conversazione.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="175"/>
+ <location filename="expert_info_dialog.ui" line="203"/>
<source>Comment</source>
<translation>Commento</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="178"/>
+ <location filename="expert_info_dialog.ui" line="206"/>
<source>Show comment packets.</source>
<translation>Mostra i pacchetti di commento.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="142"/>
+ <location filename="expert_info_dialog.cpp" line="193"/>
<source>Expert Information</source>
<translation>Informazioni per esperti</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="257"/>
+ <location filename="expert_info_dialog.cpp" line="308"/>
<source>Endpoint expert failed to set filter</source>
<translation>Il terminatore esperto non è riuscito a impostare il filtro</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="458"/>
- <location filename="expert_info_dialog.cpp" line="459"/>
+ <location filename="expert_info_dialog.cpp" line="529"/>
+ <location filename="expert_info_dialog.cpp" line="530"/>
<source>Capture file closed.</source>
<translation>File di cattura chiuso.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="461"/>
+ <location filename="expert_info_dialog.cpp" line="532"/>
<source>No display filter</source>
<translation>Nessun filtro di visualizzazione</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="462"/>
+ <location filename="expert_info_dialog.cpp" line="533"/>
<source>No display filter set.</source>
<translation>Nessun filtro di visualizzazione impostato.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="464"/>
+ <location filename="expert_info_dialog.cpp" line="535"/>
<source>Limit information to &quot;%1&quot;.</source>
<translation>Limita l&apos;informazione a &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="465"/>
+ <location filename="expert_info_dialog.cpp" line="536"/>
<source>Display filter: &quot;%1&quot;</source>
<translation>Filtro di visualizzazione: &quot;%1&quot;</translation>
</message>
@@ -13492,17 +13699,19 @@ a:hover {
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</oldsource>
- <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;h3&gt;Scorciatoie per la tastiera di valore e meravigliose per risparmiare tempo&lt;/h3&gt;
&lt;table&gt;&lt;tbody&gt;
+&lt;tr&gt;&lt;th&gt;+&lt;/th&gt;&lt;td&gt;Ingrandisci&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;-&lt;/th&gt;&lt;td&gt;Rimpicciolisci&lt;/td&gt;&lt;/th&gt;
&lt;tr&gt;&lt;th&gt;0&lt;/th&gt;&lt;td&gt;Ripristina il grafico al suo stato iniziale&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;→&lt;/th&gt;&lt;td&gt;Sposta a destra 10 pixels&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;←&lt;/th&gt;&lt;td&gt;Sposta a sinistra 10 pixels&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;↑&lt;/th&gt;&lt;td&gt;Sposta in su 10 pixels&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;↓&lt;/th&gt;&lt;td&gt;Sposta in giù 10 pixels&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;→&lt;/th&gt;&lt;td&gt;Sposta a destra 10 pixel&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;←&lt;/th&gt;&lt;td&gt;Sposta a sinistra 10 pixel&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;↑&lt;/th&gt;&lt;td&gt;Sposta in su 10 pixel&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;↓&lt;/th&gt;&lt;td&gt;Sposta in giù 10 pixel&lt;/td&gt;&lt;/th&gt;
&lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;→&lt;/th&gt;&lt;td&gt;Sposta a destra 1 pixel&lt;/td&gt;&lt;/th&gt;
&lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;←&lt;/th&gt;&lt;td&gt;Sposta a sinistra 1 pixel&lt;/td&gt;&lt;/th&gt;
&lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;↑&lt;/th&gt;&lt;td&gt;Sposta in su 1 pixel&lt;/td&gt;&lt;/th&gt;
@@ -13579,23 +13788,23 @@ a:hover {
<location filename="sequence_dialog.ui" line="235"/>
<location filename="sequence_dialog.ui" line="238"/>
<source>Zoom In</source>
- <translation type="unfinished">Ingrandisci</translation>
+ <translation>Ingrandisci</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="241"/>
<source>+</source>
- <translation type="unfinished">+</translation>
+ <translation>+</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="246"/>
<location filename="sequence_dialog.ui" line="249"/>
<source>Zoom Out</source>
- <translation type="unfinished"></translation>
+ <translation>Rimpicciolisci</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="252"/>
<source>-</source>
- <translation type="unfinished">-</translation>
+ <translation>-</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="257"/>
diff --git a/ui/qt/wireshark_ja_JP.qm b/ui/qt/wireshark_ja_JP.qm
index c50e3ecf50..7db0155325 100644
--- a/ui/qt/wireshark_ja_JP.qm
+++ b/ui/qt/wireshark_ja_JP.qm
Binary files differ
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 8d27de13c0..045bf467c8 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -151,6 +151,195 @@
</message>
</context>
<context>
+ <name>BluetoothDeviceDialog</name>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="23"/>
+ <source>Bluetooth Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="78"/>
+ <source>BD_ADDR</source>
+ <translation type="unfinished">BD_ADDR</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="83"/>
+ <source>OUI</source>
+ <translation type="unfinished">OUI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="88"/>
+ <source>Name</source>
+ <translation type="unfinished">名前</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="93"/>
+ <source>Class of Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="98"/>
+ <source>LMP Version</source>
+ <translation type="unfinished">LMPバージョン</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="103"/>
+ <source>LMP Subverion</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="108"/>
+ <source>Manufacturer</source>
+ <translation type="unfinished">製造元</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="113"/>
+ <source>HCI Version</source>
+ <translation type="unfinished">HCIバージョン</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="118"/>
+ <source>HCI Revision</source>
+ <translation type="unfinished">HCIリビジョン</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="123"/>
+ <source>Scan</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="128"/>
+ <source>Authentication</source>
+ <translation type="unfinished">認証</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="133"/>
+ <source>Encryption</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="138"/>
+ <source>ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="143"/>
+ <source>ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="148"/>
+ <source>SCO MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="153"/>
+ <source>SCO Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="158"/>
+ <source>LE ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="163"/>
+ <source>LE ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="168"/>
+ <source>Inquiry Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="173"/>
+ <source>Page Timeout</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="178"/>
+ <source>Simple Pairing Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="183"/>
+ <source>Voice Setting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="188"/>
+ <source>Value</source>
+ <translation type="unfinished">値</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="193"/>
+ <source>Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="206"/>
+ <location filename="bluetooth_device_dialog.cpp" line="586"/>
+ <source>%1 changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="223"/>
+ <source>Copy Cell</source>
+ <translation type="unfinished">セルをコピー</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="228"/>
+ <source>Copy Rows</source>
+ <translation type="unfinished">列をコピー</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="233"/>
+ <source>Copy All</source>
+ <translation type="unfinished">すべてをコピー</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="238"/>
+ <source>Save as image</source>
+ <translation type="unfinished">画像として保存</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="180"/>
+ <source>Unknown</source>
+ <translation type="unfinished">不明</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="189"/>
+ <source>Bluetooth Device - %1%2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>enabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>disabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="529"/>
+ <source>%1 ms (%2 slots)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="621"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="623"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished">PNG画像 (*.png)</translation>
+ </message>
+</context>
+<context>
<name>BluetoothDevicesDialog</name>
<message>
<location filename="bluetooth_devices_dialog.ui" line="20"/>
@@ -213,38 +402,44 @@
<translation>情報ステップを表示</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="156"/>
+ <location filename="bluetooth_devices_dialog.ui" line="146"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="329"/>
+ <source>%1 items; Right click for more option; Double click for device details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_devices_dialog.ui" line="163"/>
<source>Copy Cell</source>
<translation>セルをコピー</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="161"/>
+ <location filename="bluetooth_devices_dialog.ui" line="168"/>
<source>Copy Rows</source>
<translation>列をコピー</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="166"/>
+ <location filename="bluetooth_devices_dialog.ui" line="173"/>
<source>Copy All</source>
<translation>すべてをコピー</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="171"/>
+ <location filename="bluetooth_devices_dialog.ui" line="178"/>
<source>Save as image</source>
<translation>画像として保存</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="274"/>
- <location filename="bluetooth_devices_dialog.cpp" line="293"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="290"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="310"/>
<source>true</source>
<translation>true</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="378"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="398"/>
<source>Save Table Image</source>
<translation>表の画像を保存</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="380"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="400"/>
<source>PNG Image (*.png)</source>
<translation>PNG画像 (*.png)</translation>
</message>
@@ -323,8 +518,10 @@
<location filename="bluetooth_hci_summary_dialog.ui" line="330"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="359"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="388"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="417"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="446"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="475"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="504"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="533"/>
<source>0</source>
<translation>0</translation>
@@ -455,37 +652,37 @@
<translation>画像として保存</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="312"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="308"/>
<source>Unknown</source>
<translation>不明</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="330"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="326"/>
<source>Adapter %1</source>
<translation>アダプタ %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="418"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="468"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="505"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="539"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="576"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="610"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="414"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="464"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="501"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="535"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="572"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="606"/>
<source>Frame %1</source>
<translation>フレーム %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="528"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="524"/>
<source>Pending</source>
<translation>保留</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="721"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="717"/>
<source>Save Table Image</source>
<translation>表の画像を保存</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="723"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="719"/>
<source>PNG Image (*.png)</source>
<translation>PNG画像 (*.png)</translation>
</message>
@@ -2168,129 +2365,139 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="expert_info_dialog.ui" line="32"/>
+ <source>Summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="37"/>
<source>Group</source>
<translation>グループ</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="37"/>
+ <location filename="expert_info_dialog.ui" line="42"/>
<source>Protocol</source>
<translation>プロトコル</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="42"/>
+ <location filename="expert_info_dialog.ui" line="47"/>
<source>Count</source>
<translation>数量</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="50"/>
+ <location filename="expert_info_dialog.ui" line="55"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;ヒント&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="59"/>
+ <location filename="expert_info_dialog.ui" line="64"/>
<source>Limit to Display Filter</source>
<translation>表示フィルタに制限</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="79"/>
- <location filename="expert_info_dialog.ui" line="89"/>
+ <location filename="expert_info_dialog.ui" line="84"/>
+ <source>Group by summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="107"/>
+ <location filename="expert_info_dialog.ui" line="117"/>
<source>Search expert summaries.</source>
<translation>エキスパートサマリを検索します</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="82"/>
+ <location filename="expert_info_dialog.ui" line="110"/>
<source>Search:</source>
<translation>検索:</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="109"/>
+ <location filename="expert_info_dialog.ui" line="137"/>
<source>Show…</source>
<oldsource>Show...</oldsource>
<translation>表示…</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="131"/>
+ <location filename="expert_info_dialog.ui" line="159"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="134"/>
+ <location filename="expert_info_dialog.ui" line="162"/>
<source>Show error packets.</source>
<translation>エラーパケットを表示します</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="142"/>
+ <location filename="expert_info_dialog.ui" line="170"/>
<source>Warning</source>
<translation>警告</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="145"/>
+ <location filename="expert_info_dialog.ui" line="173"/>
<source>Show warning packets.</source>
<translation>警告パケットを表示します</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="153"/>
+ <location filename="expert_info_dialog.ui" line="181"/>
<source>Note</source>
<translation>注意</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="156"/>
+ <location filename="expert_info_dialog.ui" line="184"/>
<source>Show note packets.</source>
<translation>注意パケットを表示します</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="164"/>
+ <location filename="expert_info_dialog.ui" line="192"/>
<source>Chat</source>
<translation>チャット</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="167"/>
+ <location filename="expert_info_dialog.ui" line="195"/>
<source>Show chat packets.</source>
<translation>チャットパケットを表示します</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="175"/>
+ <location filename="expert_info_dialog.ui" line="203"/>
<source>Comment</source>
<translation>コメント</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="178"/>
+ <location filename="expert_info_dialog.ui" line="206"/>
<source>Show comment packets.</source>
<translation>コメントパケットを表示します</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="142"/>
+ <location filename="expert_info_dialog.cpp" line="193"/>
<source>Expert Information</source>
<translation>エキスパート情報</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="257"/>
+ <location filename="expert_info_dialog.cpp" line="308"/>
<source>Endpoint expert failed to set filter</source>
<translation>フィルタを設定するのに失敗した端末のエキスパート情報</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="458"/>
- <location filename="expert_info_dialog.cpp" line="459"/>
+ <location filename="expert_info_dialog.cpp" line="529"/>
+ <location filename="expert_info_dialog.cpp" line="530"/>
<source>Capture file closed.</source>
<translation>キャプチャファイルを閉じました</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="461"/>
+ <location filename="expert_info_dialog.cpp" line="532"/>
<source>No display filter</source>
<translation>表示フィルタなし</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="462"/>
+ <location filename="expert_info_dialog.cpp" line="533"/>
<source>No display filter set.</source>
<translation>表示フィルタが設定されていません</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="464"/>
+ <location filename="expert_info_dialog.cpp" line="535"/>
<source>Limit information to &quot;%1&quot;.</source>
<translation>情報を &quot;%1&quot;に制限します</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="465"/>
+ <location filename="expert_info_dialog.cpp" line="536"/>
<source>Display filter: &quot;%1&quot;</source>
<translation>表示フィルタ: &quot;%1&quot;</translation>
</message>
diff --git a/ui/qt/wireshark_pl.qm b/ui/qt/wireshark_pl.qm
index fdae02f05d..2d710f29be 100644
--- a/ui/qt/wireshark_pl.qm
+++ b/ui/qt/wireshark_pl.qm
Binary files differ
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index f651489074..243a86d081 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -151,6 +151,195 @@
</message>
</context>
<context>
+ <name>BluetoothDeviceDialog</name>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="23"/>
+ <source>Bluetooth Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="78"/>
+ <source>BD_ADDR</source>
+ <translation type="unfinished">BD_ADDR</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="83"/>
+ <source>OUI</source>
+ <translation type="unfinished">OUI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="88"/>
+ <source>Name</source>
+ <translation type="unfinished">Nazwa</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="93"/>
+ <source>Class of Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="98"/>
+ <source>LMP Version</source>
+ <translation type="unfinished">Wersja LMP</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="103"/>
+ <source>LMP Subverion</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="108"/>
+ <source>Manufacturer</source>
+ <translation type="unfinished">Producent</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="113"/>
+ <source>HCI Version</source>
+ <translation type="unfinished">Wersja HCI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="118"/>
+ <source>HCI Revision</source>
+ <translation type="unfinished">Rewizja HCI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="123"/>
+ <source>Scan</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="128"/>
+ <source>Authentication</source>
+ <translation type="unfinished">Uwierzytelnianie</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="133"/>
+ <source>Encryption</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="138"/>
+ <source>ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="143"/>
+ <source>ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="148"/>
+ <source>SCO MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="153"/>
+ <source>SCO Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="158"/>
+ <source>LE ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="163"/>
+ <source>LE ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="168"/>
+ <source>Inquiry Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="173"/>
+ <source>Page Timeout</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="178"/>
+ <source>Simple Pairing Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="183"/>
+ <source>Voice Setting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="188"/>
+ <source>Value</source>
+ <translation type="unfinished">Wartość</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="193"/>
+ <source>Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="206"/>
+ <location filename="bluetooth_device_dialog.cpp" line="586"/>
+ <source>%1 changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="223"/>
+ <source>Copy Cell</source>
+ <translation type="unfinished">Kopiuj komórkę</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="228"/>
+ <source>Copy Rows</source>
+ <translation type="unfinished">Kopiuj wiersze</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="233"/>
+ <source>Copy All</source>
+ <translation type="unfinished">Kopiuj wszystko</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="238"/>
+ <source>Save as image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="180"/>
+ <source>Unknown</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="189"/>
+ <source>Bluetooth Device - %1%2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>enabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>disabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="529"/>
+ <source>%1 ms (%2 slots)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="621"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="623"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished">Obraz PNG (*.png)</translation>
+ </message>
+</context>
+<context>
<name>BluetoothDevicesDialog</name>
<message>
<location filename="bluetooth_devices_dialog.ui" line="20"/>
@@ -213,38 +402,44 @@
<translation>Pokaż poszczególne kroki informacyjne</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="156"/>
+ <location filename="bluetooth_devices_dialog.ui" line="146"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="329"/>
+ <source>%1 items; Right click for more option; Double click for device details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_devices_dialog.ui" line="163"/>
<source>Copy Cell</source>
<translation>Kopiuj komórkę</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="161"/>
+ <location filename="bluetooth_devices_dialog.ui" line="168"/>
<source>Copy Rows</source>
<translation>Kopiuj wiersze</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="166"/>
+ <location filename="bluetooth_devices_dialog.ui" line="173"/>
<source>Copy All</source>
<translation>Kopiuj wszystko</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="171"/>
+ <location filename="bluetooth_devices_dialog.ui" line="178"/>
<source>Save as image</source>
<translation>Zapisz jako obrazek</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="274"/>
- <location filename="bluetooth_devices_dialog.cpp" line="293"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="290"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="310"/>
<source>true</source>
<translation>tak</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="378"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="398"/>
<source>Save Table Image</source>
<translation>Zapisz obraz tabeli</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="380"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="400"/>
<source>PNG Image (*.png)</source>
<translation>Obraz PNG (*.png)</translation>
</message>
@@ -323,8 +518,10 @@
<location filename="bluetooth_hci_summary_dialog.ui" line="330"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="359"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="388"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="417"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="446"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="475"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="504"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="533"/>
<source>0</source>
<translation>0</translation>
@@ -455,37 +652,37 @@
<translation>Zapisz jako obraz</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="312"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="308"/>
<source>Unknown</source>
<translation>Nieznany</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="330"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="326"/>
<source>Adapter %1</source>
<translation>Adapter %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="418"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="468"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="505"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="539"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="576"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="610"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="414"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="464"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="501"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="535"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="572"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="606"/>
<source>Frame %1</source>
<translation>Ramka %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="528"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="524"/>
<source>Pending</source>
<translation>Pending</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="721"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="717"/>
<source>Save Table Image</source>
<translation>Zapisz obraz tabeli</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="723"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="719"/>
<source>PNG Image (*.png)</source>
<translation>Obraz PNG (*.png)</translation>
</message>
@@ -2171,129 +2368,139 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
</message>
<message>
<location filename="expert_info_dialog.ui" line="32"/>
+ <source>Summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="37"/>
<source>Group</source>
<translation>Grupa</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="37"/>
+ <location filename="expert_info_dialog.ui" line="42"/>
<source>Protocol</source>
<translation>Protokół</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="42"/>
+ <location filename="expert_info_dialog.ui" line="47"/>
<source>Count</source>
<translation>Wystąpienia</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="50"/>
+ <location filename="expert_info_dialog.ui" line="55"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;Podpowiedź.&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="59"/>
+ <location filename="expert_info_dialog.ui" line="64"/>
<source>Limit to Display Filter</source>
<translation>Ogranicz do filtru wyświetlania</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="79"/>
- <location filename="expert_info_dialog.ui" line="89"/>
+ <location filename="expert_info_dialog.ui" line="84"/>
+ <source>Group by summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="107"/>
+ <location filename="expert_info_dialog.ui" line="117"/>
<source>Search expert summaries.</source>
<translation>Przeszukuj podsumowanie eksperckie.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="82"/>
+ <location filename="expert_info_dialog.ui" line="110"/>
<source>Search:</source>
<translation>Szukaj:</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="109"/>
+ <location filename="expert_info_dialog.ui" line="137"/>
<source>Show…</source>
<oldsource>Show...</oldsource>
<translation>Pokaż…</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="131"/>
+ <location filename="expert_info_dialog.ui" line="159"/>
<source>Error</source>
<translation>Błędy</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="134"/>
+ <location filename="expert_info_dialog.ui" line="162"/>
<source>Show error packets.</source>
<translation>Pokaż pakiety z błędami.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="142"/>
+ <location filename="expert_info_dialog.ui" line="170"/>
<source>Warning</source>
<translation>Ostrzeżenia</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="145"/>
+ <location filename="expert_info_dialog.ui" line="173"/>
<source>Show warning packets.</source>
<translation>Pokaż pakiety z ostrzeżeniami.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="153"/>
+ <location filename="expert_info_dialog.ui" line="181"/>
<source>Note</source>
<translation>Notki</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="156"/>
+ <location filename="expert_info_dialog.ui" line="184"/>
<source>Show note packets.</source>
<translation>Pokaż pakiety z notkami.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="164"/>
+ <location filename="expert_info_dialog.ui" line="192"/>
<source>Chat</source>
<translation>Czaty</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="167"/>
+ <location filename="expert_info_dialog.ui" line="195"/>
<source>Show chat packets.</source>
<translation>Pokaż pakiety z czatami.</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="175"/>
+ <location filename="expert_info_dialog.ui" line="203"/>
<source>Comment</source>
<translation>Komentarze</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="178"/>
+ <location filename="expert_info_dialog.ui" line="206"/>
<source>Show comment packets.</source>
<translation>Pokaż pakiety z komentarzami.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="142"/>
+ <location filename="expert_info_dialog.cpp" line="193"/>
<source>Expert Information</source>
<translation>Informacja ekspercka</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="257"/>
+ <location filename="expert_info_dialog.cpp" line="308"/>
<source>Endpoint expert failed to set filter</source>
<translation>Krańcowemu punktowi eksperckiemu nie udało się ustawić filtru.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="458"/>
- <location filename="expert_info_dialog.cpp" line="459"/>
+ <location filename="expert_info_dialog.cpp" line="529"/>
+ <location filename="expert_info_dialog.cpp" line="530"/>
<source>Capture file closed.</source>
<translation>Plik przechwytywania został zamknięty.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="461"/>
+ <location filename="expert_info_dialog.cpp" line="532"/>
<source>No display filter</source>
<translation>Brak filtru wyświetlania.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="462"/>
+ <location filename="expert_info_dialog.cpp" line="533"/>
<source>No display filter set.</source>
<translation>Brak zbioru filtrów wyświetlania.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="464"/>
+ <location filename="expert_info_dialog.cpp" line="535"/>
<source>Limit information to &quot;%1&quot;.</source>
<translation>Ogranicz informacje do &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="465"/>
+ <location filename="expert_info_dialog.cpp" line="536"/>
<source>Display filter: &quot;%1&quot;</source>
<translation>Filtr wyświetlania: &quot;%1&quot;</translation>
</message>
@@ -13495,11 +13702,13 @@ text-decoration: underline;
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</oldsource>
- <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;h3&gt;Przydatne skróty klawiaturowe&lt;/h3&gt;
&lt;table&gt;&lt;tbody&gt;
+&lt;tr&gt;&lt;th&gt;0&lt;/th&gt;&lt;td&gt;Powiększ&lt;/td&gt;&lt;/th&gt;
+&lt;tr&gt;&lt;th&gt;0&lt;/th&gt;&lt;td&gt;Pomniejsz&lt;/td&gt;&lt;/th&gt;
&lt;tr&gt;&lt;th&gt;0&lt;/th&gt;&lt;td&gt;Resetuj wykres do stanu początkowego&lt;/td&gt;&lt;/th&gt;
&lt;tr&gt;&lt;th&gt;→&lt;/th&gt;&lt;td&gt;Przesuń w prawo o 10 pikseli&lt;/td&gt;&lt;/th&gt;
@@ -13582,23 +13791,23 @@ text-decoration: underline;
<location filename="sequence_dialog.ui" line="235"/>
<location filename="sequence_dialog.ui" line="238"/>
<source>Zoom In</source>
- <translation type="unfinished">Powiększ</translation>
+ <translation>Powiększ</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="241"/>
<source>+</source>
- <translation type="unfinished">+</translation>
+ <translation>+</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="246"/>
<location filename="sequence_dialog.ui" line="249"/>
<source>Zoom Out</source>
- <translation type="unfinished">Pomniejsz</translation>
+ <translation>Pomniejsz</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="252"/>
<source>-</source>
- <translation type="unfinished">-</translation>
+ <translation>-</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="257"/>
diff --git a/ui/qt/wireshark_zh_CN.qm b/ui/qt/wireshark_zh_CN.qm
index 55f8cc29b2..54e12770c5 100644
--- a/ui/qt/wireshark_zh_CN.qm
+++ b/ui/qt/wireshark_zh_CN.qm
Binary files differ
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 02878106a7..cdec149996 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -151,6 +151,195 @@
</message>
</context>
<context>
+ <name>BluetoothDeviceDialog</name>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="23"/>
+ <source>Bluetooth Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="78"/>
+ <source>BD_ADDR</source>
+ <translation type="unfinished">BD_ADDR</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="83"/>
+ <source>OUI</source>
+ <translation type="unfinished">OUI</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="88"/>
+ <source>Name</source>
+ <translation type="unfinished">名称</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="93"/>
+ <source>Class of Device</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="98"/>
+ <source>LMP Version</source>
+ <translation type="unfinished">LMP 版本</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="103"/>
+ <source>LMP Subverion</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="108"/>
+ <source>Manufacturer</source>
+ <translation type="unfinished">制造商</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="113"/>
+ <source>HCI Version</source>
+ <translation type="unfinished">HCI 版本</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="118"/>
+ <source>HCI Revision</source>
+ <translation type="unfinished">HCI 修订</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="123"/>
+ <source>Scan</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="128"/>
+ <source>Authentication</source>
+ <translation type="unfinished">认证</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="133"/>
+ <source>Encryption</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="138"/>
+ <source>ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="143"/>
+ <source>ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="148"/>
+ <source>SCO MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="153"/>
+ <source>SCO Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="158"/>
+ <source>LE ACL MTU</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="163"/>
+ <source>LE ACL Total Packets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="168"/>
+ <source>Inquiry Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="173"/>
+ <source>Page Timeout</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="178"/>
+ <source>Simple Pairing Mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="183"/>
+ <source>Voice Setting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="188"/>
+ <source>Value</source>
+ <translation type="unfinished">值</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="193"/>
+ <source>Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="206"/>
+ <location filename="bluetooth_device_dialog.cpp" line="586"/>
+ <source>%1 changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="223"/>
+ <source>Copy Cell</source>
+ <translation type="unfinished">复制单元</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="228"/>
+ <source>Copy Rows</source>
+ <translation type="unfinished">复制行</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="233"/>
+ <source>Copy All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.ui" line="238"/>
+ <source>Save as image</source>
+ <translation type="unfinished">另存为图像</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="180"/>
+ <source>Unknown</source>
+ <translation type="unfinished">未知</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="189"/>
+ <source>Bluetooth Device - %1%2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>enabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="521"/>
+ <source>disabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="529"/>
+ <source>%1 ms (%2 slots)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="621"/>
+ <source>Save Table Image</source>
+ <translation type="unfinished">保存表格图像</translation>
+ </message>
+ <message>
+ <location filename="bluetooth_device_dialog.cpp" line="623"/>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished">PNG 图像 (*.png)</translation>
+ </message>
+</context>
+<context>
<name>BluetoothDevicesDialog</name>
<message>
<location filename="bluetooth_devices_dialog.ui" line="20"/>
@@ -213,38 +402,44 @@
<translation>显示信息的步骤</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="156"/>
+ <location filename="bluetooth_devices_dialog.ui" line="146"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="329"/>
+ <source>%1 items; Right click for more option; Double click for device details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="bluetooth_devices_dialog.ui" line="163"/>
<source>Copy Cell</source>
<translation>复制单元</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="161"/>
+ <location filename="bluetooth_devices_dialog.ui" line="168"/>
<source>Copy Rows</source>
<translation>复制行</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="166"/>
+ <location filename="bluetooth_devices_dialog.ui" line="173"/>
<source>Copy All</source>
<translation>复制所有</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.ui" line="171"/>
+ <location filename="bluetooth_devices_dialog.ui" line="178"/>
<source>Save as image</source>
<translation>另存为图像</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="274"/>
- <location filename="bluetooth_devices_dialog.cpp" line="293"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="290"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="310"/>
<source>true</source>
<translation>是</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="378"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="398"/>
<source>Save Table Image</source>
<translation>保存表格图像</translation>
</message>
<message>
- <location filename="bluetooth_devices_dialog.cpp" line="380"/>
+ <location filename="bluetooth_devices_dialog.cpp" line="400"/>
<source>PNG Image (*.png)</source>
<translation>PNG 图像 (*.png)</translation>
</message>
@@ -323,8 +518,10 @@
<location filename="bluetooth_hci_summary_dialog.ui" line="330"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="359"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="388"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="417"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="446"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="475"/>
+ <location filename="bluetooth_hci_summary_dialog.ui" line="504"/>
<location filename="bluetooth_hci_summary_dialog.ui" line="533"/>
<source>0</source>
<translation>0</translation>
@@ -455,37 +652,37 @@
<translation>另存为图像</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="312"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="308"/>
<source>Unknown</source>
<translation>未知</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="330"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="326"/>
<source>Adapter %1</source>
<translation>适配器 %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="418"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="468"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="505"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="539"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="576"/>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="610"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="414"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="464"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="501"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="535"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="572"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="606"/>
<source>Frame %1</source>
<translation>帧 %1</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="528"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="524"/>
<source>Pending</source>
<translation>等待中</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="721"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="717"/>
<source>Save Table Image</source>
<translation>保存表格图像</translation>
</message>
<message>
- <location filename="bluetooth_hci_summary_dialog.cpp" line="723"/>
+ <location filename="bluetooth_hci_summary_dialog.cpp" line="719"/>
<source>PNG Image (*.png)</source>
<translation>PNG 图像 (*.png)</translation>
</message>
@@ -2171,129 +2368,139 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="expert_info_dialog.ui" line="32"/>
+ <source>Summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="37"/>
<source>Group</source>
<translation>组</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="37"/>
+ <location filename="expert_info_dialog.ui" line="42"/>
<source>Protocol</source>
<translation>协议</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="42"/>
+ <location filename="expert_info_dialog.ui" line="47"/>
<source>Count</source>
<translation>计数</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="50"/>
+ <location filename="expert_info_dialog.ui" line="55"/>
<source>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</source>
<translation>&lt;small&gt;&lt;i&gt;提示&lt;/i&gt;&lt;/small&gt;</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="59"/>
+ <location filename="expert_info_dialog.ui" line="64"/>
<source>Limit to Display Filter</source>
<translation>显示过滤器的限制</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="79"/>
- <location filename="expert_info_dialog.ui" line="89"/>
+ <location filename="expert_info_dialog.ui" line="84"/>
+ <source>Group by summary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="expert_info_dialog.ui" line="107"/>
+ <location filename="expert_info_dialog.ui" line="117"/>
<source>Search expert summaries.</source>
<translation>搜索专家概要。</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="82"/>
+ <location filename="expert_info_dialog.ui" line="110"/>
<source>Search:</source>
<translation>搜索:</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="109"/>
+ <location filename="expert_info_dialog.ui" line="137"/>
<source>Show…</source>
<oldsource>Show...</oldsource>
<translation>显示…</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="131"/>
+ <location filename="expert_info_dialog.ui" line="159"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="134"/>
+ <location filename="expert_info_dialog.ui" line="162"/>
<source>Show error packets.</source>
<translation>显示错误分组。</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="142"/>
+ <location filename="expert_info_dialog.ui" line="170"/>
<source>Warning</source>
<translation>警告</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="145"/>
+ <location filename="expert_info_dialog.ui" line="173"/>
<source>Show warning packets.</source>
<translation>显示警告分组。</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="153"/>
+ <location filename="expert_info_dialog.ui" line="181"/>
<source>Note</source>
<translation>注意</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="156"/>
+ <location filename="expert_info_dialog.ui" line="184"/>
<source>Show note packets.</source>
<translation>显示注意分组。</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="164"/>
+ <location filename="expert_info_dialog.ui" line="192"/>
<source>Chat</source>
<translation>聊天</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="167"/>
+ <location filename="expert_info_dialog.ui" line="195"/>
<source>Show chat packets.</source>
<translation>显示聊天分组。</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="175"/>
+ <location filename="expert_info_dialog.ui" line="203"/>
<source>Comment</source>
<translation>注释</translation>
</message>
<message>
- <location filename="expert_info_dialog.ui" line="178"/>
+ <location filename="expert_info_dialog.ui" line="206"/>
<source>Show comment packets.</source>
<translation>显示注释分组。</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="142"/>
+ <location filename="expert_info_dialog.cpp" line="193"/>
<source>Expert Information</source>
<translation>专家信息</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="257"/>
+ <location filename="expert_info_dialog.cpp" line="308"/>
<source>Endpoint expert failed to set filter</source>
<translation>专家端点设置过滤器失败</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="458"/>
- <location filename="expert_info_dialog.cpp" line="459"/>
+ <location filename="expert_info_dialog.cpp" line="529"/>
+ <location filename="expert_info_dialog.cpp" line="530"/>
<source>Capture file closed.</source>
<translation>捕获文件已关闭。</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="461"/>
+ <location filename="expert_info_dialog.cpp" line="532"/>
<source>No display filter</source>
<translation>无显示过滤器</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="462"/>
+ <location filename="expert_info_dialog.cpp" line="533"/>
<source>No display filter set.</source>
<translation>没有设置显示过滤器。</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="464"/>
+ <location filename="expert_info_dialog.cpp" line="535"/>
<source>Limit information to &quot;%1&quot;.</source>
<translation>限制信息至“%1”。</translation>
</message>
<message>
- <location filename="expert_info_dialog.cpp" line="465"/>
+ <location filename="expert_info_dialog.cpp" line="536"/>
<source>Display filter: &quot;%1&quot;</source>
<translation>显示过滤器:“%1”</translation>
</message>
@@ -2456,7 +2663,7 @@ PLEASE NOTE: One option MUST be selected.</source>
<message>
<location filename="field_filter_edit.cpp" line="70"/>
<source>Display filter entry</source>
- <translation type="unfinished">显示过滤器</translation>
+ <translation>显示过滤器</translation>
</message>
<message>
<location filename="field_filter_edit.cpp" line="91"/>
@@ -2466,7 +2673,7 @@ PLEASE NOTE: One option MUST be selected.</source>
<message>
<location filename="field_filter_edit.cpp" line="154"/>
<source>Invalid filter: </source>
- <translation type="unfinished">无效的过滤器:</translation>
+ <translation>无效的过滤器:</translation>
</message>
</context>
<context>
@@ -2700,82 +2907,82 @@ for filter files: %2.</source>
<message>
<location filename="firewall_rules_dialog.ui" line="22"/>
<source>Create rules for</source>
- <translation type="unfinished"></translation>
+ <translation>创建规则为</translation>
</message>
<message>
<location filename="firewall_rules_dialog.ui" line="45"/>
<source>Inbound</source>
- <translation type="unfinished"></translation>
+ <translation>入站</translation>
</message>
<message>
<location filename="firewall_rules_dialog.ui" line="68"/>
<source>Deny</source>
- <translation type="unfinished"></translation>
+ <translation>拒绝</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="57"/>
<source>Firewall ACL Rules</source>
- <translation type="unfinished"></translation>
+ <translation>防火墙 ACL 规则</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="59"/>
<source>Copy</source>
- <translation type="unfinished">复制</translation>
+ <translation>复制</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="116"/>
<source>IPv4 source address.</source>
- <translation type="unfinished"></translation>
+ <translation>IPv4 源地址。</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="117"/>
<source>IPv4 destination address.</source>
- <translation type="unfinished"></translation>
+ <translation>IPv4 目标地址。</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="121"/>
<source>Source port.</source>
- <translation type="unfinished"></translation>
+ <translation>源端口。</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="122"/>
<source>Destination port.</source>
- <translation type="unfinished"></translation>
+ <translation>目标端口。</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="127"/>
<source>IPv4 source address and port.</source>
- <translation type="unfinished"></translation>
+ <translation>IPv4 源地址和端口。</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="128"/>
<source>IPv4 destination address and port.</source>
- <translation type="unfinished"></translation>
+ <translation>IPv4 目标地址和端口。</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="132"/>
<source>MAC source address.</source>
- <translation type="unfinished"></translation>
+ <translation>MAC 源地址。</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="133"/>
<source>MAC destination address.</source>
- <translation type="unfinished"></translation>
+ <translation>MAC 目标地址。</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="188"/>
<source>Text file (*.txt);;All Files (</source>
- <translation type="unfinished"></translation>
+ <translation>文本文件 (*.txt);;所有文件 (</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="199"/>
<source>Warning</source>
- <translation type="unfinished">警告</translation>
+ <translation>警告</translation>
</message>
<message>
<location filename="firewall_rules_dialog.cpp" line="199"/>
<source>Unable to save %1</source>
- <translation type="unfinished">无法保存 %1</translation>
+ <translation>无法保存 %1</translation>
</message>
</context>
<context>
@@ -2837,7 +3044,7 @@ for filter files: %2.</source>
<message>
<location filename="follow_stream_dialog.cpp" line="119"/>
<source>UTF-16</source>
- <translation type="unfinished">UTF-16</translation>
+ <translation>UTF-16</translation>
</message>
<message>
<location filename="follow_stream_dialog.cpp" line="120"/>
@@ -8024,12 +8231,12 @@ text-decoration: underline;
<message>
<location filename="main_window.ui" line="2916"/>
<source>Firewall ACL Rules</source>
- <translation type="unfinished"></translation>
+ <translation>防火墙 ACL 规则</translation>
</message>
<message>
<location filename="main_window.ui" line="2919"/>
<source>Create firewall ACL rules</source>
- <translation type="unfinished"></translation>
+ <translation>创建防火墙 ACL 规则</translation>
</message>
<message>
<location filename="main_window.ui" line="1169"/>
@@ -10894,12 +11101,12 @@ text-decoration: underline;
<message>
<location filename="capture_interfaces_dialog.cpp" line="118"/>
<source>default</source>
- <translation type="unfinished"></translation>
+ <translation>默认</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.cpp" line="120"/>
<source>DLT %1</source>
- <translation type="unfinished"></translation>
+ <translation>DLT %1</translation>
</message>
</context>
<context>
@@ -13478,30 +13685,7 @@ text-decoration: underline;
&lt;/tbody&gt;&lt;/table&gt;
&lt;/body&gt;&lt;/html&gt;</oldsource>
- <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;
-
-&lt;h3&gt;有价值的和惊人的时间节省键盘快捷方式&lt;/h3&gt;
-&lt;table&gt;&lt;tbody&gt;
-
-&lt;tr&gt;&lt;th&gt;0&lt;/th&gt;&lt;td&gt;图形重置为初始状态&lt;/td&gt;&lt;/th&gt;
-
-&lt;tr&gt;&lt;th&gt;→&lt;/th&gt;&lt;td&gt;右移 10 个像素&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;←&lt;/th&gt;&lt;td&gt;左移 10 个像素&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;↑&lt;/th&gt;&lt;td&gt;上移 10 个像素&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;↓&lt;/th&gt;&lt;td&gt;下移 10 个像素&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;→&lt;/th&gt;&lt;td&gt;右移 1 个像素&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;←&lt;/th&gt;&lt;td&gt;左移 1 个像素&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;↑&lt;/th&gt;&lt;td&gt;上移 1 个像素&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;&lt;i&gt;Shift+&lt;/i&gt;↓&lt;/th&gt;&lt;td&gt;下移 1 个像素&lt;/td&gt;&lt;/th&gt;
-
-&lt;tr&gt;&lt;th&gt;g&lt;/th&gt;&lt;td&gt;转到光标下的数据包&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;n&lt;/th&gt;&lt;td&gt;转到下一个数据包&lt;/td&gt;&lt;/th&gt;
-&lt;tr&gt;&lt;th&gt;p&lt;/th&gt;&lt;td&gt;转到上一个数据包&lt;/td&gt;&lt;/th&gt;
-
-&lt;/tbody&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;
-&lt;/tbody&gt;&lt;/table&gt;
-&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="74"/>
@@ -13567,23 +13751,23 @@ text-decoration: underline;
<location filename="sequence_dialog.ui" line="235"/>
<location filename="sequence_dialog.ui" line="238"/>
<source>Zoom In</source>
- <translation type="unfinished">放大</translation>
+ <translation>放大</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="241"/>
<source>+</source>
- <translation type="unfinished">+</translation>
+ <translation>+</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="246"/>
<location filename="sequence_dialog.ui" line="249"/>
<source>Zoom Out</source>
- <translation type="unfinished">缩小</translation>
+ <translation>缩小</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="252"/>
<source>-</source>
- <translation type="unfinished">-</translation>
+ <translation>-</translation>
</message>
<message>
<location filename="sequence_dialog.ui" line="257"/>