aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-02-07 08:14:58 -0800
committerGerald Combs <gerald@wireshark.org>2016-02-07 16:15:07 +0000
commit268ae0437f14e3c8fcd21561e7055a82b94dad15 (patch)
tree7891c538f9708c2201d1f4c4045b0a614292e528
parent1aa22baa1b439f9c8889e0ea524cde59683a9b4a (diff)
downloadwireshark-268ae0437f14e3c8fcd21561e7055a82b94dad15.tar.gz
wireshark-268ae0437f14e3c8fcd21561e7055a82b94dad15.tar.bz2
wireshark-268ae0437f14e3c8fcd21561e7055a82b94dad15.zip
[Automatic update for 2016-02-07]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: If4144d8e4b0dbfb8841ef4f0662a75389d7f4ea2 Reviewed-on: https://code.wireshark.org/review/13800 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat
-rw-r--r--epan/enterprise-numbers168
-rw-r--r--epan/sminmpec.c40
-rw-r--r--manuf101
-rw-r--r--services2
-rw-r--r--ui/qt/wireshark_de.qmbin337030 -> 337079 bytes
-rw-r--r--ui/qt/wireshark_de.ts180
-rw-r--r--ui/qt/wireshark_en.ts164
-rw-r--r--ui/qt/wireshark_fr.qmbin285838 -> 287066 bytes
-rw-r--r--ui/qt/wireshark_fr.ts199
-rw-r--r--ui/qt/wireshark_it.qmbin342904 -> 343019 bytes
-rw-r--r--ui/qt/wireshark_it.ts180
-rw-r--r--ui/qt/wireshark_ja_JP.qmbin261345 -> 261342 bytes
-rw-r--r--ui/qt/wireshark_ja_JP.ts164
-rw-r--r--ui/qt/wireshark_pl.qmbin328872 -> 329007 bytes
-rw-r--r--ui/qt/wireshark_pl.ts180
-rw-r--r--ui/qt/wireshark_zh_CN.qmbin249855 -> 249934 bytes
-rw-r--r--ui/qt/wireshark_zh_CN.ts180
17 files changed, 915 insertions, 643 deletions
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 3d2306919b..87355bfe8b 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2016-01-31)
+(last updated 2016-02-04)
SMI Network Management Private Enterprise Codes:
@@ -807,8 +807,8 @@ Decimal
---none---
198
University of Waterloo
- R. J. White
- snmp-tech&watmath.waterloo.edu
+ Network Services
+ ns-tech&ist.uwaterloo.ca
199
CCL/ITRI
Ming-Perng Chen
@@ -48895,8 +48895,8 @@ Decimal
martin.sperl&ucpag.com
12335
University of York
- Chris Kilgour
- crhk1&york.ac.uk
+ Gavin Atkinson
+ gavin.atkinson&york.ac.uk
12336
BuyWays
Jaap Bouma
@@ -53434,9 +53434,9 @@ Decimal
Alan Deger
adeger&netlibrary.com
13470
- Otto Security & Software Technologie GmbH
- Simon Hartl
- shartl&osst.at
+ SecureGUARD GmbH (formerly 'Otto Security & Software Technologie GmbH')
+ Martin Rummerstorfer
+ mrummerstorfer&secureguard.at
13471
PowerWAN, Inc
Siddana Gouda
@@ -188107,6 +188107,158 @@ Decentralization / Helenic Public Administra
ViktorBalogh
Viktor Balogh
me&viktorbalogh.net
+47132
+ Thinking Automation, Inc.
+ Derek Knutsen
+ dknutsen&researchcapitalgroup.com
+47133
+ Research Capital Group, Inc.
+ Derek Knutsen
+ dknutsen&researchcapitalgroup.com
+47134
+ FROG CELLSAT LIMITED
+ TARUN SHARMA
+ tarun&frogcellsat.com
+47135
+ MotionLED Technology Ltd.
+ Wilfred Wong
+ wilfred&motionledtechnology.com
+47136
+ 4S Information Technologies
+ Efe Erdogru
+ efe.erdogru&4s.com.tr
+47137
+ Andre Grosse Bley
+ Andre Grosse Bley
+ mib&grosse-bley.com
+47138
+ Noble 3D Printers, LLC
+ Edward R. Aylward II
+ edward.aylward&Noble3DPrinters.com
+47139
+ MaTelSo GmbH
+ Marc Fürst
+ marc.fuerst&matelso.de
+47140
+ DSG Systems AS
+ Espen Remman
+ espen.remman&dsg.no
+47141
+ PT. WIRAKY NUSA TELEKOMUNIKASI
+ UJANG HERANI
+ ujaheran&wnt.co.id
+47142
+ CoralTree Systems
+ Lee Ward
+ lee.ward&coraltreesystems.com
+47143
+ iSnapp
+ Willem de Jonge
+ willem&isnapp.nl
+47144
+ CommerceHub
+ Michael Vinzi
+ mvinzi&commercehub.com
+47145
+ Telonic Berkeley Inc
+ KANAK VAGHELA
+ kanak&telonicberkeley.com
+47146
+ ENDERCODING
+ Elias Werberich
+ support&endercoding.com
+47147
+ Avionics Interface Technologies
+ Sharon Simon
+ sharons&aviftech.com
+47148
+ Winston Brands Inc.
+ Wilson Caetano
+ wcaetano&winstonbrands.com
+47149
+ Adaptrum Inc.
+ Shufen Zhang
+ shufen&adaptrum.com
+47150
+ Virginia Cancer Institute
+ Shonda Clements
+ sclements&vacancer.com
+47151
+ CoinBau GmbH
+ Dr. Markus Winter
+ winter&coinbau.com
+47152
+ Dovecot Oy
+ Ville Savolainen
+ ville.savolainen&dovecot.fi
+47153
+ Brunke electronic
+ Marc Brunke
+ pen.iana&optocore.org
+47154
+ Stabilitas
+ Stephen Riley
+ stephen&stabilitas.io
+47155
+ VINTEGRIS SL
+ Marisa Herranz
+ marisa.herranz&vintegris.com
+47156
+ Haus Michael auf Draht e.V.
+ Malte Horstmann
+ mad&rub.de
+47157
+ Boston Scientific Corporation
+ Craig Johnson
+ Craig.Johnson&bsci.com
+47158
+ Clipcomm Inc.
+ Kim Eunsoo
+ eskim&clipcomm.co.kr
+47159
+ Jevons Global Pty Ltd
+ Kingsley Jones
+ Info&jevonsglobal.com
+47160
+ Centorrino Technologies
+ Nicholas Iacobucci
+ niacobucci&ct.com.au
+47161
+ Stuttgarter Haus- und Grundbesitzerverein e. V.
+ Daniel Niccoli
+ d.niccoli&hausundgrund-stuttgart.de
+47162
+ Ote SA (Hellenic Telecommunications Organisation)
+ George Patikis
+ gpatikis&ote.gr
+47163
+ Banka Koper d.d.
+ Damjan Janezic
+ damjan.janezic&banka-koper.si
+47164
+ Ciudad del Motor de Aragon, SA
+ Jose Miguel Arilla Navarro
+ jmarilla&motorlandaragon.com
+47165
+ Self Esteem Brands
+ Matthew Warrick
+ matt&sebrands.com
+47166
+ Digital Insyte, LLC
+ Lewey Taylor
+ lewey&digitalinsyte.com
+47167
+ AB LITGRID
+ Robertas Radžvilas
+ robertas.radzvilas&litgrid.eu
+47168
+ Guangzhou Yinxun Comm. Tech. Co., LTD
+ Hengxuan Liu
+ market&gzyinxun.com
+47169
+ JSS Technologies, LLC
+ Jared Szechy
+ jared&jsstechllc.com
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 801a981429..692b88599c 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -13490,7 +13490,7 @@ const value_string sminmpec_values[] = {
{ 13467, "Medasys" },
{ 13468, "Montclair State University" },
{ 13469, "netLibrary, Inc." },
- { 13470, "Otto Security & Software Technologie GmbH" },
+ { 13470, "SecureGUARD GmbH (formerly 'Otto Security & Software Technologie GmbH')" },
{ 13471, "PowerWAN, Inc" },
{ 13472, "RTS Realtimes Systems (Deutschland) AG" },
{ 13473, "SafeWeb, Inc." },
@@ -47152,6 +47152,44 @@ const value_string sminmpec_values[] = {
{ 47129, "SECURA Insurance Companies" },
{ 47130, "Al Yah Satellite Communication Company PJSC (Yahsat)" },
{ 47131, "ViktorBalogh" },
+ { 47132, "Thinking Automation, Inc." },
+ { 47133, "Research Capital Group, Inc." },
+ { 47134, "FROG CELLSAT LIMITED" },
+ { 47135, "MotionLED Technology Ltd. " },
+ { 47136, "4S Information Technologies" },
+ { 47137, "Andre Grosse Bley" },
+ { 47138, "Noble 3D Printers, LLC" },
+ { 47139, "MaTelSo GmbH" },
+ { 47140, "DSG Systems AS" },
+ { 47141, "PT. WIRAKY NUSA TELEKOMUNIKASI" },
+ { 47142, "CoralTree Systems" },
+ { 47143, "iSnapp" },
+ { 47144, "CommerceHub" },
+ { 47145, "Telonic Berkeley Inc" },
+ { 47146, "ENDERCODING" },
+ { 47147, "Avionics Interface Technologies" },
+ { 47148, "Winston Brands Inc." },
+ { 47149, "Adaptrum Inc." },
+ { 47150, "Virginia Cancer Institute" },
+ { 47151, "CoinBau GmbH" },
+ { 47152, "Dovecot Oy" },
+ { 47153, "Brunke electronic" },
+ { 47154, "Stabilitas" },
+ { 47155, "VINTEGRIS SL" },
+ { 47156, "Haus Michael auf Draht e.V." },
+ { 47157, "Boston Scientific Corporation" },
+ { 47158, "Clipcomm Inc." },
+ { 47159, "Jevons Global Pty Ltd" },
+ { 47160, "Centorrino Technologies" },
+ { 47161, "Stuttgarter Haus- und Grundbesitzerverein e. V." },
+ { 47162, "Ote SA (Hellenic Telecommunications Organisation)" },
+ { 47163, "Banka Koper d.d." },
+ { 47164, "Ciudad del Motor de Aragon, SA" },
+ { 47165, "Self Esteem Brands" },
+ { 47166, "Digital Insyte, LLC" },
+ { 47167, "AB LITGRID" },
+ { 47168, "Guangzhou Yinxun Comm. Tech. Co., LTD" },
+ { 47169, "JSS Technologies, LLC" },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index 11e3b72486..7ac0dedaec 100644
--- a/manuf
+++ b/manuf
@@ -2256,7 +2256,7 @@
00:08:B6 Routefre # RouteFree, Inc.
00:08:B7 HitIncor # HIT Incorporated
00:08:B8 EFJohnso # E.F. Johnson
-00:08:B9 KaonMedi # KAON MEDIA Co., Ltd.
+00:08:B9 Kaonmedi # Kaonmedia CO., LTD.
00:08:BA ErskineL # Erskine Systems Ltd
00:08:BB Netexcel # NetExcell
00:08:BC IlevoAb # Ilevo AB
@@ -3167,7 +3167,7 @@
00:0C:46 AlliedTe # Allied Telesyn Inc.
00:0C:47 SkTelete # SK Teletech(R&D Planning Team)
00:0C:48 QostekCo # QoStek Corporation
-00:0C:49 Dangaard # Dangaard Telecom RTC Division A/S
+00:0C:49 Dangaard # Dangaard Telecom Denmark A/S
00:0C:4A CygnusMi # Cygnus Microsystems (P) Limited
00:0C:4B CheopsEl # Cheops Elektronik
00:0C:4C ArcorAg& # Arcor AG&Co.
@@ -6035,7 +6035,7 @@
00:17:7A AssaAblo # ASSA ABLOY AB
00:17:7B AzaleaNe # Azalea Networks inc
00:17:7C Smartlin # Smartlink Network Systems Limited
-00:17:7D IdtInter # IDT International Limited
+00:17:7D IdtTechn # IDT Technology Limited
00:17:7E MeshcomT # Meshcom Technologies Inc.
00:17:7F Worldsma # Worldsmart Retech
00:17:80 AppliedB # Applied Biosystems B.V.
@@ -6381,7 +6381,7 @@
00:18:D4 UnifiedD # Unified Display Interface SIG
00:18:D5 Reigncom # REIGNCOM
00:18:D6 Swirlnet # Swirlnet A/S
-00:18:D7 JavadNav # Javad Navigation Systems Inc.
+00:18:D7 JavadGns # JAVAD GNSS, Inc.
00:18:D8 ArchMete # ARCH METER Corporation
00:18:D9 Santosha # Santosha Internatonal, Inc
00:18:DA AmberWir # AMBER wireless GmbH
@@ -6719,7 +6719,7 @@
00:1A:26 Deltanod # Deltanode Solutions AB
00:1A:27 Ubistar # Ubistar
00:1A:28 AswtTaiw # ASWT Co., LTD. Taiwan Branch H.K.
-00:1A:29 JohnsonO # Johnson Outdoors Marine Electronics, Inc
+00:1A:29 JohnsonO # Johnson Outdoors Marine Electronics d/b/a Minnkota
00:1A:2A Arcadyan # Arcadyan Technology Corporation
00:1A:2B AyecomTe # Ayecom Technology Co., Ltd.
00:1A:2C SatecLtd # SATEC Co.,LTD
@@ -7266,7 +7266,7 @@
00:1B:C5:08:40:00/36 AppliedI # Applied Innovations Research LLC
00:1B:C5:08:50:00/36 OberonMi # Oberon microsystems, Inc.
00:1B:C5:08:60:00/36 CastGrou # CAST Group of Companies Inc.
-00:1B:C5:08:70:00/36 OnnetTec # Onnet Technologies And Innovations
+00:1B:C5:08:70:00/36 OnnetTec # Onnet Technologies and Innovations LLC
00:1B:C5:08:80:00/36 UabKitro # UAB Kitron
00:1B:C5:08:90:00/36 Signatur # SIGNATURE CONTROL SYSTEMS, INC.
00:1B:C5:08:A0:00/36 Topicon # Topicon
@@ -7499,7 +7499,7 @@
00:1C:69 PacketVi # Packet Vision Ltd
00:1C:6A WeissEng # Weiss Engineering Ltd.
00:1C:6B CovaxLtd # COVAX Co. Ltd
-00:1C:6C JabilCir # Jabil Circuit (Guangzhou) Limited
+00:1C:6C 30805 # 30805
00:1C:6D Kyohrits # KYOHRITSU ELECTRONIC INDUSTRY CO., LTD.
00:1C:6E NewburyN # Newbury Networks, Inc.
00:1C:6F EmfitLtd # Emfit Ltd
@@ -7655,7 +7655,7 @@
00:1D:05 EatonCor # Eaton Corporation
00:1D:06 HmElectr # HM Electronics, Inc.
00:1D:07 Shenzhen # Shenzhen Sang Fei Consumer Communications Co.,Ltd
-00:1D:08 JiangsuY # JIANGSU YINHE ELECTRONICS CO., LTD
+00:1D:08 JiangsuY # Jiangsu Yinhe Electronics Co.,Ltd.
00:1D:09 Dell # Dell Inc.
00:1D:0A DavisIns # Davis Instruments, Inc.
00:1D:0B PowerSta # Power Standards Lab
@@ -7940,7 +7940,7 @@
00:1E:22 ArvooIma # ARVOO Imaging Products BV
00:1E:23 Electron # Electronic Educational Devices, Inc
00:1E:24 Zhejiang # Zhejiang Bell Technology Co.,ltd
-00:1E:25 IntekDig # Intek Digital Inc
+00:1E:25 IntekDig # INTEK DIGITAL
00:1E:26 Digifrie # Digifriends Co. Ltd
00:1E:27 SbnTech # SBN TECH Co.,Ltd.
00:1E:28 LumexisC # Lumexis Corporation
@@ -7954,7 +7954,7 @@
00:1E:30 ShireenI # Shireen Inc
00:1E:31 Infomark # INFOMARK CO.,LTD.
00:1E:32 Zensys # Zensys
-00:1E:33 Inventec # Inventec Corporation
+00:1E:33 Inventec # INVENTEC Corporation
00:1E:34 Cryptome # CryptoMetrics
00:1E:35 Nintendo # Nintendo Co., Ltd.
00:1E:36 Ipte # IPTE
@@ -8168,7 +8168,7 @@
00:1F:06 Integrat # Integrated Dispatch Solutions
00:1F:07 AzteqMob # AZTEQ Mobile
00:1F:08 RiscoLtd # RISCO LTD
-00:1F:09 Jastec # JASTEC CO., LTD.
+00:1F:09 Jastec # Jastec
00:1F:0A Nortel # Nortel
00:1F:0B FederalS # Federal State Unitary Enterprise Industrial UnionElectropribor
00:1F:0C Intellig # Intelligent Digital Services GmbH
@@ -9680,7 +9680,7 @@
00:24:F1 Shenzhen # Shenzhen Fanhai Sanjiang Electronics Co., Ltd.
00:24:F2 Uniphone # Uniphone Telecommunication Co., Ltd.
00:24:F3 Nintendo # Nintendo Co., Ltd.
-00:24:F4 Kaminari # Kaminario Technologies Ltd.
+00:24:F4 Kaminari # Kaminario, Ltd.
00:24:F5 NdsSurgi # NDS Surgical Imaging
00:24:F6 MiyoshiE # MIYOSHI ELECTRONICS CORPORATION
00:24:F7 CiscoInc # Cisco Systems, Inc
@@ -10051,7 +10051,7 @@
00:26:69 NokiaDan # Nokia Danmark A/S
00:26:6A Essensiu # ESSENSIUM NV
00:26:6B ShineUni # SHINE UNION ENTERPRISE LIMITED
-00:26:6C Inventec # Inventec
+00:26:6C Inventec # INVENTEC Corporation
00:26:6D Mobileac # MobileAccess Networks
00:26:6E Nissho-D # Nissho-denki Co.,LTD.
00:26:6F Coordiwi # Coordiwise Technology Corp.
@@ -11131,7 +11131,7 @@
00:50:C2:09:F0:00/36 Metawave # MetaWave Vedeo Systems
00:50:C2:0A:00:00/36 Cynaps # CYNAPS
00:50:C2:0A:10:00/36 VisableG # Visable Genetics, Inc.
-00:50:C2:0A:20:00/36 JägerCom # Jäger Computergesteuerte Messtechnik GmbH
+00:50:C2:0A:20:00/36 JägerCom # Jäger Computergesteuerte Meßtechnik GmbH.
00:50:C2:0A:30:00/36 Basytec # BaSyTec GmbH
00:50:C2:0A:40:00/36 BountyPt # Bounty Systems Pty Ltd.
00:50:C2:0A:50:00/36 Mobiltex # Mobiltex Data Ltd.
@@ -11219,7 +11219,7 @@
00:50:C2:0F:70:00/36 FossNirs # Foss NIRSystems, Inc.
00:50:C2:0F:80:00/36 TecnintH # Tecnint HTE S.r.L.
00:50:C2:0F:90:00/36 RavenInd # Raven Industries
-00:50:C2:0F:A0:00/36 GeLubriz # GE Lubrizol, LLC
+00:50:C2:0F:A0:00/36 GeTransp # GE Transportation Systems
00:50:C2:0F:B0:00/36 Piusys # PIUSYS Co., Ltd.
00:50:C2:0F:C0:00/36 KimmonMa # Kimmon Manufacturing Co., Ltd.
00:50:C2:0F:D0:00/36 Inducomp # Inducomp Corporation
@@ -11272,7 +11272,7 @@
00:50:C2:12:C0:00/36 DeltaTau # DELTA TAU DATA SYSTEMS, INC.
00:50:C2:12:D0:00/36 Megisto # Megisto Systems, Inc.
00:50:C2:12:E0:00/36 Runcom # RUNCOM
-00:50:C2:12:F0:00/36 Haag-Str # HAAG-STREIT AG
+00:50:C2:12:F0:00/36 Haag-Str # Haag-Streit AG
00:50:C2:13:00:00/36 USTraffi # U.S. Traffic Corporation
00:50:C2:13:10:00/36 InbusEng # InBus Engineering, Inc.
00:50:C2:13:20:00/36 ProconEl # Procon Electronics
@@ -11889,7 +11889,7 @@
00:50:C2:39:50:00/36 Vidisys # vidisys gmbh
00:50:C2:39:60:00/36 Rapidwav # RapidWave Inc.
00:50:C2:39:70:00/36 MangoDsp # MANGO DSP Ltd.
-00:50:C2:39:80:00/36 InhandEl # InHand Electronics, Inc.
+00:50:C2:39:80:00/36 InhandEl # Inhand Electronics, Inc.
00:50:C2:39:90:00/36 Advanced # Advanced Micro Controls Inc.
00:50:C2:39:A0:00/36 OpticalA # Optical Air Data Systems
00:50:C2:39:B0:00/36 YuyamaMf # YUYAMA MFG. CO., LTD.
@@ -12288,7 +12288,7 @@
00:50:C2:52:40:00/36 MotecPty # Motec Pty Ltd
00:50:C2:52:50:00/36 Vastech # VASTech
00:50:C2:52:60:00/36 AcSRO # AC SYSTEMS, s.r.o.
-00:50:C2:52:70:00/36 Irtrans # IRTrans
+00:50:C2:52:70:00/36 Irtrans # IRTrans GmbH
00:50:C2:52:80:00/36 TattileS # Tattile srl
00:50:C2:52:90:00/36 PhytecMe # Phytec Messtechnik GmbH
00:50:C2:52:A0:00/36 Omnitron # OMNITRONICS PTY LTD
@@ -12443,7 +12443,7 @@
00:50:C2:5B:F0:00/36 TechimpS # Techimp Systems S.r.l.
00:50:C2:5C:00:00/36 Pyott-Bo # Pyott-Boone Electronics
00:50:C2:5C:10:00/36 RLDrake # R. L. Drake Company
-00:50:C2:5C:20:00/36 Intuitiv # Intuitive Surgical
+00:50:C2:5C:20:00/36 Intuitiv # Intuitive Surgical, Inc
00:50:C2:5C:30:00/36 KsSystem # KS System GmbH
00:50:C2:5C:40:00/36 Promik # ProMik GmbH
00:50:C2:5C:50:00/36 RadiantI # Radiant Imaging, Inc.
@@ -12884,7 +12884,7 @@
00:50:C2:77:80:00/36 SungardV # SunGard Vivista
00:50:C2:77:90:00/36 CoralTel # Coral Telecom Ltd
00:50:C2:77:A0:00/36 SmithMet # Smith Meter, Inc
-00:50:C2:77:B0:00/36 ItibiaTe # Itibia Technologies, Inc.
+00:50:C2:77:B0:00/36 ItibiaTe # Itibia Technologies
00:50:C2:77:C0:00/36 AtecSrl # ATEC SRL
00:50:C2:77:D0:00/36 LincolnI # Lincoln Industrial
00:50:C2:77:E0:00/36 Cominfo # Cominfo Inc.
@@ -13178,7 +13178,7 @@
00:50:C2:89:E0:00/36 Broadcas # Broadcast Electronics
00:50:C2:89:F0:00/36 Datalink # Datalink Technologies Gateways Inc.
00:50:C2:8A:00:00/36 Speciali # Specialized Communications Corp.
-00:50:C2:8A:10:00/36 IntuneNe # Intune Networks Limited
+00:50:C2:8A:10:00/36 IntuneNe # Intune Networks
00:50:C2:8A:20:00/36 Uavision # UAVISION Engenharia de Sistemas
00:50:C2:8A:30:00/36 Rtw # RTW GmbH & Co.KG
00:50:C2:8A:40:00/36 BaloghTA # BALOGH T.A.G Corporation
@@ -14968,7 +14968,7 @@
00:50:C2:FA:10:00/36 N-HandsU # N-Hands GmbH und Co KG
00:50:C2:FA:20:00/36 Power-On # Power-One
00:50:C2:FA:30:00/36 XemexNv # Xemex NV
-00:50:C2:FA:50:00/36 Intuitiv # Intuitive Surgical, Inc.
+00:50:C2:FA:50:00/36 Intuitiv # Intuitive Surgical, Inc
00:50:C2:FA:60:00/36 HilkomDi # Hilkom digital GmbH
00:50:C2:FA:70:00/36 Exelis # Exelis Inc.
00:50:C2:FA:80:00/36 YashSiqu # Yash SiQure Technologies India Pvt. Ltd.
@@ -15305,7 +15305,7 @@
00:60:AE TrioInfo # TRIO INFORMATION SYSTEMS AB
00:60:AF PacificM # PACIFIC MICRO DATA, INC.
00:60:B0 HP
-00:60:B1 Input/Ou # INPUT/OUTPUT, INC.
+00:60:B1 Input/Ou # Input/Output, Inc.
00:60:B2 ProcessC # PROCESS CONTROL CORP.
00:60:B3 Z-Com # Z-COM, INC.
00:60:B4 Glenayre # GLENAYRE R&D INC.
@@ -15671,7 +15671,7 @@
00:8B:43 Rftech # RFTECH
00:8C:10 BlackBox # Black Box Corp.
00:8C:54 AdbBroad # ADB Broadband Italia
-00:8C:FA Inventec # Inventec Corporation
+00:8C:FA Inventec # INVENTEC Corporation
00:8D:4E CjscNiiS # CJSC NII STT
00:8D:DA LinkOne # Link One Co., Ltd.
00:8E:73 CiscoInc # Cisco Systems, Inc
@@ -15850,7 +15850,7 @@
00:90:AB CiscoInc # Cisco Systems, Inc
00:90:AC Optivisi # OPTIVISION, INC.
00:90:AD AspectEl # ASPECT ELECTRONICS, INC.
-00:90:AE ItaltelS # ITALTEL S.p.A.
+00:90:AE ItaltelS # ITALTEL S.p.A/RF-UP-I
00:90:AF JMoritaM # J. MORITA MFG. CORP.
00:90:B0 Vadem # VADEM
00:90:B1 CiscoInc # Cisco Systems, Inc
@@ -16011,7 +16011,7 @@
00:A0:42 SpurProd # SPUR PRODUCTS CORP.
00:A0:43 American # AMERICAN TECHNOLOGY LABS, INC.
00:A0:44 NttIt # NTT IT CO., LTD.
-00:A0:45 PhoenixC # PHOENIX CONTACT GMBH & CO.
+00:A0:45 PhoenixC # PHOENIX CONTACT Electronics GmbH
00:A0:46 Scitex # SCITEX CORP. LTD.
00:A0:47 Integrat # INTEGRATED FITNESS CORP.
00:A0:48 Questech # QUESTECH, LTD.
@@ -16503,7 +16503,7 @@
00:C0:ED UsArmyEl # US ARMY ELECTRONIC
00:C0:EE KyoceraC # KYOCERA CORPORATION
00:C0:EF AbitCorp # ABIT CORPORATION
-00:C0:F0 Kingston # KINGSTON TECHNOLOGY CORP.
+00:C0:F0 Kingston # Kingston Technology Company, Inc.
00:C0:F1 ShinkoEl # SHINKO ELECTRIC CO., LTD.
00:C0:F2 Transiti # TRANSITION NETWORKS
00:C0:F3 NetworkC # NETWORK COMMUNICATIONS CORP.
@@ -17020,7 +17020,7 @@
00:E0:CC Hero # HERO SYSTEMS, LTD.
00:E0:CD SaabSens # SAAB SENSIS CORPORATION
00:E0:CE Arn # ARN
-00:E0:CF Integrat # INTEGRATED DEVICE TECHNOLOGY, INC.
+00:E0:CF Integrat # INTEGRATED DEVICE
00:E0:D0 Netspeed # NETSPEED, INC.
00:E0:D1 TelsisLi # TELSIS LIMITED
00:E0:D2 Versanet # VERSANET COMMUNICATIONS, INC.
@@ -17043,7 +17043,7 @@
00:E0:E3 Sk-Elekt # SK-ELEKTRONIK GMBH
00:E0:E4 FanucRob # FANUC ROBOTICS NORTH AMERICA, Inc.
00:E0:E5 CincoNet # CINCO NETWORKS, INC.
-00:E0:E6 IncaaDat # INCAA DATACOM B.V.
+00:E0:E6 IncaaCom # INCAA Computers
00:E0:E7 Raytheon # RAYTHEON E-SYSTEMS, INC.
00:E0:E8 Gretacod # GRETACODER Data Systems AG
00:E0:E9 DataLabs # DATA LABS, INC.
@@ -17264,7 +17264,7 @@
08:00:0A NestarIn # NESTAR SYSTEMS INCORPORATED
08:00:0B UnisysCo # UNISYS CORPORATION
08:00:0C MiklynDe # MIKLYN DEVELOPMENT CO.
-08:00:0D Internat # INTERNATIONAL COMPUTERS LTD.
+08:00:0D Internat # International Computers, Ltd
08:00:0E NcrCorpo # NCR CORPORATION
08:00:0F MitelCor # MITEL CORPORATION
08:00:10 At&T[Mis # AT&T [misrepresentation of 800010?]
@@ -17898,6 +17898,7 @@
14:94:48 BluCastl # BLU CASTLE S.A.
14:99:E2 Apple # Apple, Inc.
14:9A:10 Microsof # Microsoft Corporation
+14:9E:CF Dell # Dell Inc.
14:9F:E8 LenovoMo # Lenovo Mobile Communication Technology Ltd.
14:A3:64 SamsungE # Samsung Electronics Co.,Ltd
14:A6:2C SMDezacS # S.M. Dezac S.A.
@@ -18101,6 +18102,7 @@
1C:18:4A Shenzhen # ShenZhen RicherLink Technologies Co.,LTD
1C:19:DE EyevisGm # eyevis GmbH
1C:1A:C0 Apple # Apple, Inc.
+1C:1B:0D Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD.
1C:1B:68 ArrisGro # ARRIS Group, Inc.
1C:1C:FD DalianHi # Dalian Hi-Think Computer Technology, Corp
1C:1D:67 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
@@ -19341,6 +19343,7 @@
3C:FB:96 EmcraftL # Emcraft Systems LLC
3C:FD:FE IntelCor # Intel Corporate
40:00:03 NetWare? # Net Ware (?)
+40:00:E0 DerekSha # Derek(Shaoguan)Limited
40:01:07 AristaCo # Arista Corp
40:01:C6 3comEuro # 3COM EUROPE LTD
40:04:0C A&T # A&T
@@ -19514,7 +19517,7 @@
40:D8:55:02:C0:00/36 Inventla # InventLab s.c.
40:D8:55:02:D0:00/36 ElgamaSi # Elgama Sistemos
40:D8:55:02:E0:00/36 Circuite # Circuitec Ind. Equip. Eletr. Ltda
-40:D8:55:02:F0:00/36 AdvaTech # Adva Technologies
+40:D8:55:02:F0:00/36 AdvatekL # Advatek Lighting Pty Ltd
40:D8:55:03:00:00/36 Tecnolog # Tecnologias Plexus
40:D8:55:03:10:00/36 Dommel # Dommel GmbH
40:D8:55:03:20:00/36 BettiniS # BETTINI SRL
@@ -20187,6 +20190,7 @@
48:B9:C2 Teletics # Teletics Inc.
48:BE:2D Symanitr # Symanitron
48:BF:74 Baicells # Baicells Technologies Co.,LTD
+48:C0:49 BroadTel # Broad Telecom SA
48:C0:93 Xirrus # Xirrus, Inc.
48:C1:AC Plantron # PLANTRONICS, INC.
48:C8:62 SimoWire # Simo Wireless,Inc.
@@ -20493,6 +20497,7 @@
54:09:8D DeisterE # deister electronic GmbH
54:11:2F SulzerPu # Sulzer Pump Solutions Finland Oy
54:11:5F AtamoPty # Atamo Pty Ltd
+54:13:79 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
54:14:73 Wingtech # Wingtech Group (HongKong）Limited
54:14:FD Orbbec3d # Orbbec 3D Technology International
54:1B:5D Techno-I # Techno-Innov
@@ -21609,6 +21614,7 @@
70:B3:D5:0A:B0:00/36 KstTechn # KST technology
70:B3:D5:0B:30:00/36 ReonixAu # Reonix Automation
70:B3:D5:0B:80:00/36 Lucas-Nü # Lucas-Nülle GmbH
+70:B3:D5:0B:90:00/36 EasyDigi # Easy Digital Concept
70:B3:D5:0B:E0:00/36 ChamsysL # ChamSys Ltd
70:B3:D5:0C:00:00/36 MoluTech # Molu Technology Inc., LTD.
70:B3:D5:0C:10:00/36 NexusTec # Nexus Technologies Pty Ltd
@@ -21658,6 +21664,7 @@
70:B3:D5:16:60:00/36 SerialIm # SERIAL IMAGE INC.
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:D0:00/36 EntechEl # Entech Electronics
70:B3:D5:17:E0:00/36 OculiVis # OCULI VISION
70:B3:D5:17:F0:00/36 MbConnec # MB Connect Line GmbH
70:B3:D5:18:10:00/36 TaskSist # Task Sistemas
@@ -21708,6 +21715,7 @@
70:B3:D5:23:E0:00/36 TornadoM # Tornado Modular Systems
70:B3:D5:24:30:00/36 Rohde&Sc # Rohde&Schwarz Topex SA
70:B3:D5:25:00:00/36 DatumEle # Datum Electronics Limited
+70:B3:D5:25:90:00/36 ZebraEle # Zebra Elektronik A.S.
70:B3:D5:25:B0:00/36 GidIndus # GID Industrial
70:B3:D5:26:10:00/36 PotterEl # Potter Electric Signal Co. LLC
70:B3:D5:26:60:00/36 SpectraD # Spectra Displays Ltd
@@ -21790,6 +21798,7 @@
70:B3:D5:37:F0:00/36 IdsInnom # IDS Innomic GmbH
70:B3:D5:38:30:00/36 LpaExcil # LPA Excil Electronics
70:B3:D5:38:40:00/36 Sensohiv # Sensohive Technologies
+70:B3:D5:38:90:00/36 Private # Private
70:B3:D5:38:F0:00/36 Sorynory # Sorynorydotcom Inc
70:B3:D5:39:20:00/36 ContecDt # Contec DTx
70:B3:D5:39:A0:00/36 Videotre # Videotrend srl
@@ -21797,6 +21806,7 @@
70:B3:D5:39:C0:00/36 GeneralD # General Dynamics C4 Systems
70:B3:D5:39:D0:00/36 ComarkIn # Comark Interactive Solutions
70:B3:D5:3A:80:00/36 Jamhub # JamHub Corp.
+70:B3:D5:3A:90:00/36 Vivalnk # Vivalnk
70:B3:D5:3B:80:00/36 Nvideon # nVideon, Inc.
70:B3:D5:3C:00:00/36 Dk-Techn # DK-Technologies A/S
70:B3:D5:3C:20:00/36 Cellular # Cellular Specialties, Inc.
@@ -21904,6 +21914,7 @@
70:B3:D5:53:00:00/36 Isis-ExL # iSiS-Ex Limited
70:B3:D5:53:10:00/36 Ateme # ATEME
70:B3:D5:53:80:00/36 Sydetion # sydetion UG (h.b.)
+70:B3:D5:54:40:00/36 SiliconS # Silicon Safe Ltd
70:B3:D5:54:D0:00/36 QingdaoH # Qingdao Haitian Weiye Automation Control System Co., Ltd
70:B3:D5:54:E0:00/36 RflElect # RFL Electronics, Inc.
70:B3:D5:55:10:00/36 Infrachi # infrachip
@@ -21962,6 +21973,7 @@
70:B3:D5:63:40:00/36 Idaqs # idaqs Co.,Ltd.
70:B3:D5:63:A0:00/36 DaveSrl # DAVE SRL
70:B3:D5:63:B0:00/36 LazerSaf # Lazer Safe Pty Ltd
+70:B3:D5:64:00:00/36 Electron # Electronic Equipment Company Pvt. Ltd.
70:B3:D5:64:50:00/36 ProjectD # Project Decibel, Inc.
70:B3:D5:64:70:00/36 Kzta # KZTA
70:B3:D5:64:A0:00/36 NetbricT # Netbric Technology Co.,Ltd.
@@ -22035,6 +22047,7 @@
70:B3:D5:75:50:00/36 Landmark # LandmarkTech Systems Technology Co.,Ltd.
70:B3:D5:75:C0:00/36 UpmTechn # UPM Technology, Inc
70:B3:D5:75:D0:00/36 NanjingM # Nanjing Magewell Electronics Co., Ltd.
+70:B3:D5:76:60:00/36 Tirasoft # Tirasoft Nederland
70:B3:D5:76:A0:00/36 Swiftnet # Swiftnet SOC Ltd
70:B3:D5:76:B0:00/36 EmpelorG # EMPELOR GmbH
70:B3:D5:76:D0:00/36 Trimble # Trimble
@@ -22129,7 +22142,7 @@
70:B3:D5:8A:B0:00/36 Emac # EMAC, Inc.
70:B3:D5:8A:D0:00/36 GlobalCo # Global Communications Technology LLC
70:B3:D5:8B:00:00/36 IesSRL # IES S.r.l.
-70:B3:D5:8B:10:00/36 M-TechIn # M-Tech Innovations Ltd
+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:90:00/36 Toptech # Toptech Systems, Inc.
70:B3:D5:8B:E0:00/36 Connoise # Connoiseur Electronics Private Limited
@@ -22174,6 +22187,7 @@
70:B3:D5:99:40:00/36 KeffNetw # KeFF Networks
70:B3:D5:99:50:00/36 LaytecAg # LayTec AG
70:B3:D5:99:60:00/36 Xpertsea # XpertSea Solutions inc.
+70:B3:D5:99:A0:00/36 Kevic # KEVIC. inc,
70:B3:D5:99:F0:00/36 ConfedBV # Confed Holding B.V.
70:B3:D5:9A:70:00/36 Honeywel # Honeywell
70:B3:D5:9B:30:00/36 K&JSchmi # K&J Schmittschneider AG
@@ -22388,6 +22402,7 @@
70:B3:D5:CE:70:00/36 JuneAuto # June Automation Singapore Pte. Ltd.
70:B3:D5:CE:90:00/36 Kinemetr # KINEMETRICS
70:B3:D5:CF:10:00/36 Lightdec # LightDec GmbH & Co. KG
+70:B3:D5:CF:20:00/36 Tinnos # tinnos
70:B3:D5:CF:30:00/36 MeshMoti # Mesh Motion Inc
70:B3:D5:CF:40:00/36 HarbinCh # Harbin Cheng Tian Technology Development Co., Ltd.
70:B3:D5:CF:60:00/36 TornadoM # Tornado Modular Systems
@@ -22404,6 +22419,7 @@
70:B3:D5:D1:F0:00/36 EmbsecAb # Embsec AB
70:B3:D5:D2:90:00/36 Sportzca # Sportzcast
70:B3:D5:D2:D0:00/36 EvoluteP # Evolute Systems Private Limited
+70:B3:D5:D3:40:00/36 G-Philos # G-PHILOS CO.,LTD
70:B3:D5:D3:80:00/36 VistaRes # Vista Research, Inc.
70:B3:D5:D3:B0:00/36 Nimbelin # NimbeLink Corp
70:B3:D5:D3:F0:00/36 Globalco # GLOBALCOM ENGINEERING SPA
@@ -22525,6 +22541,7 @@
70:B3:D5:ED:C0:00/36 JDKoftin # J.D. Koftinoff Software, Ltd.
70:B3:D5:ED:D0:00/36 SolarNet # Solar Network & Partners
70:B3:D5:ED:F0:00/36 Gridnavi # GridNavigator
+70:B3:D5:EE:10:00/36 AlloraFa # allora Factory BVBA
70:B3:D5:EE:40:00/36 O-NetAut # O-Net Automation Technology (Shenzhen)Limited
70:B3:D5:EE:50:00/36 BeijingH # Beijing Hzhytech Technology Co.Ltd
70:B3:D5:EE:E0:00/36 Sociedad # SOCIEDAD IBERICA DE CONSTRUCCIONES ELECTRICAS, S.A. (SICE)
@@ -22586,6 +22603,7 @@
70:B3:D5:FB:60:00/36 Kronotec # KRONOTECH SRL
70:B3:D5:FB:A0:00/36 ApogeeAp # Apogee Applied Research, Inc.
70:B3:D5:FB:B0:00/36 VenaEngi # Vena Engineering Corporation
+70:B3:D5:FB:E0:00/36 HanbatNa # Hanbat National University
70:B3:D5:FC:10:00/36 Indicor # InDiCor
70:B3:D5:FC:50:00/36 EltwinA/ # Eltwin A/S
70:B3:D5:FC:60:00/36 TecnintH # Tecnint HTE SRL
@@ -22600,6 +22618,7 @@
70:B3:D5:FD:E0:00/36 Aeronaut # AERONAUTICAL & GENERAL INSTRUMENTS LTD.
70:B3:D5:FD:F0:00/36 NaraCont # NARA CONTROLS INC.
70:B3:D5:FE:20:00/36 GalileoT # Galileo Tıp Teknolojileri San. ve Tic. A.S.
+70:B3:D5:FE:40:00/36 CarePvtL # CARE PVT LTD
70:B3:D5:FE:60:00/36 ShizukiE # SHIZUKI ELECTRIC CO.,INC
70:B3:D5:FE:70:00/36 Veilux # VEILUX INC.
70:B3:D5:FE:80:00/36 Pcme # PCME Ltd.
@@ -23691,6 +23710,7 @@
90:34:2B Gatekeep # Gatekeeper Systems, Inc.
90:34:FC HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
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
90:3C:92 Apple # Apple, Inc.
@@ -23836,7 +23856,7 @@
94:36:E0 SichuanB # Sichuan Bihong Broadcast &amp; Television New Technologies Co.,Ltd
94:39:E5 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
94:3A:F0 NokiaCor # Nokia Corporation
-94:3B:B1 Kaonmedi # KAONMEDIA
+94:3B:B1 Kaonmedi # Kaonmedia CO., LTD.
94:40:A2 AnywaveC # Anywave Communication Technologies, Inc.
94:44:44 LgInnote # LG Innotek
94:44:52 BelkinIn # Belkin International Inc.
@@ -24496,6 +24516,7 @@ A4:E0:E6 Filizola # FILIZOLA S.A. PESAGEM E AUTOMACAO
A4:E3:2E SiliconS # Silicon & Software Systems Ltd.
A4:E3:91 DenyFont # DENY FONTAINE
A4:E4:B8 Blackber # BlackBerry RTS
+A4:E5:97 GesslerG # Gessler GmbH
A4:E7:31 NokiaCor # Nokia Corporation
A4:E7:E4 ConnexGm # Connex GmbH
A4:E9:91 Sistemas # SISTEMAS AUDIOVISUALES ITELSIS S.L.
@@ -24555,6 +24576,7 @@ A8:65:B2 Dongguan # DONGGUAN YISHANG ELECTRONIC TECHNOLOGY CO., LI
A8:66:7F Apple # Apple, Inc.
A8:6A:6F Rim # RIM
A8:6A:C1 Hanbited # HanbitEDS Co., Ltd.
+A8:6B:AD HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
A8:70:A5 Unicomm # UniComm Inc.
A8:72:85 Idt # IDT, INC.
A8:74:1D PhoenixC # PHOENIX CONTACT Electronics GmbH
@@ -24610,7 +24632,7 @@ A8:D2:36 Lightwar # Lightware Visual Engineering
A8:D3:C8 Wachendo # Wachendorff Elektronik GmbH & Co. KG
A8:D3:F7 Arcadyan # Arcadyan Technology Corporation
A8:D4:09 Usa111In # USA 111 Inc
-A8:D8:28 BayerHea # Bayer HealthCare
+A8:D8:28 Ascensia # Ascensia Diabetes Care
A8:D8:8A Wyconn # Wyconn
A8:E0:18 NokiaCor # Nokia Corporation
A8:E3:EE SonyComp # Sony Computer Entertainment Inc.
@@ -24684,7 +24706,7 @@ AC:5F:3E SamsungE # SAMSUNG ELECTRO-MECHANICS(THAILAND)
AC:60:B6 Ericsson # Ericsson AB
AC:61:23 Drivven # Drivven, Inc.
AC:61:EA Apple # Apple, Inc.
-AC:62:0D JabilCir # Jabil Circuit (Wuxi) Co. LTD
+AC:62:0D JabilCir # Jabil Circuit(Wuxi) Co.,Ltd
AC:64:62 ZteCorpo # zte corporation
AC:67:06 RuckusWi # Ruckus Wireless
AC:67:6F Electroc # Electrocompaniet A.S.
@@ -25000,6 +25022,7 @@ B4:AB:2C MtmTechn # MtM Technology Corporation
B4:AE:2B Microsof # Microsoft
B4:AE:6F CircleRe # Circle Reliance, Inc DBA Cranberry Networks
B4:B0:17 AvayaInc # Avaya Inc
+B4:B1:5A SiemensE # Siemens AG Energy Management Division
B4:B2:65 DaehoI&T # DAEHO I&T
B4:B3:62 ZteCorpo # zte corporation
B4:B5:2F HewlettP # Hewlett Packard
@@ -25624,6 +25647,7 @@ C8:3D:97 NokiaCor # Nokia Corporation
C8:3D:FC PioneerC # PIONEER CORPORATION
C8:3E:99 TexasIns # Texas Instruments
C8:3E:A7 KunbusGm # KUNBUS GmbH
+C8:3F:26 Microsof # Microsoft Corporation
C8:3F:B4 ArrisGro # ARRIS Group, Inc.
C8:45:29 ImkNetwo # IMK Networks Co.,Ltd
C8:45:44 Shanghai # Shanghai Enlogic Electric Technology Co., Ltd.
@@ -25965,6 +25989,7 @@ D0:9D:0A Linkcom # LINKCOM
D0:9D:AB TctMobil # TCT mobile ltd
D0:A0:D6 ChengduT # Chengdu TD Tech Ltd.
D0:A3:11 Neuberge # Neuberger Gebäudeautomation GmbH
+D0:A4:B1 Sonifex # Sonifex Ltd.
D0:A5:A6 CiscoInc # Cisco Systems, Inc
D0:A6:37 Apple # Apple, Inc.
D0:AE:EC AlphaNet # Alpha Networks Inc.
@@ -26171,6 +26196,7 @@ D8:08:F5 ArcadiaN # Arcadia Networks Co. Ltd.
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: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
@@ -26607,6 +26633,7 @@ E4:2A:D3 MagnetiM # Magneti Marelli S.p.A. Powertrain
E4:2C:56 Lilee # Lilee Systems, Ltd.
E4:2D:02 TctMobil # TCT Mobile Limited
E4:2F:26 Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD
+E4:2F:56 OptometG # OptoMET GmbH
E4:2F:F6 UnicoreC # Unicore communication Inc.
E4:32:CB SamsungE # Samsung Electronics Co.,Ltd
E4:35:93 Hangzhou # Hangzhou GoTo technology Co.Ltd
@@ -26721,6 +26748,7 @@ E8:06:88 Apple # Apple, Inc.
E8:07:34 Champion # Champion Optical Network Engineering, LLC
E8:07:BF Shenzhen # SHENZHEN BOOMTECH INDUSTRY CO.,LTD
E8:08:8B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
+E8:09:59 Guoguang # Guoguang Electric Co.,Ltd
E8:0B:13 AkibTaiw # Akib Systems Taiwan, INC
E8:0C:38 Daeyoung # DAEYOUNG INFORMATION SYSTEM CO., LTD
E8:0C:75 Syncbak # Syncbak, Inc.
@@ -27227,6 +27255,7 @@ F4:C7:14 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
F4:C7:95 WeyElekt # WEY Elektronik AG
F4:CA:24 Freebit # FreeBit Co., Ltd.
F4:CA:E5 FreeboxS # FREEBOX SAS
+F4:CC:55 JuniperN # Juniper Networks
F4:CD:90 Vispiron # Vispiron Rotec GmbH
F4:CE:46 HewlettP # Hewlett Packard
F4:CF:E2 CiscoInc # Cisco Systems, Inc
@@ -27377,6 +27406,7 @@ F8:D3:A9 AxanNetw # AXAN Networks
F8:D4:62 Pumatron # Pumatronix Equipamentos Eletronicos Ltda.
F8:D7:56 SimmTron # Simm Tronic Limited
F8:D7:BF RevRitte # REV Ritter GmbH
+F8:DA:0C HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
F8:DA:DF Ecotech # EcoTech, Inc.
F8:DA:E2 BetaLase # Beta LaserMike
F8:DA:F4 TaishanO # Taishan Online Technology Co., Ltd.
@@ -27505,6 +27535,7 @@ FC:B0:C4 Shanghai # Shanghai DareGlobal Technologies Co., Ltd
FC:B4:E6 AskeyCom # ASKEY COMPUTER CORP
FC:B6:98 Cambridg # Cambridge Industries(Group) Co.,Ltd.
FC:BB:A1 Shenzhen # Shenzhen Minicreate Technology Co.,Ltd
+FC:BC:9C VimarSpa # Vimar Spa
FC:C2:33 Private # Private
FC:C2:3D AtmelCor # Atmel Corporation
FC:C2:DE MurataMa # Murata Manufacturing Co., Ltd.
diff --git a/services b/services
index 7e33d46772..03ff960582 100644
--- a/services
+++ b/services
@@ -10086,7 +10086,7 @@ fmtp 8500/udp # Flight Message Transfer Protocol [Eivan_Cerasi] [Eiv
cmtp-mgt 8501/tcp # CYTEL Message Transfer Management
cmtp-av 8501/udp # CYTEL Message Transfer Audio and Video [Frank_Jakel] [Frank_Jakel] 2011-04-29
ftnmtp 8502/tcp # FTN Message Transfer Protocol [Yuri_Myakotin] [Yuri_Myakotin] 2014-01-07
-lsp-self-ping 8503/udp # MPLS LSP Self-Ping [IESG] [IETF_Chair] 2015-06-11 2015-11-03 [RFC-ietf-mpls-self-ping-06]
+lsp-self-ping 8503/udp # MPLS LSP Self-Ping [IESG] [IETF_Chair] 2015-06-11 2016-02-01 [RFC7746]
rtsp-alt 8554/tcp # RTSP Alternate (see port 554) [Stephen_Casner_2] [Stephen_Casner_2]
rtsp-alt 8554/udp # RTSP Alternate (see port 554) [Stephen_Casner_2] [Stephen_Casner_2]
d-fence 8555/tcp # SYMAX D-FENCE [Thomas_Geisel] [Thomas_Geisel] 2003-01
diff --git a/ui/qt/wireshark_de.qm b/ui/qt/wireshark_de.qm
index 6b363fe953..95733fab80 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 c98bef8493..002418b07b 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1021,28 +1021,28 @@
<message>
<location filename="capture_filter_edit.cpp" line="358"/>
<source>Save this filter</source>
- <translation type="unfinished">Disen Filter speichern</translation>
+ <translation>Diesen Filter speichern</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="360"/>
<source>Remove this filter</source>
- <translation type="unfinished">Diesen Filter entfernen</translation>
+ <translation>Diesen Filter entfernen</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="362"/>
<source>Manage Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Mitschnittfilter verwalten</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="498"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished">Einstellungen für die Mitschnittfilter konnten nicht gespeichert werden.</translation>
+ <translation>Mitschnittfiltereinstellungen können nicht gespeichert werden.</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="499"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Ihre Mitschnittfilterdatei konnte nicht gespeichert werden
+ <translation>Mitschnittfilterdatei kann nicht gespeichert werden
&quot;%1&quot;: %2.</translation>
</message>
</context>
@@ -1208,8 +1208,9 @@
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="128"/>
- <source>Capture Filter for selected Interfaces:</source>
- <translation>Mitschnitt Filter für ausgewählte Interfaces:</translation>
+ <source>Capture filter for selected interfaces:</source>
+ <oldsource>Capture Filter for selected Interfaces:</oldsource>
+ <translation type="unfinished">Mitschnitt Filter für ausgewählte Interfaces:</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -1367,93 +1368,93 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mitschneiden beenden, nachdem die angegebene Anzahl an Pakete mitgeschnitten wurde.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="118"/>
+ <location filename="capture_interfaces_dialog.cpp" line="121"/>
<source>Capture Interfaces</source>
<translation>Mitschnittinterfaces</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="124"/>
+ <location filename="capture_interfaces_dialog.cpp" line="127"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>enabled</source>
<translation>aktivieren</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>disabled</source>
<translation>deaktivieren</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="279"/>
+ <location filename="capture_interfaces_dialog.cpp" line="291"/>
<source>Specify a Capture File</source>
<translation>Eine Mitschnittdatei angeben</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Addresses</source>
<translation>Adressen</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="488"/>
+ <location filename="capture_interfaces_dialog.cpp" line="498"/>
<source>no addresses</source>
<translation>keine Adressen</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="549"/>
<source>default</source>
<translation>Standard</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="529"/>
- <location filename="capture_interfaces_dialog.cpp" line="530"/>
- <location filename="capture_interfaces_dialog.cpp" line="532"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="540"/>
+ <location filename="capture_interfaces_dialog.cpp" line="542"/>
+ <location filename="capture_interfaces_dialog.cpp" line="545"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>n/a</source>
<translation>Nicht verfügbar</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="682"/>
- <location filename="capture_interfaces_dialog.cpp" line="690"/>
- <location filename="capture_interfaces_dialog.cpp" line="701"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
+ <location filename="capture_interfaces_dialog.cpp" line="695"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="714"/>
<location filename="capture_interfaces_dialog.cpp" line="718"/>
- <location filename="capture_interfaces_dialog.cpp" line="726"/>
+ <location filename="capture_interfaces_dialog.cpp" line="731"/>
+ <location filename="capture_interfaces_dialog.cpp" line="739"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="683"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="719"/>
- <location filename="capture_interfaces_dialog.cpp" line="727"/>
+ <location filename="capture_interfaces_dialog.cpp" line="696"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="732"/>
+ <location filename="capture_interfaces_dialog.cpp" line="740"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation>Dateisatz: Angeforderte Dateigröße zu groß! Die Dateigröße kann nicht größer als 2 GiB sein.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="702"/>
+ <location filename="capture_interfaces_dialog.cpp" line="715"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation>Dateisatz: Keinen Dateinamen angeben! Wenn ein Dateisatz genutzt werden soll, muss ein Dateiname angegeben werden.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="706"/>
+ <location filename="capture_interfaces_dialog.cpp" line="719"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation>Dateisatz: Kein Limit angegeben! Wenn ein Dateisatz genutzt werden soll, muss eine Dateigröße oder eine Laufzeit angegeben werden, bei der zur nächsten Datei gewechselt wird.</translation>
@@ -1888,44 +1889,43 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>Diesen Filter zur Anzeige anwenden.</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="393"/>
+ <location filename="display_filter_edit.cpp" line="387"/>
<source>Save this filter</source>
<translation>Disen Filter speichern</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="397"/>
+ <location filename="display_filter_edit.cpp" line="391"/>
<source>Manage Display Filters</source>
<translation>Anzeigefilter verwalten</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="399"/>
+ <location filename="display_filter_edit.cpp" line="393"/>
<source>Manage Filter Expressions</source>
<translation>Filterausdrücke verwalten</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="578"/>
+ <location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished">Einstellungen für die Anzeigenfilter konnten nicht gespeichert werden.</translation>
+ <translation>Anzeigefiltereinstellungen können nicht gespeichert werden.</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="579"/>
+ <location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Ihre Anzeigefilterdatei konnte nicht gespeichert werden
+ <translation>Anzeigefilterdatei kann nicht gespeichert werden
&quot;%1&quot;: %2.</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="395"/>
+ <location filename="display_filter_edit.cpp" line="389"/>
<source>Remove this filter</source>
<translation>Diesen Filter entfernen</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="330"/>
<source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
- <translation>&quot;%1&quot; kann zu einem unerwarteten Ergebnis führen (s. Benutzerhandbuch)</translation>
+ <translation type="vanished">&quot;%1&quot; kann zu einem unerwarteten Ergebnis führen (s. Benutzerhandbuch)</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="337"/>
+ <location filename="display_filter_edit.cpp" line="331"/>
<source>Invalid filter: </source>
<oldsource>Invalid filter</oldsource>
<translation>Ungültiger Filter: </translation>
@@ -2026,12 +2026,12 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>Anzeigefilterausdruck</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<source>Select a field name to get started</source>
<translation>Einen Feldnamen auswählen um zu starten</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>Zum Einfügen dieses Filter OK klicken</translation>
</message>
@@ -2677,7 +2677,7 @@ für die Filterdateien kann nicht erstellt werden:
<message>
<location filename="filter_expressions_preferences_frame.ui" line="60"/>
<source>Copy this filter.</source>
- <translation type="unfinished">Diesen Filter kopieren.</translation>
+ <translation>Diesen Filter kopieren.</translation>
</message>
</context>
<context>
@@ -4339,17 +4339,17 @@ für die Filterdateien kann nicht erstellt werden:
<context>
<name>InterfaceTree</name>
<message>
- <location filename="interface_tree.cpp" line="68"/>
+ <location filename="interface_tree.cpp" line="73"/>
<source>Welcome screen list</source>
<translation>Willkommensbildschrim</translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="74"/>
+ <location filename="interface_tree.cpp" line="79"/>
<source>Waiting for startup%1</source>
<translation>Warten auf den Programmstart%1 </translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="228"/>
+ <location filename="interface_tree.cpp" line="246"/>
<source>Interface information not available</source>
<translation>Interfaceinformation nicht verfügbar</translation>
</message>
@@ -4357,16 +4357,16 @@ für die Filterdateien kann nicht erstellt werden:
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="975"/>
- <location filename="capture_interfaces_dialog.cpp" line="1007"/>
- <location filename="capture_interfaces_dialog.cpp" line="1055"/>
- <location filename="capture_interfaces_dialog.cpp" line="1075"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1006"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1087"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1107"/>
<source>enabled</source>
<translation>aktiviert</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="976"/>
- <location filename="capture_interfaces_dialog.cpp" line="1008"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1007"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1039"/>
<source>disabled</source>
<translation>deaktiviert</translation>
</message>
@@ -6453,32 +6453,32 @@ text-decoration: underline;
&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="209"/>
+ <location filename="main_welcome.cpp" line="221"/>
<source>You are running Wireshark </source>
<translation>Sie nutzen Wireshark </translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="211"/>
+ <location filename="main_welcome.cpp" line="223"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="214"/>
+ <location filename="main_welcome.cpp" line="226"/>
<source> You receive automatic updates.</source>
<translation>Updates werden automatisch heruntergeladen.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="216"/>
+ <location filename="main_welcome.cpp" line="228"/>
<source> You have disabled automatic updates.</source>
<translation>Automatische Aktualisierung ist deaktiviert.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="288"/>
+ <location filename="main_welcome.cpp" line="331"/>
<source>not found</source>
<translation>nicht gefunden</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="361"/>
+ <location filename="main_welcome.cpp" line="404"/>
<source>Copy file path</source>
<translation>Dateipfad kopieren</translation>
</message>
@@ -9184,88 +9184,88 @@ text-decoration: underline;
<translation>Ungültiger Mitschnittfilter</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1083"/>
+ <location filename="main_window_slots.cpp" line="1053"/>
<source>Clear Menu</source>
<translation>Menüeinträge löschen</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1574"/>
+ <location filename="main_window_slots.cpp" line="1547"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Bitte Warten während Wireshark initalisiert wird</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1704"/>
<source>Export Selected Packet Bytes</source>
<translation>Ausgewählte Paketbytes exportieren</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1706"/>
<source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
<translation>Rohdaten (*.bin *.dat *.raw);; Alle Dateien (*.*)</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1790"/>
+ <location filename="main_window_slots.cpp" line="1763"/>
<source>No Keys</source>
<translation>Keine Schlüssel</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1791"/>
+ <location filename="main_window_slots.cpp" line="1764"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Es sind keine SSL Sitzungsschlüssel zum speichern vorhanden.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1770"/>
<source>Export SSL Session Keys (%1 key%2</source>
<translation>SSL Sitzungsschlüssel exportieren (%1 key%2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1802"/>
+ <location filename="main_window_slots.cpp" line="1775"/>
<source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
<translation>SSL Sitzungsschlüssel (*.keys *.txt);; Alle Dateien (*.*)</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1940"/>
+ <location filename="main_window_slots.cpp" line="1913"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>Text konnte nicht kopiert werden. Probieren sie einen anderen Eintrag.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2347"/>
- <location filename="main_window_slots.cpp" line="3382"/>
+ <location filename="main_window_slots.cpp" line="2322"/>
+ <location filename="main_window_slots.cpp" line="3357"/>
<source>Unable to build conversation filter.</source>
<translation>Verbindungsfilter kann nicht erstellt werden.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2492"/>
+ <location filename="main_window_slots.cpp" line="2467"/>
<source>No filter available. Try another </source>
<translation>Kein Filter verfügbar. Probieren Sie einen anderen.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3389"/>
+ <location filename="main_window_slots.cpp" line="3364"/>
<source>Error compiling filter for this conversation.</source>
<translation>Fehler beim Erstellen eines Filters für diese Verbindung.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3398"/>
+ <location filename="main_window_slots.cpp" line="3373"/>
<source>No previous/next packet in conversation.</source>
<translation>Kein vorheriges/nächstes Paket in dieser Verbindung.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3475"/>
+ <location filename="main_window_slots.cpp" line="3450"/>
<source>No Interface Selected</source>
<translation>Kein Interface ausgewählt</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3482"/>
+ <location filename="main_window_slots.cpp" line="3457"/>
<source> before starting a new capture</source>
<translation>vor dem Starten einer neuen Aufzeichnung</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3687"/>
+ <location filename="main_window_slots.cpp" line="3663"/>
<source>Wiki Page for %1</source>
<translation>Wikiseite für %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3688"/>
+ <location filename="main_window_slots.cpp" line="3664"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;Das Wireshark Wiki wird durch die Community gepflegt.&lt;/p&gt;&lt;p&gt;Die Seite, die aufgerufen werden soll, kann wundervoll, unvollständig, falsch oder gar nicht vorhanden sein.&lt;/p&gt;&lt;p&gt;Zum Wiki geheni?&lt;/p&gt;</translation>
</message>
@@ -11009,12 +11009,12 @@ text-decoration: underline;
<translation>Priorität</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="344"/>
+ <location filename="main_welcome.cpp" line="387"/>
<source>Show in Finder</source>
<translation>Im Finder anzeigen</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="346"/>
+ <location filename="main_welcome.cpp" line="389"/>
<source>Show in Folder</source>
<translation>Im Ordner anzeigen</translation>
</message>
@@ -13915,6 +13915,14 @@ text-decoration: underline;
</message>
</context>
<context>
+ <name>SyntaxLineEdit</name>
+ <message>
+ <location filename="syntax_line_edit.cpp" line="180"/>
+ <source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
+ <translation type="unfinished">&quot;%1&quot; kann zu einem unerwarteten Ergebnis führen (s. Benutzerhandbuch)</translation>
+ </message>
+</context>
+<context>
<name>TCPStreamDialog</name>
<message>
<location filename="tcp_stream_dialog.ui" line="14"/>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 365fe45cff..dc85781566 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1205,7 +1205,8 @@
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="128"/>
- <source>Capture Filter for selected Interfaces:</source>
+ <source>Capture filter for selected interfaces:</source>
+ <oldsource>Capture Filter for selected Interfaces:</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1363,93 +1364,93 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="118"/>
+ <location filename="capture_interfaces_dialog.cpp" line="121"/>
<source>Capture Interfaces</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="124"/>
+ <location filename="capture_interfaces_dialog.cpp" line="127"/>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="279"/>
+ <location filename="capture_interfaces_dialog.cpp" line="291"/>
<source>Specify a Capture File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Addresses</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="488"/>
+ <location filename="capture_interfaces_dialog.cpp" line="498"/>
<source>no addresses</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="549"/>
<source>default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="529"/>
- <location filename="capture_interfaces_dialog.cpp" line="530"/>
- <location filename="capture_interfaces_dialog.cpp" line="532"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="540"/>
+ <location filename="capture_interfaces_dialog.cpp" line="542"/>
+ <location filename="capture_interfaces_dialog.cpp" line="545"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="682"/>
- <location filename="capture_interfaces_dialog.cpp" line="690"/>
- <location filename="capture_interfaces_dialog.cpp" line="701"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
+ <location filename="capture_interfaces_dialog.cpp" line="695"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="714"/>
<location filename="capture_interfaces_dialog.cpp" line="718"/>
- <location filename="capture_interfaces_dialog.cpp" line="726"/>
+ <location filename="capture_interfaces_dialog.cpp" line="731"/>
+ <location filename="capture_interfaces_dialog.cpp" line="739"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="683"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="719"/>
- <location filename="capture_interfaces_dialog.cpp" line="727"/>
+ <location filename="capture_interfaces_dialog.cpp" line="696"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="732"/>
+ <location filename="capture_interfaces_dialog.cpp" line="740"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="702"/>
+ <location filename="capture_interfaces_dialog.cpp" line="715"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="706"/>
+ <location filename="capture_interfaces_dialog.cpp" line="719"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation type="unfinished"></translation>
@@ -1884,43 +1885,38 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="393"/>
+ <location filename="display_filter_edit.cpp" line="387"/>
<source>Save this filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="397"/>
+ <location filename="display_filter_edit.cpp" line="391"/>
<source>Manage Display Filters</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="399"/>
+ <location filename="display_filter_edit.cpp" line="393"/>
<source>Manage Filter Expressions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="578"/>
+ <location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="579"/>
+ <location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="395"/>
+ <location filename="display_filter_edit.cpp" line="389"/>
<source>Remove this filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="330"/>
- <source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="display_filter_edit.cpp" line="337"/>
+ <location filename="display_filter_edit.cpp" line="331"/>
<source>Invalid filter: </source>
<oldsource>Invalid filter</oldsource>
<translation type="unfinished"></translation>
@@ -2015,12 +2011,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<source>Select a field name to get started</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation type="unfinished"></translation>
</message>
@@ -4293,17 +4289,17 @@ for filter files: %2.</source>
<context>
<name>InterfaceTree</name>
<message>
- <location filename="interface_tree.cpp" line="68"/>
+ <location filename="interface_tree.cpp" line="73"/>
<source>Welcome screen list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="74"/>
+ <location filename="interface_tree.cpp" line="79"/>
<source>Waiting for startup%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="228"/>
+ <location filename="interface_tree.cpp" line="246"/>
<source>Interface information not available</source>
<translation type="unfinished"></translation>
</message>
@@ -4311,16 +4307,16 @@ for filter files: %2.</source>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="975"/>
- <location filename="capture_interfaces_dialog.cpp" line="1007"/>
- <location filename="capture_interfaces_dialog.cpp" line="1055"/>
- <location filename="capture_interfaces_dialog.cpp" line="1075"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1006"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1087"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1107"/>
<source>enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="976"/>
- <location filename="capture_interfaces_dialog.cpp" line="1008"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1007"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1039"/>
<source>disabled</source>
<translation type="unfinished"></translation>
</message>
@@ -6333,32 +6329,32 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="209"/>
+ <location filename="main_welcome.cpp" line="221"/>
<source>You are running Wireshark </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="211"/>
+ <location filename="main_welcome.cpp" line="223"/>
<source>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="214"/>
+ <location filename="main_welcome.cpp" line="226"/>
<source> You receive automatic updates.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="216"/>
+ <location filename="main_welcome.cpp" line="228"/>
<source> You have disabled automatic updates.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="288"/>
+ <location filename="main_welcome.cpp" line="331"/>
<source>not found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="361"/>
+ <location filename="main_welcome.cpp" line="404"/>
<source>Copy file path</source>
<translation type="unfinished"></translation>
</message>
@@ -9064,88 +9060,88 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1083"/>
+ <location filename="main_window_slots.cpp" line="1053"/>
<source>Clear Menu</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1574"/>
+ <location filename="main_window_slots.cpp" line="1547"/>
<source>Please wait while Wireshark is initializing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1704"/>
<source>Export Selected Packet Bytes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1706"/>
<source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1790"/>
+ <location filename="main_window_slots.cpp" line="1763"/>
<source>No Keys</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1791"/>
+ <location filename="main_window_slots.cpp" line="1764"/>
<source>There are no SSL Session Keys to save.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1770"/>
<source>Export SSL Session Keys (%1 key%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1802"/>
+ <location filename="main_window_slots.cpp" line="1775"/>
<source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1940"/>
+ <location filename="main_window_slots.cpp" line="1913"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2347"/>
- <location filename="main_window_slots.cpp" line="3382"/>
+ <location filename="main_window_slots.cpp" line="2322"/>
+ <location filename="main_window_slots.cpp" line="3357"/>
<source>Unable to build conversation filter.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2492"/>
+ <location filename="main_window_slots.cpp" line="2467"/>
<source>No filter available. Try another </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3389"/>
+ <location filename="main_window_slots.cpp" line="3364"/>
<source>Error compiling filter for this conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3398"/>
+ <location filename="main_window_slots.cpp" line="3373"/>
<source>No previous/next packet in conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3475"/>
+ <location filename="main_window_slots.cpp" line="3450"/>
<source>No Interface Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3482"/>
+ <location filename="main_window_slots.cpp" line="3457"/>
<source> before starting a new capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3687"/>
+ <location filename="main_window_slots.cpp" line="3663"/>
<source>Wiki Page for %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3688"/>
+ <location filename="main_window_slots.cpp" line="3664"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -10887,12 +10883,12 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="344"/>
+ <location filename="main_welcome.cpp" line="387"/>
<source>Show in Finder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="346"/>
+ <location filename="main_welcome.cpp" line="389"/>
<source>Show in Folder</source>
<translation type="unfinished"></translation>
</message>
@@ -13731,6 +13727,14 @@ a:hover {
</message>
</context>
<context>
+ <name>SyntaxLineEdit</name>
+ <message>
+ <location filename="syntax_line_edit.cpp" line="180"/>
+ <source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TCPStreamDialog</name>
<message>
<location filename="tcp_stream_dialog.ui" line="14"/>
diff --git a/ui/qt/wireshark_fr.qm b/ui/qt/wireshark_fr.qm
index d1502e32f4..343a7905b7 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 43ecb5e787..81da06d501 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1208,8 +1208,9 @@
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="128"/>
- <source>Capture Filter for selected Interfaces:</source>
- <translation>Filtre de capture pour les interfaces sélectionnées :</translation>
+ <source>Capture filter for selected interfaces:</source>
+ <oldsource>Capture Filter for selected Interfaces:</oldsource>
+ <translation type="unfinished">Filtre de capture pour les interfaces sélectionnées :</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -1367,93 +1368,93 @@ NOTE: Une option DOIT être sélectionnée.</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Arrête la capture après que le nombre de fichiers indiqués ont été créés.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="118"/>
+ <location filename="capture_interfaces_dialog.cpp" line="121"/>
<source>Capture Interfaces</source>
<translation>Liste des interfaces de capture</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="124"/>
+ <location filename="capture_interfaces_dialog.cpp" line="127"/>
<source>Start</source>
<translation>Démarrer</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>enabled</source>
<translation>activé</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>disabled</source>
<translation>désactivé</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="279"/>
+ <location filename="capture_interfaces_dialog.cpp" line="291"/>
<source>Specify a Capture File</source>
<translation>Préciser un fichier de capture</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Addresses</source>
<translation>Adresses</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="488"/>
+ <location filename="capture_interfaces_dialog.cpp" line="498"/>
<source>no addresses</source>
<translation>pas d&apos;adresse</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="549"/>
<source>default</source>
<translation>défaut</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="529"/>
- <location filename="capture_interfaces_dialog.cpp" line="530"/>
- <location filename="capture_interfaces_dialog.cpp" line="532"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="540"/>
+ <location filename="capture_interfaces_dialog.cpp" line="542"/>
+ <location filename="capture_interfaces_dialog.cpp" line="545"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>n/a</source>
<translation>n/a</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="682"/>
- <location filename="capture_interfaces_dialog.cpp" line="690"/>
- <location filename="capture_interfaces_dialog.cpp" line="701"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
+ <location filename="capture_interfaces_dialog.cpp" line="695"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="714"/>
<location filename="capture_interfaces_dialog.cpp" line="718"/>
- <location filename="capture_interfaces_dialog.cpp" line="726"/>
+ <location filename="capture_interfaces_dialog.cpp" line="731"/>
+ <location filename="capture_interfaces_dialog.cpp" line="739"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="683"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="719"/>
- <location filename="capture_interfaces_dialog.cpp" line="727"/>
+ <location filename="capture_interfaces_dialog.cpp" line="696"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="732"/>
+ <location filename="capture_interfaces_dialog.cpp" line="740"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation>Fichier multiples : la taille demandée est trop élevée, elle ne doit pas être supérieure à 2 Go.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="702"/>
+ <location filename="capture_interfaces_dialog.cpp" line="715"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation>Fichier multiples : pas de nom de fichier précisé.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="706"/>
+ <location filename="capture_interfaces_dialog.cpp" line="719"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation>Fichiers multiples: Aucune limite de fichier donnée! Vous devez spécifier une taille de fichier ou une durée où se produit le basculement au fichier de capture suivant
@@ -1876,7 +1877,7 @@ si vous voulez utiliser des fichiers multiples.</translation>
<message>
<location filename="display_filter_edit.cpp" line="218"/>
<source>Apply a read filter %1</source>
- <translation type="unfinished"></translation>
+ <translation>Appliquer un filtre de lecture %1</translation>
</message>
<message>
<location filename="display_filter_edit.cpp" line="128"/>
@@ -1889,45 +1890,43 @@ si vous voulez utiliser des fichiers multiples.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="393"/>
+ <location filename="display_filter_edit.cpp" line="387"/>
<source>Save this filter</source>
<translation>Sauvegarder ce filtre</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="397"/>
+ <location filename="display_filter_edit.cpp" line="391"/>
<source>Manage Display Filters</source>
<translation>Gérer des filtres d&apos;affichage</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="399"/>
+ <location filename="display_filter_edit.cpp" line="393"/>
<source>Manage Filter Expressions</source>
<translation>Gérer des Expressions de Filtre</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="578"/>
+ <location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished">Impossible d&apos;enregistrer les paramètres de filtre d&apos;affichage.</translation>
+ <translation>Impossible d&apos;enregistrer les paramètres de filtre d&apos;affichage.</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="579"/>
+ <location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Ne peut enregistrer votre fichier de filtre d&apos;affichage
-&quot;%1&quot;: %2.
-</translation>
+ <translation>Impossible de sauvegarder dans votre dossier de filtre d&apos;affichage
+&quot;%1&quot;: %2.</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="395"/>
+ <location filename="display_filter_edit.cpp" line="389"/>
<source>Remove this filter</source>
<translation>Supprimer ce filtre</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="330"/>
<source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
- <translation>&quot;%1&quot; peut avoir des résultats inattendus (voir le Guide de l&apos;utilisateur)</translation>
+ <translation type="vanished">&quot;%1&quot; peut avoir des résultats inattendus (voir le Guide de l&apos;utilisateur)</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="337"/>
+ <location filename="display_filter_edit.cpp" line="331"/>
<source>Invalid filter: </source>
<oldsource>Invalid filter</oldsource>
<translation>Filtre invalide :</translation>
@@ -2028,12 +2027,12 @@ si vous voulez utiliser des fichiers multiples.</translation>
<translation>Affiche Expression de Filtre</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<source>Select a field name to get started</source>
<translation>Sélectionner un nom de champ pour commencer</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>Cliquer OK pour insérer ce filtre</translation>
</message>
@@ -2679,7 +2678,7 @@ pour fichiers de filtre : %2.</translation>
<message>
<location filename="filter_expressions_preferences_frame.ui" line="60"/>
<source>Copy this filter.</source>
- <translation type="unfinished">Copier ce filtre.</translation>
+ <translation>Copier ce filtre.</translation>
</message>
</context>
<context>
@@ -4330,17 +4329,17 @@ pour fichiers de filtre : %2.</translation>
<context>
<name>InterfaceTree</name>
<message>
- <location filename="interface_tree.cpp" line="68"/>
+ <location filename="interface_tree.cpp" line="73"/>
<source>Welcome screen list</source>
<translation>Page de bienvenue</translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="74"/>
+ <location filename="interface_tree.cpp" line="79"/>
<source>Waiting for startup%1</source>
<translation>Attente de démarrage%1</translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="228"/>
+ <location filename="interface_tree.cpp" line="246"/>
<source>Interface information not available</source>
<translation>Information concernant l&apos;interface n&apos;est pas disponible</translation>
</message>
@@ -4348,16 +4347,16 @@ pour fichiers de filtre : %2.</translation>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="975"/>
- <location filename="capture_interfaces_dialog.cpp" line="1007"/>
- <location filename="capture_interfaces_dialog.cpp" line="1055"/>
- <location filename="capture_interfaces_dialog.cpp" line="1075"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1006"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1087"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1107"/>
<source>enabled</source>
<translation>activé</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="976"/>
- <location filename="capture_interfaces_dialog.cpp" line="1008"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1007"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1039"/>
<source>disabled</source>
<translation>désactivé</translation>
</message>
@@ -6413,32 +6412,32 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="209"/>
+ <location filename="main_welcome.cpp" line="221"/>
<source>You are running Wireshark </source>
<translation>Vous exécutez Wireshark</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="211"/>
+ <location filename="main_welcome.cpp" line="223"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="214"/>
+ <location filename="main_welcome.cpp" line="226"/>
<source> You receive automatic updates.</source>
<translation>Vous recevez les mises à jour automatiques.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="216"/>
+ <location filename="main_welcome.cpp" line="228"/>
<source> You have disabled automatic updates.</source>
<translation>Vous avez désactivé les mises à jour automatiques</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="288"/>
+ <location filename="main_welcome.cpp" line="331"/>
<source>not found</source>
<translation>Non trouvé</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="361"/>
+ <location filename="main_welcome.cpp" line="404"/>
<source>Copy file path</source>
<translation>Copier le chemin du fichier</translation>
</message>
@@ -7123,7 +7122,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="723"/>
<source>Wireless Toolbar</source>
- <translation type="unfinished"></translation>
+ <translation>Barre d&apos;outils Wireless</translation>
</message>
<message>
<location filename="main_window.ui" line="815"/>
@@ -7319,7 +7318,7 @@ a:hover {
<location filename="main_window.ui" line="1450"/>
<source>Ctrl+Alt+M</source>
<oldsource>Meta+Alt+M</oldsource>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Alt+M</translation>
</message>
<message>
<location filename="main_window.ui" line="1455"/>
@@ -7335,7 +7334,7 @@ a:hover {
<location filename="main_window.ui" line="1461"/>
<source>Ctrl+Shift+N</source>
<oldsource>Meta+Shift+N</oldsource>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Maj+N</translation>
</message>
<message>
<location filename="main_window.ui" line="1466"/>
@@ -7351,7 +7350,7 @@ a:hover {
<location filename="main_window.ui" line="1472"/>
<source>Ctrl+Shift+B</source>
<oldsource>Meta+Shift+B</oldsource>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Maj+B</translation>
</message>
<message>
<location filename="main_window.ui" line="1477"/>
@@ -7506,7 +7505,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="1621"/>
<source>&amp;Protocol Hierarchy</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Hiérarchie des Protocoles</translation>
</message>
<message>
<location filename="main_window.ui" line="1624"/>
@@ -7737,7 +7736,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="1833"/>
<source>Sametime</source>
- <translation type="unfinished"></translation>
+ <translation>Sametime</translation>
</message>
<message>
<location filename="main_window.ui" line="1836"/>
@@ -7802,18 +7801,18 @@ a:hover {
<message>
<location filename="main_window.ui" line="1897"/>
<source>Advertisements by Topic</source>
- <translation type="unfinished"></translation>
+ <translation>Annonces par Sujet</translation>
</message>
<message>
<location filename="main_window.ui" line="1902"/>
<location filename="main_window.ui" line="1937"/>
<source>Advertisements by Source</source>
- <translation type="unfinished"></translation>
+ <translation>Annonces par Source</translation>
</message>
<message>
<location filename="main_window.ui" line="1907"/>
<source>Advertisements by Transport</source>
- <translation type="unfinished"></translation>
+ <translation>Annonces par Transport</translation>
</message>
<message>
<location filename="main_window.ui" line="1912"/>
@@ -8111,7 +8110,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="1214"/>
<source>&amp;DICOM…</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;DICOM…</translation>
</message>
<message>
<location filename="main_window.ui" line="1219"/>
@@ -8244,7 +8243,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="1980"/>
<source>Export PDUs to File…</source>
- <translation type="unfinished"></translation>
+ <translation>Exporter PDU vers un Fichier...</translation>
</message>
<message>
<location filename="main_window.ui" line="1985"/>
@@ -8269,7 +8268,7 @@ a:hover {
<message>
<location filename="main_window.ui" line="2013"/>
<source>&amp;Filter Toolbar</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Barre d&apos;outils Filtre</translation>
</message>
<message>
<location filename="main_window.ui" line="2016"/>
@@ -9145,88 +9144,88 @@ Voulez-vous arrêter la capture et enregistrer les paquets capturés</translatio
<translation>Filtre de capture invalide</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1083"/>
+ <location filename="main_window_slots.cpp" line="1053"/>
<source>Clear Menu</source>
<translation>Effacer les fichiers récemment ouverts</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1574"/>
+ <location filename="main_window_slots.cpp" line="1547"/>
<source>Please wait while Wireshark is initializing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1704"/>
<source>Export Selected Packet Bytes</source>
<translation>Exporter Octets de Paquets Sélectionnés</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1706"/>
<source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
<translation>Raw data (*.bin *.dat *.raw);;Tous les fichiers (*.*)</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1790"/>
+ <location filename="main_window_slots.cpp" line="1763"/>
<source>No Keys</source>
<translation>Aucune clés</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1791"/>
+ <location filename="main_window_slots.cpp" line="1764"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Il y a aucune clé de Session SSL à sauvegarder.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1770"/>
<source>Export SSL Session Keys (%1 key%2</source>
<translation>Exporter Clés de session SSL (%1 key%2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1802"/>
+ <location filename="main_window_slots.cpp" line="1775"/>
<source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
<translation>Clé de Session SSL (*.keys *.txt);;Tous les fichiers (*.*)</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1940"/>
+ <location filename="main_window_slots.cpp" line="1913"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>Impossible de copier le texte. Essayer un autre item.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2347"/>
- <location filename="main_window_slots.cpp" line="3382"/>
+ <location filename="main_window_slots.cpp" line="2322"/>
+ <location filename="main_window_slots.cpp" line="3357"/>
<source>Unable to build conversation filter.</source>
<translation>Impossible de construire un filtre de conversation.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2492"/>
+ <location filename="main_window_slots.cpp" line="2467"/>
<source>No filter available. Try another </source>
<translation>Aucun filtre disponible. Essayer un autre</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3389"/>
+ <location filename="main_window_slots.cpp" line="3364"/>
<source>Error compiling filter for this conversation.</source>
<translation>Erreur dans la compilation du filtre pour cette conversation.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3398"/>
+ <location filename="main_window_slots.cpp" line="3373"/>
<source>No previous/next packet in conversation.</source>
<translation>Aucun paquet précédent/suivant dans la conversation</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3475"/>
+ <location filename="main_window_slots.cpp" line="3450"/>
<source>No Interface Selected</source>
<translation>Aucune Interface Sélectionnée</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3482"/>
+ <location filename="main_window_slots.cpp" line="3457"/>
<source> before starting a new capture</source>
<translation>avant de commencer une nouvelle capture</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3687"/>
+ <location filename="main_window_slots.cpp" line="3663"/>
<source>Wiki Page for %1</source>
<translation>Page Wiki pour %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3688"/>
+ <location filename="main_window_slots.cpp" line="3664"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;Le Wiki Wireshark est maintenu par la communauté&lt;/p&gt;
&lt;p&gt;La page que vous vous apprêtez à charger peut être magnifique, incomplète, fausse ou inexistante&lt;/p&gt;
@@ -10972,12 +10971,12 @@ Voulez-vous arrêter la capture et enregistrer les paquets capturés</translatio
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="344"/>
+ <location filename="main_welcome.cpp" line="387"/>
<source>Show in Finder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="346"/>
+ <location filename="main_welcome.cpp" line="389"/>
<source>Show in Folder</source>
<translation type="unfinished"></translation>
</message>
@@ -13874,6 +13873,14 @@ Voulez-vous arrêter la capture et enregistrer les paquets capturés</translatio
</message>
</context>
<context>
+ <name>SyntaxLineEdit</name>
+ <message>
+ <location filename="syntax_line_edit.cpp" line="180"/>
+ <source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
+ <translation type="unfinished">&quot;%1&quot; peut avoir des résultats inattendus (voir le Guide de l&apos;utilisateur)</translation>
+ </message>
+</context>
+<context>
<name>TCPStreamDialog</name>
<message>
<location filename="tcp_stream_dialog.ui" line="14"/>
diff --git a/ui/qt/wireshark_it.qm b/ui/qt/wireshark_it.qm
index 6b31410b76..4a97da1ad8 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 dd2a7dda41..c7d0e4c695 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1021,28 +1021,28 @@
<message>
<location filename="capture_filter_edit.cpp" line="358"/>
<source>Save this filter</source>
- <translation type="unfinished">Salva questo filtro</translation>
+ <translation>Salva questo filtro</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="360"/>
<source>Remove this filter</source>
- <translation type="unfinished">Rimuovi questo filtro</translation>
+ <translation>Rimuovi questo filtro</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="362"/>
<source>Manage Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Gestisci fltri di cattura</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="498"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished">Impossibile salvare le impostazioni del filtro di cattura.</translation>
+ <translation>Impossibile salvare le impostazioni del filtro di cattura.</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="499"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Impossibile salvare il file del filtro di cattura
+ <translation>Impossibile salvare il file del filtro di cattura
&quot;%1&quot;: %2.</translation>
</message>
</context>
@@ -1208,8 +1208,9 @@
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="128"/>
- <source>Capture Filter for selected Interfaces:</source>
- <translation>File di cattura per le interfacce selezionate:</translation>
+ <source>Capture filter for selected interfaces:</source>
+ <oldsource>Capture Filter for selected Interfaces:</oldsource>
+ <translation type="unfinished">File di cattura per le interfacce selezionate:</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -1367,93 +1368,93 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Interrompi la cattura dopo che il numero di file specificato è stato creato.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="118"/>
+ <location filename="capture_interfaces_dialog.cpp" line="121"/>
<source>Capture Interfaces</source>
<translation>Interfacce di cattura</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="124"/>
+ <location filename="capture_interfaces_dialog.cpp" line="127"/>
<source>Start</source>
<translation>Avvia</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>enabled</source>
<translation>abilitato</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>disabled</source>
<translation>disabilitato</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="279"/>
+ <location filename="capture_interfaces_dialog.cpp" line="291"/>
<source>Specify a Capture File</source>
<translation>Specifica un file di cattura</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Addresses</source>
<translation>Indirizzi</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Address</source>
<translation>Indirizzo</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="488"/>
+ <location filename="capture_interfaces_dialog.cpp" line="498"/>
<source>no addresses</source>
<translation>nessun indirizzo</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="549"/>
<source>default</source>
<translation>predefinito</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="529"/>
- <location filename="capture_interfaces_dialog.cpp" line="530"/>
- <location filename="capture_interfaces_dialog.cpp" line="532"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="540"/>
+ <location filename="capture_interfaces_dialog.cpp" line="542"/>
+ <location filename="capture_interfaces_dialog.cpp" line="545"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>n/a</source>
<translation>n/d</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="682"/>
- <location filename="capture_interfaces_dialog.cpp" line="690"/>
- <location filename="capture_interfaces_dialog.cpp" line="701"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
+ <location filename="capture_interfaces_dialog.cpp" line="695"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="714"/>
<location filename="capture_interfaces_dialog.cpp" line="718"/>
- <location filename="capture_interfaces_dialog.cpp" line="726"/>
+ <location filename="capture_interfaces_dialog.cpp" line="731"/>
+ <location filename="capture_interfaces_dialog.cpp" line="739"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="683"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="719"/>
- <location filename="capture_interfaces_dialog.cpp" line="727"/>
+ <location filename="capture_interfaces_dialog.cpp" line="696"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="732"/>
+ <location filename="capture_interfaces_dialog.cpp" line="740"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation>File multipli: la dimensione del file richiesta è troppo grande. La dimensione del file non può essere superiore a 2 GiB.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="702"/>
+ <location filename="capture_interfaces_dialog.cpp" line="715"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation>File multipli: non è stato fornito un nome del file di cattura! Devi specificare un nome del file se vuoi usare file multipli.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="706"/>
+ <location filename="capture_interfaces_dialog.cpp" line="719"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation>File multipli: non è stato fornito alcun limite di file! Devi specificare una dimensione del file o la durata raggiunta la quale si passa al successivo file di cattura se vuoi usare file multipli.</translation>
@@ -1888,44 +1889,43 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>Applica questa stringa di filtro alla visualizzazione.</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="393"/>
+ <location filename="display_filter_edit.cpp" line="387"/>
<source>Save this filter</source>
<translation>Salva questo filtro</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="397"/>
+ <location filename="display_filter_edit.cpp" line="391"/>
<source>Manage Display Filters</source>
<translation>Gestisci filtri di visualizzazione</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="399"/>
+ <location filename="display_filter_edit.cpp" line="393"/>
<source>Manage Filter Expressions</source>
<translation>Gestisci espressioni di filtro</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="578"/>
+ <location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished">Impossibile salvare le impostazioni del filtro di visualizzazione.</translation>
+ <translation>Impossibile salvare le impostazioni del filtro di visualizzazione.</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="579"/>
+ <location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Impossibile salvare il file del filtro di visualizzazione
+ <translation>Impossibile salvare il file del filtro di visualizzazione
&quot;%1&quot;: %2.</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="395"/>
+ <location filename="display_filter_edit.cpp" line="389"/>
<source>Remove this filter</source>
<translation>Rimuovi questo filtro</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="330"/>
<source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
- <translation>&quot;%1&quot; potrebbe avere dei comportamenti inattesi (vedi il Manuale utente)</translation>
+ <translation type="vanished">&quot;%1&quot; potrebbe avere dei comportamenti inattesi (vedi il Manuale utente)</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="337"/>
+ <location filename="display_filter_edit.cpp" line="331"/>
<source>Invalid filter: </source>
<oldsource>Invalid filter</oldsource>
<translation>Filtro non valido: </translation>
@@ -2026,12 +2026,12 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>Espressione del filtro di visualizzazione</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<source>Select a field name to get started</source>
<translation>Seleziona il nome di un campo per iniziare</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>Fai clic su OK per inserire questo filtro</translation>
</message>
@@ -2676,7 +2676,7 @@ per i file di filtro: %2.</translation>
<message>
<location filename="filter_expressions_preferences_frame.ui" line="60"/>
<source>Copy this filter.</source>
- <translation type="unfinished">Copia questo filtro.</translation>
+ <translation>Copia questo filtro.</translation>
</message>
</context>
<context>
@@ -4337,17 +4337,17 @@ per i file di filtro: %2.</translation>
<context>
<name>InterfaceTree</name>
<message>
- <location filename="interface_tree.cpp" line="68"/>
+ <location filename="interface_tree.cpp" line="73"/>
<source>Welcome screen list</source>
<translation>Elenco della pagina di benvenuto</translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="74"/>
+ <location filename="interface_tree.cpp" line="79"/>
<source>Waiting for startup%1</source>
<translation>Avvio in corso%1</translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="228"/>
+ <location filename="interface_tree.cpp" line="246"/>
<source>Interface information not available</source>
<translation>Informazioni sulle interfacce non disponibili</translation>
</message>
@@ -4355,16 +4355,16 @@ per i file di filtro: %2.</translation>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="975"/>
- <location filename="capture_interfaces_dialog.cpp" line="1007"/>
- <location filename="capture_interfaces_dialog.cpp" line="1055"/>
- <location filename="capture_interfaces_dialog.cpp" line="1075"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1006"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1087"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1107"/>
<source>enabled</source>
<translation>abilitato</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="976"/>
- <location filename="capture_interfaces_dialog.cpp" line="1008"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1007"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1039"/>
<source>disabled</source>
<translation>disabilitato</translation>
</message>
@@ -6451,32 +6451,32 @@ a:hover {
&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="209"/>
+ <location filename="main_welcome.cpp" line="221"/>
<source>You are running Wireshark </source>
<translation>Stai eseguendo Wireshark </translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="211"/>
+ <location filename="main_welcome.cpp" line="223"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="214"/>
+ <location filename="main_welcome.cpp" line="226"/>
<source> You receive automatic updates.</source>
<translation> Ricevi aggiornamenti automatici.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="216"/>
+ <location filename="main_welcome.cpp" line="228"/>
<source> You have disabled automatic updates.</source>
<translation>Hai disabilitato gli aggiornamenti automatici.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="288"/>
+ <location filename="main_welcome.cpp" line="331"/>
<source>not found</source>
<translation>non trovato</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="361"/>
+ <location filename="main_welcome.cpp" line="404"/>
<source>Copy file path</source>
<translation>Copia percorso del file</translation>
</message>
@@ -9182,88 +9182,88 @@ a:hover {
<translation>Filtro di cattura invalido</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1083"/>
+ <location filename="main_window_slots.cpp" line="1053"/>
<source>Clear Menu</source>
<translation>Pulisci menu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1574"/>
+ <location filename="main_window_slots.cpp" line="1547"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Attendi l&apos;inizializzazione di Wireshark</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1704"/>
<source>Export Selected Packet Bytes</source>
<translation>Esporta i byte del pacchetto selezionato</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1706"/>
<source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
<translation>Dati grezzi (*.bin *.dat *.raw);;Tutti i file (*.*)</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1790"/>
+ <location filename="main_window_slots.cpp" line="1763"/>
<source>No Keys</source>
<translation>Nessuna chiave</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1791"/>
+ <location filename="main_window_slots.cpp" line="1764"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Non ci sono chiavi di sessione SSL da salvare.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1770"/>
<source>Export SSL Session Keys (%1 key%2</source>
<translation>Esporta le chiavi di sessione SSL (%1 chiave%2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1802"/>
+ <location filename="main_window_slots.cpp" line="1775"/>
<source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
<translation>Chiavi di sessione SSL (*.keys *.txt);;Any File (*.*)</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1940"/>
+ <location filename="main_window_slots.cpp" line="1913"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>Non riesco a copiare il testo. Prova un&apos;altra voce.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2347"/>
- <location filename="main_window_slots.cpp" line="3382"/>
+ <location filename="main_window_slots.cpp" line="2322"/>
+ <location filename="main_window_slots.cpp" line="3357"/>
<source>Unable to build conversation filter.</source>
<translation>Impossibile creare il filtro di conversazione.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2492"/>
+ <location filename="main_window_slots.cpp" line="2467"/>
<source>No filter available. Try another </source>
<translation>Nessun filtro disponibile. Provane un altro </translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3389"/>
+ <location filename="main_window_slots.cpp" line="3364"/>
<source>Error compiling filter for this conversation.</source>
<translation>Errore durante la compilazione del filtro per questa conversazione.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3398"/>
+ <location filename="main_window_slots.cpp" line="3373"/>
<source>No previous/next packet in conversation.</source>
<translation>Nessun pacchetto precedente/successivo in conversazione.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3475"/>
+ <location filename="main_window_slots.cpp" line="3450"/>
<source>No Interface Selected</source>
<translation>Nessuna interfaccia selezionata</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3482"/>
+ <location filename="main_window_slots.cpp" line="3457"/>
<source> before starting a new capture</source>
<translation>prima di iniziare una nuova cattura</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3687"/>
+ <location filename="main_window_slots.cpp" line="3663"/>
<source>Wiki Page for %1</source>
<translation>Pagina wiki per %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3688"/>
+ <location filename="main_window_slots.cpp" line="3664"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;Il Wiki di Wireshark è gestito dalla comunità.&lt;/p&gt;&lt;p&gt;La pagina che stai per caricare potrebbe essere perfetta, incompleta, errata o inesistente.&lt;/p&gt;&lt;p&gt;Vuoi proseguire?&lt;/p&gt;</translation>
</message>
@@ -11007,12 +11007,12 @@ a:hover {
<translation>Priorità</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="344"/>
+ <location filename="main_welcome.cpp" line="387"/>
<source>Show in Finder</source>
<translation>Mostra in Finder</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="346"/>
+ <location filename="main_welcome.cpp" line="389"/>
<source>Show in Folder</source>
<translation>Mostra nella cartella</translation>
</message>
@@ -13913,6 +13913,14 @@ a:hover {
</message>
</context>
<context>
+ <name>SyntaxLineEdit</name>
+ <message>
+ <location filename="syntax_line_edit.cpp" line="180"/>
+ <source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
+ <translation type="unfinished">&quot;%1&quot; potrebbe avere dei comportamenti inattesi (vedi il Manuale utente)</translation>
+ </message>
+</context>
+<context>
<name>TCPStreamDialog</name>
<message>
<location filename="tcp_stream_dialog.ui" line="14"/>
diff --git a/ui/qt/wireshark_ja_JP.qm b/ui/qt/wireshark_ja_JP.qm
index 15e1c789f3..4051d7568f 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 b9bfb95087..61f70bba7b 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1205,8 +1205,9 @@
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="128"/>
- <source>Capture Filter for selected Interfaces:</source>
- <translation>選択したインタフェースのキャプチャフィルタ</translation>
+ <source>Capture filter for selected interfaces:</source>
+ <oldsource>Capture Filter for selected Interfaces:</oldsource>
+ <translation type="unfinished">選択したインタフェースのキャプチャフィルタ</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -1364,93 +1365,93 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;指定した数のファイルを作成した後キャプチャを停止します&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="118"/>
+ <location filename="capture_interfaces_dialog.cpp" line="121"/>
<source>Capture Interfaces</source>
<translation>キャプチャインタフェース</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="124"/>
+ <location filename="capture_interfaces_dialog.cpp" line="127"/>
<source>Start</source>
<translation>開始</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>enabled</source>
<translation>有効</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>disabled</source>
<translation>無効</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="279"/>
+ <location filename="capture_interfaces_dialog.cpp" line="291"/>
<source>Specify a Capture File</source>
<translation>キャプチャファイルを指定してください</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Addresses</source>
<translation>アドレス</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Address</source>
<translation>アドレス</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="488"/>
+ <location filename="capture_interfaces_dialog.cpp" line="498"/>
<source>no addresses</source>
<translation>アドレスがありません</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="549"/>
<source>default</source>
<translation>デフォルト</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="529"/>
- <location filename="capture_interfaces_dialog.cpp" line="530"/>
- <location filename="capture_interfaces_dialog.cpp" line="532"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="540"/>
+ <location filename="capture_interfaces_dialog.cpp" line="542"/>
+ <location filename="capture_interfaces_dialog.cpp" line="545"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>n/a</source>
<translation>割当なし</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="682"/>
- <location filename="capture_interfaces_dialog.cpp" line="690"/>
- <location filename="capture_interfaces_dialog.cpp" line="701"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
+ <location filename="capture_interfaces_dialog.cpp" line="695"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="714"/>
<location filename="capture_interfaces_dialog.cpp" line="718"/>
- <location filename="capture_interfaces_dialog.cpp" line="726"/>
+ <location filename="capture_interfaces_dialog.cpp" line="731"/>
+ <location filename="capture_interfaces_dialog.cpp" line="739"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="683"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="719"/>
- <location filename="capture_interfaces_dialog.cpp" line="727"/>
+ <location filename="capture_interfaces_dialog.cpp" line="696"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="732"/>
+ <location filename="capture_interfaces_dialog.cpp" line="740"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation>複数ファイル:要求したファイルサイズが大きすぎます! ファイルサイズは2GB より大きくできません</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="702"/>
+ <location filename="capture_interfaces_dialog.cpp" line="715"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation>キャプチャファイル名が指定されていません! 複数ファイルを利用したい場合にはファイル名を指定しなくてはいけません</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="706"/>
+ <location filename="capture_interfaces_dialog.cpp" line="719"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation>複数ファイル:ファイルの限界が指定されていません 次のキャプチャファイルへ切り替えるためのファイルサイズか間隔を指定する必要があります。</translation>
@@ -1885,43 +1886,42 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>このフィルタ文字列を表示に適用</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="393"/>
+ <location filename="display_filter_edit.cpp" line="387"/>
<source>Save this filter</source>
<translation>このフィルタを保存</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="397"/>
+ <location filename="display_filter_edit.cpp" line="391"/>
<source>Manage Display Filters</source>
<translation>表示フィルタの管理</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="399"/>
+ <location filename="display_filter_edit.cpp" line="393"/>
<source>Manage Filter Expressions</source>
<translation>フィルタ表示式の管理</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="578"/>
+ <location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
<translation type="unfinished">表示フィルタ設定を保存できません</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="579"/>
+ <location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
<translation type="unfinished">表示フィルタファイルへ保存できません。&quot;%1&quot;: %2</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="395"/>
+ <location filename="display_filter_edit.cpp" line="389"/>
<source>Remove this filter</source>
<translation>このフィルタを削除</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="330"/>
<source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
- <translation>&quot;%1&quot; は期待しない結果になったかもしれません。(ユーザーズガイドを参照ください)</translation>
+ <translation type="vanished">&quot;%1&quot; は期待しない結果になったかもしれません。(ユーザーズガイドを参照ください)</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="337"/>
+ <location filename="display_filter_edit.cpp" line="331"/>
<source>Invalid filter: </source>
<oldsource>Invalid filter</oldsource>
<translation>無効なフィルタ:</translation>
@@ -2022,12 +2022,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>表示フィルタ式</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<source>Select a field name to get started</source>
<translation>開始するフィールド名を選択</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>OKをクリックしてこのフィルタを挿入</translation>
</message>
@@ -4311,17 +4311,17 @@ for filter files: %2.</source>
<context>
<name>InterfaceTree</name>
<message>
- <location filename="interface_tree.cpp" line="68"/>
+ <location filename="interface_tree.cpp" line="73"/>
<source>Welcome screen list</source>
<translation>ウェルカムスクリーンリスト</translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="74"/>
+ <location filename="interface_tree.cpp" line="79"/>
<source>Waiting for startup%1</source>
<translation>開始までお待ちください%1</translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="228"/>
+ <location filename="interface_tree.cpp" line="246"/>
<source>Interface information not available</source>
<translation>インタフェース情報が利用できません</translation>
</message>
@@ -4329,16 +4329,16 @@ for filter files: %2.</source>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="975"/>
- <location filename="capture_interfaces_dialog.cpp" line="1007"/>
- <location filename="capture_interfaces_dialog.cpp" line="1055"/>
- <location filename="capture_interfaces_dialog.cpp" line="1075"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1006"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1087"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1107"/>
<source>enabled</source>
<translation>有効</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="976"/>
- <location filename="capture_interfaces_dialog.cpp" line="1008"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1007"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1039"/>
<source>disabled</source>
<translation>無効</translation>
</message>
@@ -6397,32 +6397,32 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="209"/>
+ <location filename="main_welcome.cpp" line="221"/>
<source>You are running Wireshark </source>
<translation>Wiresharkを起動中です</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="211"/>
+ <location filename="main_welcome.cpp" line="223"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="214"/>
+ <location filename="main_welcome.cpp" line="226"/>
<source> You receive automatic updates.</source>
<translation>自動アップデートを受信します</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="216"/>
+ <location filename="main_welcome.cpp" line="228"/>
<source> You have disabled automatic updates.</source>
<translation>自動アップデートを無効にしました。</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="288"/>
+ <location filename="main_welcome.cpp" line="331"/>
<source>not found</source>
<translation>見つかりません</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="361"/>
+ <location filename="main_welcome.cpp" line="404"/>
<source>Copy file path</source>
<translation>ファイルパスをコピー</translation>
</message>
@@ -9128,88 +9128,88 @@ a:hover {
<translation>無効なキャプチャフィルタ</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1083"/>
+ <location filename="main_window_slots.cpp" line="1053"/>
<source>Clear Menu</source>
<translation>メニューをクリア</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1574"/>
+ <location filename="main_window_slots.cpp" line="1547"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Wiresharkが初期化する間お待ちください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1704"/>
<source>Export Selected Packet Bytes</source>
<translation>選択したパケットデータ部をエキスポート</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1706"/>
<source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
<translation>Raw形式 (*.bin *.dat *.raw);;すべてのファイル (*.*</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1790"/>
+ <location filename="main_window_slots.cpp" line="1763"/>
<source>No Keys</source>
<translation>キーはありません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1791"/>
+ <location filename="main_window_slots.cpp" line="1764"/>
<source>There are no SSL Session Keys to save.</source>
<translation>保存する SSLセッション鍵はありません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1770"/>
<source>Export SSL Session Keys (%1 key%2</source>
<translation>SSLセッション鍵をエキスポート (%1 鍵%2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1802"/>
+ <location filename="main_window_slots.cpp" line="1775"/>
<source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
<translation>SSLセッション鍵 (*.keys *.txt);;すべてのファイル (*.*)</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1940"/>
+ <location filename="main_window_slots.cpp" line="1913"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>テキストコピーできません 別に試してください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2347"/>
- <location filename="main_window_slots.cpp" line="3382"/>
+ <location filename="main_window_slots.cpp" line="2322"/>
+ <location filename="main_window_slots.cpp" line="3357"/>
<source>Unable to build conversation filter.</source>
<translation>会話フィルタを作成できません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2492"/>
+ <location filename="main_window_slots.cpp" line="2467"/>
<source>No filter available. Try another </source>
<translation>フィルタが利用できません 別に試してください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3389"/>
+ <location filename="main_window_slots.cpp" line="3364"/>
<source>Error compiling filter for this conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3398"/>
+ <location filename="main_window_slots.cpp" line="3373"/>
<source>No previous/next packet in conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3475"/>
+ <location filename="main_window_slots.cpp" line="3450"/>
<source>No Interface Selected</source>
<translation>インターフェースが選択されていません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3482"/>
+ <location filename="main_window_slots.cpp" line="3457"/>
<source> before starting a new capture</source>
<translation>新規キャプチャを開始する前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3687"/>
+ <location filename="main_window_slots.cpp" line="3663"/>
<source>Wiki Page for %1</source>
<translation>%1 の Wikiページ</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3688"/>
+ <location filename="main_window_slots.cpp" line="3664"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;ワイヤーシャークWikiはコミュニティによって運営されています。&lt;/p&gt;&lt;p&gt;いま見ているページはすばらしかったり、不完全だったり、間違っていたり、存在しないかもしれません。&lt;/p&gt;&lt;p&gt;Wikiに移動しますか？&lt;/p&gt;</translation>
</message>
@@ -10953,12 +10953,12 @@ a:hover {
<translation>優先度</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="344"/>
+ <location filename="main_welcome.cpp" line="387"/>
<source>Show in Finder</source>
<translation>ファインダーで表示</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="346"/>
+ <location filename="main_welcome.cpp" line="389"/>
<source>Show in Folder</source>
<translation>フォルダで表示</translation>
</message>
@@ -13857,6 +13857,14 @@ a:hover {
</message>
</context>
<context>
+ <name>SyntaxLineEdit</name>
+ <message>
+ <location filename="syntax_line_edit.cpp" line="180"/>
+ <source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
+ <translation type="unfinished">&quot;%1&quot; は期待しない結果になったかもしれません。(ユーザーズガイドを参照ください)</translation>
+ </message>
+</context>
+<context>
<name>TCPStreamDialog</name>
<message>
<location filename="tcp_stream_dialog.ui" line="14"/>
diff --git a/ui/qt/wireshark_pl.qm b/ui/qt/wireshark_pl.qm
index f1afe23bc5..6a58ab6b3d 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 dfa9141c02..6b8c96b5dc 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1019,28 +1019,28 @@
<message>
<location filename="capture_filter_edit.cpp" line="358"/>
<source>Save this filter</source>
- <translation type="unfinished">Zapisz filtr</translation>
+ <translation>Zapisz filtr</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="360"/>
<source>Remove this filter</source>
- <translation type="unfinished">Usuń filtr</translation>
+ <translation>Usuń filtr</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="362"/>
<source>Manage Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>Zarządzaj filtrami przechwytywania</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="498"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished">Nie można zapisać ustawień filtru przechwytywania.</translation>
+ <translation>Nie można zapisać ustawień filtru przechwytywania.</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="499"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Nie można zapisać do pliku filtrów przechwytywania
+ <translation>Nie można zapisać do pliku filtrów przechwytywania
&quot;%1&quot;:%2.</translation>
</message>
</context>
@@ -1206,8 +1206,9 @@
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="128"/>
- <source>Capture Filter for selected Interfaces:</source>
- <translation>Filtr przechwytywania dla wybranych interfejsów:</translation>
+ <source>Capture filter for selected interfaces:</source>
+ <oldsource>Capture Filter for selected Interfaces:</oldsource>
+ <translation type="unfinished">Filtr przechwytywania dla wybranych interfejsów:</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -1365,93 +1366,93 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zatrzymaj przechwytywanie po stworzeniu określonej liczby plików.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="118"/>
+ <location filename="capture_interfaces_dialog.cpp" line="121"/>
<source>Capture Interfaces</source>
<translation>Interfejsy przechwytywania</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="124"/>
+ <location filename="capture_interfaces_dialog.cpp" line="127"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>enabled</source>
<translation>włączony</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>disabled</source>
<translation>wyłączony</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="279"/>
+ <location filename="capture_interfaces_dialog.cpp" line="291"/>
<source>Specify a Capture File</source>
<translation>Wybierz plik przechwytywania</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Addresses</source>
<translation>Adresy</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Address</source>
<translation>Adres</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="488"/>
+ <location filename="capture_interfaces_dialog.cpp" line="498"/>
<source>no addresses</source>
<translation>brak adresu</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="549"/>
<source>default</source>
<translation>domyślny</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="529"/>
- <location filename="capture_interfaces_dialog.cpp" line="530"/>
- <location filename="capture_interfaces_dialog.cpp" line="532"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="540"/>
+ <location filename="capture_interfaces_dialog.cpp" line="542"/>
+ <location filename="capture_interfaces_dialog.cpp" line="545"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>n/a</source>
<translation>n/a</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="682"/>
- <location filename="capture_interfaces_dialog.cpp" line="690"/>
- <location filename="capture_interfaces_dialog.cpp" line="701"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
+ <location filename="capture_interfaces_dialog.cpp" line="695"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="714"/>
<location filename="capture_interfaces_dialog.cpp" line="718"/>
- <location filename="capture_interfaces_dialog.cpp" line="726"/>
+ <location filename="capture_interfaces_dialog.cpp" line="731"/>
+ <location filename="capture_interfaces_dialog.cpp" line="739"/>
<source>Error</source>
<translation>Błąd</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="683"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="719"/>
- <location filename="capture_interfaces_dialog.cpp" line="727"/>
+ <location filename="capture_interfaces_dialog.cpp" line="696"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="732"/>
+ <location filename="capture_interfaces_dialog.cpp" line="740"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation>Wiele plików: Żądane wielkość pliku jest zbyt duża! Wielkość pliku nie może być większa niż 2 GiB.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="702"/>
+ <location filename="capture_interfaces_dialog.cpp" line="715"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation>Wiele plików: Nie wprowadzono nazwy pliku! Musisz wprowadzić nazwę pliku jeśli zamierzasz używać wielu plików.</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="706"/>
+ <location filename="capture_interfaces_dialog.cpp" line="719"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation>Wiele plików: Nie ustalono limitu! Musisz ustalić limit wielkości pliku lub czas przechwytywania
@@ -1887,44 +1888,43 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<translation>Zastosuj filtr.</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="393"/>
+ <location filename="display_filter_edit.cpp" line="387"/>
<source>Save this filter</source>
<translation>Zapisz filtr</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="397"/>
+ <location filename="display_filter_edit.cpp" line="391"/>
<source>Manage Display Filters</source>
<translation>Zarządzaj filtrami wyświetlania</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="399"/>
+ <location filename="display_filter_edit.cpp" line="393"/>
<source>Manage Filter Expressions</source>
<translation>Zarządzaj wyrażeniami filtrów</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="578"/>
+ <location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished">Nie można zapisać ustawień filtru wyświetlania.</translation>
+ <translation>Nie można zapisać ustawień filtru wyświetlania.</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="579"/>
+ <location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">Nie można zapisać do pliku filtrów wyświetlania
+ <translation>Nie można zapisać do pliku filtrów wyświetlania
&quot;%1&quot;:%2.</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="395"/>
+ <location filename="display_filter_edit.cpp" line="389"/>
<source>Remove this filter</source>
<translation>Usuń filtr</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="330"/>
<source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
- <translation>&quot;%1&quot; może mieć nieoczekiwany rezultat (zobacz Podręcznik Użytkownika)</translation>
+ <translation type="vanished">&quot;%1&quot; może mieć nieoczekiwany rezultat (zobacz Podręcznik Użytkownika)</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="337"/>
+ <location filename="display_filter_edit.cpp" line="331"/>
<source>Invalid filter: </source>
<oldsource>Invalid filter</oldsource>
<translation>Błądny filtr: </translation>
@@ -2025,12 +2025,12 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
<translation>Wyrażenie filtru wyświetlania</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<source>Select a field name to get started</source>
<translation>Wybierz nazwę pola by rozpocząć</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>Kliknij OK by dodać filtr</translation>
</message>
@@ -2675,7 +2675,7 @@ dla plików filtrów: %2.</translation>
<message>
<location filename="filter_expressions_preferences_frame.ui" line="60"/>
<source>Copy this filter.</source>
- <translation type="unfinished">Kopuj filtr.</translation>
+ <translation>Kopiuj filtr.</translation>
</message>
</context>
<context>
@@ -4335,17 +4335,17 @@ dla plików filtrów: %2.</translation>
<context>
<name>InterfaceTree</name>
<message>
- <location filename="interface_tree.cpp" line="68"/>
+ <location filename="interface_tree.cpp" line="73"/>
<source>Welcome screen list</source>
<translation>Ekran startowy</translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="74"/>
+ <location filename="interface_tree.cpp" line="79"/>
<source>Waiting for startup%1</source>
<translation>Wczytywanie%1</translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="228"/>
+ <location filename="interface_tree.cpp" line="246"/>
<source>Interface information not available</source>
<translation>Interfejsy niedostępne</translation>
</message>
@@ -4353,16 +4353,16 @@ dla plików filtrów: %2.</translation>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="975"/>
- <location filename="capture_interfaces_dialog.cpp" line="1007"/>
- <location filename="capture_interfaces_dialog.cpp" line="1055"/>
- <location filename="capture_interfaces_dialog.cpp" line="1075"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1006"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1087"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1107"/>
<source>enabled</source>
<translation>włączony</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="976"/>
- <location filename="capture_interfaces_dialog.cpp" line="1008"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1007"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1039"/>
<source>disabled</source>
<translation>wyłączony</translation>
</message>
@@ -6451,32 +6451,32 @@ text-decoration: underline;
&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="209"/>
+ <location filename="main_welcome.cpp" line="221"/>
<source>You are running Wireshark </source>
<translation>Wireshark uruchomiony </translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="211"/>
+ <location filename="main_welcome.cpp" line="223"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="214"/>
+ <location filename="main_welcome.cpp" line="226"/>
<source> You receive automatic updates.</source>
<translation> Automatyczne aktualizacje są włączone.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="216"/>
+ <location filename="main_welcome.cpp" line="228"/>
<source> You have disabled automatic updates.</source>
<translation>Automatyczne aktualizacje są wyłączone.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="288"/>
+ <location filename="main_welcome.cpp" line="331"/>
<source>not found</source>
<translation>nie znaleziono</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="361"/>
+ <location filename="main_welcome.cpp" line="404"/>
<source>Copy file path</source>
<translation>Kopiuj ścieżkę</translation>
</message>
@@ -9182,88 +9182,88 @@ text-decoration: underline;
<translation>Niepoprawny filtr przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1083"/>
+ <location filename="main_window_slots.cpp" line="1053"/>
<source>Clear Menu</source>
<translation>Wyczyść Menu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1574"/>
+ <location filename="main_window_slots.cpp" line="1547"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Proszę czekać, trwa uruchamianie Wiresharka</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1704"/>
<source>Export Selected Packet Bytes</source>
<translation>Eksportuj zaznaczony bajty pakietu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1706"/>
<source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
<translation>Surowe dane (*.bin *.dat *.raw);;Dowolny plik (*.*)</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1790"/>
+ <location filename="main_window_slots.cpp" line="1763"/>
<source>No Keys</source>
<translation>Brak kluczy</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1791"/>
+ <location filename="main_window_slots.cpp" line="1764"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Nie ma żadnych kluczy sesji SSL do zapisu.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1770"/>
<source>Export SSL Session Keys (%1 key%2</source>
<translation>Eksportuj klucze sesji SSL (%1 klucz%2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1802"/>
+ <location filename="main_window_slots.cpp" line="1775"/>
<source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
<translation>Klucze sesji SSL (*.keys *.txt);; Dowolny plik (*.*)</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1940"/>
+ <location filename="main_window_slots.cpp" line="1913"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>Nie można skopiować tekstu. Spróbuj inną pozycję.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2347"/>
- <location filename="main_window_slots.cpp" line="3382"/>
+ <location filename="main_window_slots.cpp" line="2322"/>
+ <location filename="main_window_slots.cpp" line="3357"/>
<source>Unable to build conversation filter.</source>
<translation>Nie można stworzyć filtru konwersacji.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2492"/>
+ <location filename="main_window_slots.cpp" line="2467"/>
<source>No filter available. Try another </source>
<translation>Brak dostępnych filtrów. Spróbuj ponownie</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3389"/>
+ <location filename="main_window_slots.cpp" line="3364"/>
<source>Error compiling filter for this conversation.</source>
<translation>Błąd kompilacji filtru dla tej konwersacji.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3398"/>
+ <location filename="main_window_slots.cpp" line="3373"/>
<source>No previous/next packet in conversation.</source>
<translation>Brak poprzedniego i następnego pakietu w konwersacji.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3475"/>
+ <location filename="main_window_slots.cpp" line="3450"/>
<source>No Interface Selected</source>
<translation>Nie wybrano interfejsu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3482"/>
+ <location filename="main_window_slots.cpp" line="3457"/>
<source> before starting a new capture</source>
<translation>przed wystartowaniem nowego przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3687"/>
+ <location filename="main_window_slots.cpp" line="3663"/>
<source>Wiki Page for %1</source>
<translation>Strona Wiki dla %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3688"/>
+ <location filename="main_window_slots.cpp" line="3664"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;Strona Wiki Wiresharka jest zarządzania przez społeczność.&lt;/p&gt;&lt;p&gt;Strona którą chcesz wczytać może być wspaniała, niekompletna, błędna lub nie istnieć.&lt;/p&gt;&lt;p&gt;Kontynuować wczytywanie strony Wiki?&lt;/p&gt;</translation>
</message>
@@ -11006,12 +11006,12 @@ text-decoration: underline;
<translation>Priorytet</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="344"/>
+ <location filename="main_welcome.cpp" line="387"/>
<source>Show in Finder</source>
<translation>Otwórz w wyszukiwajce</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="346"/>
+ <location filename="main_welcome.cpp" line="389"/>
<source>Show in Folder</source>
<translation>Otwórz w folderze</translation>
</message>
@@ -13914,6 +13914,14 @@ text-decoration: underline;
</message>
</context>
<context>
+ <name>SyntaxLineEdit</name>
+ <message>
+ <location filename="syntax_line_edit.cpp" line="180"/>
+ <source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
+ <translation type="unfinished">&quot;%1&quot; może mieć nieoczekiwany rezultat (zobacz Podręcznik Użytkownika)</translation>
+ </message>
+</context>
+<context>
<name>TCPStreamDialog</name>
<message>
<location filename="tcp_stream_dialog.ui" line="14"/>
diff --git a/ui/qt/wireshark_zh_CN.qm b/ui/qt/wireshark_zh_CN.qm
index 884428f808..580fd46942 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 3c68f16aa5..ba66ffa02c 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1019,28 +1019,28 @@
<message>
<location filename="capture_filter_edit.cpp" line="358"/>
<source>Save this filter</source>
- <translation type="unfinished">保存该过滤器</translation>
+ <translation>保存此过滤器</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="360"/>
<source>Remove this filter</source>
- <translation type="unfinished">删除该过滤器</translation>
+ <translation>移除此过滤器</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="362"/>
<source>Manage Capture Filters</source>
- <translation type="unfinished"></translation>
+ <translation>管理捕获筛选器</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="498"/>
<source>Unable to save capture filter settings.</source>
- <translation type="unfinished">无法保存捕获过滤器设置。</translation>
+ <translation>无法保存捕获筛选器设置。</translation>
</message>
<message>
<location filename="capture_filter_edit.cpp" line="499"/>
<source>Could not save to your capture filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">未能保存您的捕获过滤器文件
+ <translation>未能保存您的捕获过滤器文件
“%1”：%2。</translation>
</message>
</context>
@@ -1206,8 +1206,9 @@
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="128"/>
- <source>Capture Filter for selected Interfaces:</source>
- <translation>所选择接口的捕获过滤器:</translation>
+ <source>Capture filter for selected interfaces:</source>
+ <oldsource>Capture Filter for selected Interfaces:</oldsource>
+ <translation type="unfinished">所选择接口的捕获过滤器:</translation>
</message>
<message>
<location filename="capture_interfaces_dialog.ui" line="158"/>
@@ -1366,93 +1367,93 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;创建的文件超过指定数量后停止捕获。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="118"/>
+ <location filename="capture_interfaces_dialog.cpp" line="121"/>
<source>Capture Interfaces</source>
<translation>捕获接口</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="124"/>
+ <location filename="capture_interfaces_dialog.cpp" line="127"/>
<source>Start</source>
<translation>开始</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>enabled</source>
<translation>启用</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="260"/>
- <location filename="capture_interfaces_dialog.cpp" line="540"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="272"/>
+ <location filename="capture_interfaces_dialog.cpp" line="550"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>disabled</source>
<translation>关闭</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="279"/>
+ <location filename="capture_interfaces_dialog.cpp" line="291"/>
<source>Specify a Capture File</source>
<translation>指定捕获文件</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Addresses</source>
<translation>地址</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="478"/>
+ <location filename="capture_interfaces_dialog.cpp" line="488"/>
<source>Address</source>
<translation>地址</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="488"/>
+ <location filename="capture_interfaces_dialog.cpp" line="498"/>
<source>no addresses</source>
<translation>无地址</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="549"/>
<source>default</source>
<translation>默认</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="529"/>
- <location filename="capture_interfaces_dialog.cpp" line="530"/>
- <location filename="capture_interfaces_dialog.cpp" line="532"/>
- <location filename="capture_interfaces_dialog.cpp" line="535"/>
- <location filename="capture_interfaces_dialog.cpp" line="546"/>
+ <location filename="capture_interfaces_dialog.cpp" line="539"/>
+ <location filename="capture_interfaces_dialog.cpp" line="540"/>
+ <location filename="capture_interfaces_dialog.cpp" line="542"/>
+ <location filename="capture_interfaces_dialog.cpp" line="545"/>
+ <location filename="capture_interfaces_dialog.cpp" line="556"/>
<source>n/a</source>
<translation>n/a</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="682"/>
- <location filename="capture_interfaces_dialog.cpp" line="690"/>
- <location filename="capture_interfaces_dialog.cpp" line="701"/>
- <location filename="capture_interfaces_dialog.cpp" line="705"/>
+ <location filename="capture_interfaces_dialog.cpp" line="695"/>
+ <location filename="capture_interfaces_dialog.cpp" line="703"/>
+ <location filename="capture_interfaces_dialog.cpp" line="714"/>
<location filename="capture_interfaces_dialog.cpp" line="718"/>
- <location filename="capture_interfaces_dialog.cpp" line="726"/>
+ <location filename="capture_interfaces_dialog.cpp" line="731"/>
+ <location filename="capture_interfaces_dialog.cpp" line="739"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="683"/>
- <location filename="capture_interfaces_dialog.cpp" line="691"/>
- <location filename="capture_interfaces_dialog.cpp" line="719"/>
- <location filename="capture_interfaces_dialog.cpp" line="727"/>
+ <location filename="capture_interfaces_dialog.cpp" line="696"/>
+ <location filename="capture_interfaces_dialog.cpp" line="704"/>
+ <location filename="capture_interfaces_dialog.cpp" line="732"/>
+ <location filename="capture_interfaces_dialog.cpp" line="740"/>
<source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
<translation>多文件：请求的文件尺寸太大！文件尺寸不能超过2GiB。</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="702"/>
+ <location filename="capture_interfaces_dialog.cpp" line="715"/>
<source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
<translation>多个文件：没有给出捕获文件名！如果您想使用多个文件，必须指定一个文件名。</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="706"/>
+ <location filename="capture_interfaces_dialog.cpp" line="719"/>
<source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
if you want to use multiple files.</source>
<translation>多个文件：未给出文件大小限制！如果您想使用多个文件，必须指定切换到下一个捕获文件的文件大小或者时长。</translation>
@@ -1887,44 +1888,43 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>应用此过滤器字符串进行显示。</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="393"/>
+ <location filename="display_filter_edit.cpp" line="387"/>
<source>Save this filter</source>
<translation>保存该过滤器</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="397"/>
+ <location filename="display_filter_edit.cpp" line="391"/>
<source>Manage Display Filters</source>
<translation>管理显示过滤器</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="399"/>
+ <location filename="display_filter_edit.cpp" line="393"/>
<source>Manage Filter Expressions</source>
<translation>管理过滤器表达式</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="578"/>
+ <location filename="display_filter_edit.cpp" line="572"/>
<source>Unable to save display filter settings.</source>
- <translation type="unfinished">无法保存显示过滤器设置。</translation>
+ <translation>无法保存显示过滤器设置。</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="579"/>
+ <location filename="display_filter_edit.cpp" line="573"/>
<source>Could not save to your display filter file
&quot;%1&quot;: %2.</source>
- <translation type="unfinished">未能保存您的显示过滤器文件
+ <translation>未能保存您的显示过滤器文件
“%1”：%2。</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="395"/>
+ <location filename="display_filter_edit.cpp" line="389"/>
<source>Remove this filter</source>
<translation>删除该过滤器</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="330"/>
<source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
- <translation>&quot;%1&quot;可能遇到意外的结果（参考用户手册）</translation>
+ <translation type="vanished">&quot;%1&quot;可能遇到意外的结果（参考用户手册）</translation>
</message>
<message>
- <location filename="display_filter_edit.cpp" line="337"/>
+ <location filename="display_filter_edit.cpp" line="331"/>
<source>Invalid filter: </source>
<oldsource>Invalid filter</oldsource>
<translation>无效的过滤器:</translation>
@@ -2025,12 +2025,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>显示过滤器表达式</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="187"/>
+ <location filename="display_filter_expression_dialog.cpp" line="188"/>
<source>Select a field name to get started</source>
<translation>选择一个字段名称以开始</translation>
</message>
<message>
- <location filename="display_filter_expression_dialog.cpp" line="191"/>
+ <location filename="display_filter_expression_dialog.cpp" line="192"/>
<source>Click OK to insert this filter</source>
<translation>点击确定插入此过滤器</translation>
</message>
@@ -2675,7 +2675,7 @@ for filter files: %2.</source>
<message>
<location filename="filter_expressions_preferences_frame.ui" line="60"/>
<source>Copy this filter.</source>
- <translation type="unfinished">复制此过滤器。</translation>
+ <translation>复制此过滤器。</translation>
</message>
</context>
<context>
@@ -4330,17 +4330,17 @@ for filter files: %2.</source>
<context>
<name>InterfaceTree</name>
<message>
- <location filename="interface_tree.cpp" line="68"/>
+ <location filename="interface_tree.cpp" line="73"/>
<source>Welcome screen list</source>
<translation>欢迎屏幕列表</translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="74"/>
+ <location filename="interface_tree.cpp" line="79"/>
<source>Waiting for startup%1</source>
<translation>正在等待启动%1</translation>
</message>
<message>
- <location filename="interface_tree.cpp" line="228"/>
+ <location filename="interface_tree.cpp" line="246"/>
<source>Interface information not available</source>
<translation>接口信息不可用</translation>
</message>
@@ -4348,16 +4348,16 @@ for filter files: %2.</source>
<context>
<name>InterfaceTreeDelegate</name>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="975"/>
- <location filename="capture_interfaces_dialog.cpp" line="1007"/>
- <location filename="capture_interfaces_dialog.cpp" line="1055"/>
- <location filename="capture_interfaces_dialog.cpp" line="1075"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1006"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1038"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1087"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1107"/>
<source>enabled</source>
<translation>启用</translation>
</message>
<message>
- <location filename="capture_interfaces_dialog.cpp" line="976"/>
- <location filename="capture_interfaces_dialog.cpp" line="1008"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1007"/>
+ <location filename="capture_interfaces_dialog.cpp" line="1039"/>
<source>disabled</source>
<translation>关闭</translation>
</message>
@@ -6442,32 +6442,32 @@ text-decoration: underline;
&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="209"/>
+ <location filename="main_welcome.cpp" line="221"/>
<source>You are running Wireshark </source>
<translation>正在运行 Wireshark</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="211"/>
+ <location filename="main_welcome.cpp" line="223"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="214"/>
+ <location filename="main_welcome.cpp" line="226"/>
<source> You receive automatic updates.</source>
<translation>接受自动更新。</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="216"/>
+ <location filename="main_welcome.cpp" line="228"/>
<source> You have disabled automatic updates.</source>
<translation>禁止自动更新。</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="288"/>
+ <location filename="main_welcome.cpp" line="331"/>
<source>not found</source>
<translation>未找到</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="361"/>
+ <location filename="main_welcome.cpp" line="404"/>
<source>Copy file path</source>
<translation>复制文件路径</translation>
</message>
@@ -9173,88 +9173,88 @@ text-decoration: underline;
<translation>无效捕获过滤器</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1083"/>
+ <location filename="main_window_slots.cpp" line="1053"/>
<source>Clear Menu</source>
<translation>清除菜单</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1574"/>
+ <location filename="main_window_slots.cpp" line="1547"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Wireshark 正在初始化，请稍候</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1731"/>
+ <location filename="main_window_slots.cpp" line="1704"/>
<source>Export Selected Packet Bytes</source>
<translation>导出选择分组字节流</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1733"/>
+ <location filename="main_window_slots.cpp" line="1706"/>
<source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
<translation>原始数据 (*.bin *.dat *.raw);;任意文件 (*.*)</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1790"/>
+ <location filename="main_window_slots.cpp" line="1763"/>
<source>No Keys</source>
<translation>无密钥</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1791"/>
+ <location filename="main_window_slots.cpp" line="1764"/>
<source>There are no SSL Session Keys to save.</source>
<translation>没有可以保存的 SSL 会话密钥。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1797"/>
+ <location filename="main_window_slots.cpp" line="1770"/>
<source>Export SSL Session Keys (%1 key%2</source>
<translation>导出 SSL 会话密钥 (%1 密钥%2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1802"/>
+ <location filename="main_window_slots.cpp" line="1775"/>
<source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
<translation>SSL 会话密钥 (*.keys *.txt);;任意文件 (*.*)</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1940"/>
+ <location filename="main_window_slots.cpp" line="1913"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>无法复制文本。请尝试其他对象。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2347"/>
- <location filename="main_window_slots.cpp" line="3382"/>
+ <location filename="main_window_slots.cpp" line="2322"/>
+ <location filename="main_window_slots.cpp" line="3357"/>
<source>Unable to build conversation filter.</source>
<translation>无法建立对话过滤器。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2492"/>
+ <location filename="main_window_slots.cpp" line="2467"/>
<source>No filter available. Try another </source>
<translation>无过滤器可用。请尝试其他 </translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3389"/>
+ <location filename="main_window_slots.cpp" line="3364"/>
<source>Error compiling filter for this conversation.</source>
<translation>为此对话编译过滤器时出错。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3398"/>
+ <location filename="main_window_slots.cpp" line="3373"/>
<source>No previous/next packet in conversation.</source>
<translation>此对话中没有上一个/下一个分组。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3475"/>
+ <location filename="main_window_slots.cpp" line="3450"/>
<source>No Interface Selected</source>
<translation>未选中接口</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3482"/>
+ <location filename="main_window_slots.cpp" line="3457"/>
<source> before starting a new capture</source>
<translation>在开始新捕获前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3687"/>
+ <location filename="main_window_slots.cpp" line="3663"/>
<source>Wiki Page for %1</source>
<translation>%1 的 Wiki 页面</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3688"/>
+ <location filename="main_window_slots.cpp" line="3664"/>
<source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
<translation>&lt;p&gt;Wireshark Wiki 由社区进行维护。&lt;/p&gt;&lt;p&gt;您即将加载的页面可能是良好的、不完整的、有错误的，甚至不存在的。&lt;/p&gt;&lt;p&gt;继续访问该 Wiki？&lt;/p&gt;</translation>
</message>
@@ -10997,12 +10997,12 @@ text-decoration: underline;
<translation>优先级</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="344"/>
+ <location filename="main_welcome.cpp" line="387"/>
<source>Show in Finder</source>
<translation>在 Finder 中显示</translation>
</message>
<message>
- <location filename="main_welcome.cpp" line="346"/>
+ <location filename="main_welcome.cpp" line="389"/>
<source>Show in Folder</source>
<translation>在 Finder 中显示</translation>
</message>
@@ -13901,6 +13901,14 @@ text-decoration: underline;
</message>
</context>
<context>
+ <name>SyntaxLineEdit</name>
+ <message>
+ <location filename="syntax_line_edit.cpp" line="180"/>
+ <source>&quot;%1&quot; may have unexpected results (see the User&apos;s Guide)</source>
+ <translation type="unfinished">&quot;%1&quot;可能遇到意外的结果（参考用户手册）</translation>
+ </message>
+</context>
+<context>
<name>TCPStreamDialog</name>
<message>
<location filename="tcp_stream_dialog.ui" line="14"/>
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-25 08:08:18 +0000