summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS5
-rw-r--r--epan/enterprise-numbers142
-rw-r--r--epan/sminmpec.c33
-rw-r--r--manuf52
-rw-r--r--services4
-rw-r--r--ui/qt/wireshark_de.ts149
-rw-r--r--ui/qt/wireshark_en.ts149
-rw-r--r--ui/qt/wireshark_fr.ts149
-rw-r--r--ui/qt/wireshark_it.ts149
-rw-r--r--ui/qt/wireshark_ja_JP.ts149
-rw-r--r--ui/qt/wireshark_pl.ts149
-rw-r--r--ui/qt/wireshark_zh_CN.ts149
12 files changed, 764 insertions, 515 deletions
diff --git a/AUTHORS b/AUTHORS
index 32ea271719..0d8e7d892a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4033,6 +4033,7 @@ David Morsberger <dave[AT]morsberger.com>
David Snowdon <daves[AT]metamako.com>
David Tapuska <dave[AT]tapuska.com>
David Zoller <zollerd[AT]gmail.com>
+Davide Caratti <davide.caratti[AT]gmail.com>
Deep Datta <ddatta[AT]ixiacom.com>
Denis Janssen <janssend[AT]gmail.com>
Devin Heitmueller <dheitmueller[AT]kernellabs.com>
@@ -4072,6 +4073,7 @@ Guillaume Autran <gautran[AT]clearpathrobotics.com>
Guy Davies <aguydavies[AT]gmail.com>
Günther Deschner <gd[AT]samba.org>
Hanspeter Portner <dev[AT]open-music-kontrollers.ch>
+Hauke Mehrtens <hauke.mehrtens[AT]intel.com>
Herwin Weststrate <herwin[AT]quarantainenet.nl>
Hessam Jalali <hessam.jalali[AT]gmail.com>
Hiroaki KAWAI <hiroaki.kawai[AT]gmail.com>
@@ -4146,6 +4148,7 @@ Mark Weel <markweel[AT]hotmail.com>
MarkPhillips <mark.s.phillips[AT]outlook.com>
Marko Hrastovec <marko.hrastovec[AT]gmail.com>
Martin Tibenský <martin.tibensky[AT]alcatel-lucent.com>
+Masashi Honma <masashi.honma[AT]gmail.com>
Matej Košík <5764c029b688c1c0d24a2e97cd764f[AT]gmail.com>
Matt Lawrence <bugzilla.wireshark[AT]erisa.co.uk>
Matthieu Coudron <matthieu.coudron[AT]lip6.fr>
@@ -4179,6 +4182,7 @@ Nils Ohlmeier <github[AT]ohlmeier.org>
Noel Power <noel.power[AT]suse.com>
Olaf Bergmann <bergmann[AT]tzi.org>
Olga Kornievskaia <kolga[AT]netapp.com>
+Olga Kornievskaia <olga.kornievskaia[AT]gmail.com>
Oren Koler <clicker78[AT]gmail.com>
Orgad Shaneh <orgads[AT]gmail.com>
Oscar Gonzalez de Dios <oscar.gonzalezdedios[AT]telefonica.com>
@@ -4303,6 +4307,7 @@ anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
+rosemountSkp <rosemountSkp[AT]code.wireshark.org>
Øyvind Rønningstad <ronningstad[AT]gmail.com>
Дмитрий Цветцих <dmitrycvet[AT]gmail.com>
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 682e6ed9c5..07c892f729 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2016-09-18)
+(last updated 2016-09-24)
SMI Network Management Private Enterprise Codes:
@@ -22535,8 +22535,8 @@ Decimal
Ciano4&aol.com
5641
Anthem Inc.
- Michael Ball
- Michael_Ball&aici.com
+ Matt King
+ matt.king&anthem.com
5642
MicroCast, Inc.
Mark Thibault
@@ -165741,8 +165741,8 @@ Decentralization / Helenic Public Administra
rag&ragged-software.com
41540
Intelligent Software Solutions, Inc.
- Nathan R. Cowger
- nathan.cowger&issinc.com
+ Michael Auer
+ michael.auer&issinc.com
41541
Ardral Co.
Jeremy Willans
@@ -193787,6 +193787,138 @@ Decentralization / Helenic Public Administra
Profound Solutions
Olesov Peter
peter&profound.ru
+48552
+ ShangHai 30wish information security Limited
+ wuchong
+ wuc_sh&30wish.net
+48553
+ Duet Asset Management Ltd
+ Davide Ronchi
+ techadmin&duetgroup.net
+48554
+ Church Pension Group Services Corporation
+ Clayton Crawley
+ PrivateEnterpriseNumber&cpg.org
+48555
+ STORMATRIX, Inc.
+ Mark Mays
+ mark.mays&stormatrix.com
+48556
+ bellaflora Gartencenter GmbH
+ Thomas Hartl
+ it&bellaflora.at
+48557
+ OOO LOYALTY PROGRAM Koshelek
+ Evgeny Ermakov
+ e.v.ermakov&yandex.ru
+48558
+ Trinity Grammar School
+ Mitchell Richters
+ mrichters&trinity.nsw.edu.au
+48559
+ Rosenberger Technology (Kunshan) Co., Ltd
+ Guozhenjie
+ guozhenjie&rosenbergerap.com
+48560
+ Almnäs Bruk AB
+ Simon Bylund
+ sb&almnas.com
+48561
+ Munksjö Paper AB
+ Maria Andersson
+ maria.andersson&munksjo.com
+48562
+ KENDRIS AG
+ Sacha Verwaaijen
+ software&kendris.com
+48563
+ ANEXIA Internetdienstleistungs GmbH
+ Stephan Peijnik
+ speijnik&anexia-it.com
+48564
+ Autoland Deutschland Inh. Wilfried Wilhelm Anclam, e. K.
+ Mario Neubert
+ neubert&autoland.de
+48565
+ NEUBERT-IT Inh. Mario Neubert
+ Mario Neubert
+ mn&neubert-it.de
+48566
+ Guangzhou Shirui Electronics Co., Ltd.
+ ChenWeilin
+ chenweilin&cvte.com
+48567
+ LINET Group SE
+ Petr Kraus
+ petr.kraus&linet.cz
+48568
+ First Orion LLC
+ Joshua Lange
+ jlange&privacystar.com
+48569
+ Midland States Bancorp, Inc
+ Tim Krampe
+ tkrampe&midlandsb.com
+48570
+ sn3rd llc
+ Sean Turner
+ iana-pen&sn3rd.com
+48571
+ Istanbul Teknik Universitesi (ITU)
+ Can Sirin
+ sistemdestek&itu.edu.tr
+48572
+ Vanti
+ Mike Brooman
+ hello&vanti.co.uk
+48573
+ C-Hack
+ Web Master
+ webmaster&c-hack.de
+48574
+ Quanergy Systems, Inc
+ IT Administrator
+ support&quanergy.com
+48575
+ solar energy expert
+ Sandeep Kumar
+ sandeep180782&gmail.com
+48576
+ GTBilt
+ Carlos Alvarez
+ tech&gtbilt.com
+48577
+ Fail-Safe IT Solutions Oy
+ Mikko Kortelainen
+ mikko.kortelainen&fail-safe.net
+48578
+ Shenzhen KSTAR Science and Technology Co., Ltd
+ xiao tian
+ xiaott&kstar.com.cn
+48579
+ BOMAR, spol. s r.o.
+ Christian Dergovics
+ iana-pen&bomar.cz
+48580
+ Continuity Logic LLC
+ Casey Friese
+ casey.friese&continuitylogic.com
+48581
+ Changhong Network Tech.
+ Yongjun Rao
+ yongjun.rao&changhong.com
+48582
+ GSK #11 Gradskiy
+ Konstantin M. Khankin
+ hc&gsk11.ru
+48583
+ HTWNET Information Technology Services
+ Weber, Helge Thorsten
+ info&htwnet.de
+48584
+ CineLab
+ Evgeny Ischenko
+ cert&cinelab.ru
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index f56c56bc6f..3753e65ddb 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -48572,6 +48572,39 @@ const value_string sminmpec_values[] = {
{ 48549, "\0345\0271\0277\0345\0267\0236\0351\0230\0234\0346\0234\0210\0350\0275\0257\0344\0273\0266\0346\0234\0211\0351\0231\0220\0345\0205\0254\0345\0217\0270 (Guangzhou fuyue Software Co. Ltd.)" },
{ 48550, "Beijing Redlink Information Technology Co., Ltd." },
{ 48551, "Profound Solutions" },
+ { 48552, "ShangHai 30wish information security Limited" },
+ { 48553, "Duet Asset Management Ltd" },
+ { 48554, "Church Pension Group Services Corporation" },
+ { 48555, "STORMATRIX, Inc." },
+ { 48556, "bellaflora Gartencenter GmbH" },
+ { 48557, "OOO LOYALTY PROGRAM Koshelek" },
+ { 48558, "Trinity Grammar School" },
+ { 48559, "Rosenberger Technology (Kunshan) Co., Ltd" },
+ { 48560, "Almn\0303\0244s Bruk AB" },
+ { 48561, "Munksj\0303\0266 Paper AB" },
+ { 48562, "KENDRIS AG" },
+ { 48563, "ANEXIA Internetdienstleistungs GmbH" },
+ { 48564, "Autoland Deutschland Inh. Wilfried Wilhelm Anclam, e. K." },
+ { 48565, "NEUBERT-IT Inh. Mario Neubert" },
+ { 48566, "Guangzhou Shirui Electronics Co., Ltd. " },
+ { 48567, "LINET Group SE" },
+ { 48568, "First Orion LLC" },
+ { 48569, "Midland States Bancorp, Inc" },
+ { 48570, "sn3rd llc" },
+ { 48571, "Istanbul Teknik Universitesi (ITU)" },
+ { 48572, "Vanti" },
+ { 48573, "C-Hack" },
+ { 48574, "Quanergy Systems, Inc" },
+ { 48575, "solar energy expert" },
+ { 48576, "GTBilt" },
+ { 48577, "Fail-Safe IT Solutions Oy" },
+ { 48578, "Shenzhen KSTAR Science and Technology Co., Ltd" },
+ { 48579, "BOMAR, spol. s r.o." },
+ { 48580, "Continuity Logic LLC" },
+ { 48581, "Changhong Network Tech." },
+ { 48582, "GSK #11 Gradskiy" },
+ { 48583, "HTWNET Information Technology Services" },
+ { 48584, "CineLab" },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index 2853f94422..f87eefcacb 100644
--- a/manuf
+++ b/manuf
@@ -15805,7 +15805,7 @@
00:90:55 ParkerHa # PARKER HANNIFIN CORPORATION COMPUMOTOR DIVISION
00:90:56 Telestre # TELESTREAM, INC.
00:90:57 Aanetcom # AANetcom, Inc.
-00:90:58 UltraEle # Ultra Electronics Limited (AEP Networks)
+00:90:58 UltraEle # Ultra Electronics Command & Control Systems
00:90:59 TelecomD # TELECOM DEVICE K.K.
00:90:5A Dearborn # DEARBORN GROUP, INC.
00:90:5B RaymondA # RAYMOND AND LAE ENGINEERING
@@ -16971,7 +16971,7 @@
00:E0:69 Jaycor
00:E0:6A Kapsch # KAPSCH AG
00:E0:6B W&GSpeci # W&G SPECIAL PRODUCTS
-00:E0:6C UltraEle # Ultra Electronics Limited (AEP Networks)
+00:E0:6C UltraEle # Ultra Electronics Command & Control Systems
00:E0:6D Compuwar # COMPUWARE CORPORATION
00:E0:6E FarSPA # FAR SYSTEMS S.p.A.
00:E0:6F ArrisGro # ARRIS Group, Inc.
@@ -18513,6 +18513,7 @@
1C:EA:1B Nokia
1C:EE:C9 EloTouch # Elo touch solutions
1C:EE:E8 IlshinEl # Ilshin Elecom
+1C:EF:CE BebroEle # bebro electronic GmbH
1C:F0:3E Wearhaus # Wearhaus Inc.
1C:F0:61 Scaps # SCAPS GmbH
1C:F4:CA Private
@@ -18781,6 +18782,7 @@
24:A4:2C KoukaamA # KOUKAAM a.s.
24:A4:3C Ubiquiti # Ubiquiti Networks Inc.
24:A4:95 ThalesCa # Thales Canada Inc.
+24:A7:DC Bskyb # BSkyB Ltd
24:A8:7D Panasoni # Panasonic Automotive Systems Asia Pacific(Thailand)Co.,Ltd.
24:A9:37 PureStor # PURE Storage
24:AB:81 Apple # Apple, Inc.
@@ -19038,6 +19040,7 @@
2C:08:8C Humax # HUMAX Co., Ltd.
2C:09:4D RaptorEn # Raptor Engineering, LLC
2C:09:CB Cobs # COBS AB
+2C:0B:E9 Cisco # Cisco Systems, Inc
2C:0E:3D SamsungE # SAMSUNG ELECTRO-MECHANICS(THAILAND)
2C:10:C1 Nintendo # Nintendo Co., Ltd.
2C:18:AE TrendEle # Trend Electronics Co., Ltd.
@@ -19116,6 +19119,7 @@
2C:60:0C QuantaCo # QUANTA COMPUTER INC.
2C:62:5A FinestSe # Finest Security Systems Co., Ltd
2C:62:89 Regeners # Regenersis (Glenrothes) Ltd
+2C:63:73 SichuanT # SICHUAN TIANYI COMHEART TELECOMCO., LTD
2C:67:98 Intaltec # InTalTech Ltd.
2C:67:FB Shenzhen # ShenZhen Zhengjili Electronics Co., LTD
2C:69:BA RfContro # RF Controls, LLC
@@ -19189,6 +19193,7 @@
2C:CD:43 SummitTe # Summit Technology Group
2C:CD:69 AqaviCom # Aqavi.com
2C:CF:58 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
+2C:D0:2D Cisco # Cisco Systems, Inc
2C:D0:5A LiteonTe # Liteon Technology Corporation
2C:D1:41 IeeeRegi # IEEE Registration Authority
2C:D1:41:00:00:00/28 Icirroun # iCIRROUND Inc
@@ -19430,6 +19435,7 @@
34:75:C7 Avaya # Avaya Inc
34:76:C5 I-ODataD # I-O DATA DEVICE, INC.
34:78:77 O-NetCom # O-NET Communications(Shenzhen) Limited
+34:78:D7 GioneeCo # Gionee Communication Equipment Co.,Ltd.
34:7A:60 ArrisGro # ARRIS Group, Inc.
34:7E:39 NokiaDan # Nokia Danmark A/S
34:80:B3 XiaomiCo # Xiaomi Communications Co Ltd
@@ -20188,7 +20194,7 @@
40:D8:55:08:60:00/36 DspDesig # DSP DESIGN
40:D8:55:08:70:00/36 BestelCh # Bestel China
40:D8:55:08:80:00/36 JelSyste # JEL SYSTEM CO., LTD.
-40:D8:55:08:90:00/36 WuhanXin # WUHAN XINGTUXINKE ELECTRONIC CO.,LTD
+40:D8:55:08:90:00/36 WuhanXin # Wuhan Xingtuxinke ELectronic Co.,Ltd
40:D8:55:08:A0:00/36 LederEle # Leder Elektronik Design
40:D8:55:08:B0:00/36 Meshwork # MeshWorks Wireless Oy
40:D8:55:08:C0:00/36 Magnesca # Magnescale Co.,Ltd
@@ -20545,16 +20551,21 @@
40:EA:CE FounderB # FOUNDER BROADBAND NETWORK SERVICE CO.,LTD
40:EC:F8 Siemens # Siemens AG
40:ED:98 IeeeRegi # IEEE Registration Authority
+40:ED:98:00:00:00/28 Tsinghua # Tsinghua Tongfang Co., LTD
40:ED:98:10:00:00/28 Guangzho # GuangZhou FiiO Electronics Technology Co.,Ltd
+40:ED:98:20:00:00/28 A-Iox # A-IOX INC.
40:ED:98:30:00:00/28 Knox # Knox Company
40:ED:98:40:00:00/28 Kendrion # Kendrion Kuhnke Automation GmbH
40:ED:98:50:00:00/28 Cape
40:ED:98:60:00:00/28 Shanghai # Shanghai Broadwan Communications Co.,Ltd
40:ED:98:70:00:00/28 VaisalaO # Vaisala Oyj
40:ED:98:80:00:00/28 Guangzho # GUANGZHOU AURIC INTELLIGENT TECHNOLOGY CO.,LTD.
+40:ED:98:90:00:00/28 Teratron # TeraTron GmbH
+40:ED:98:A0:00:00/28 Integrat # Integrated Design Ltd
40:ED:98:B0:00:00/28 SiebertI # Siebert Industrieelektronik GmbH
40:ED:98:C0:00:00/28 Bloomsky # BloomSky,Inc.
40:ED:98:D0:00:00/28 Hangzhou # Hangzhou GANX Technology Co.,Ltd.
+40:ED:98:E0:00:00/28 BordaTec # BORDA TECHNOLOGY
40:EF:4C Fihonest # Fihonest communication co.,Ltd
40:F0:2F LiteonTe # Liteon Technology Corporation
40:F1:4C IseEurop # ISE Europe SPRL
@@ -21014,6 +21025,7 @@
4C:E6:76 Buffalo # BUFFALO.INC
4C:E9:33 Railcomm # RailComm, LLC
4C:EB:42 IntelCor # Intel Corporate
+4C:EC:EF Soraa # Soraa, Inc.
4C:ED:DE AskeyCom # ASKEY COMPUTER CORP
4C:EE:B0 ShcNetzw # SHC Netzwerktechnik GmbH
4C:F0:2E VifaDenm # Vifa Denmark A/S
@@ -21648,6 +21660,7 @@
5C:C9:D3 Palladiu # PALLADIUM ENERGY ELETRONICA DA AMAZONIA LTDA
5C:CA:1A Microsof # Microsoft Mobile Oy
5C:CA:32 Theben # Theben AG
+5C:CC:A0 Gridwiz # Gridwiz Inc.
5C:CC:FF Techrout # Techroutes Network Pvt Ltd
5C:CE:AD Cdyne # CDYNE Corporation
5C:CF:7F Espressi # Espressif Inc.
@@ -22008,6 +22021,7 @@
64:DB:18 Openpatt # OpenPattern
64:DB:43 Motorola # Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
64:DB:81 Syszone # Syszone Co., Ltd.
+64:DB:A0 SelectCo # Select Comfort
64:DC:01 StaticGr # Static Systems Group PLC
64:DE:1C Kingneti # Kingnetic Pte Ltd
64:E1:61 Dep # DEP Corp.
@@ -22365,6 +22379,7 @@
70:2A:7D Epspot # EpSpot AB
70:2B:1D E-DomusI # E-Domus International Limited
70:2C:1F Wisol
+70:2D:84 I4cInnov # i4C Innovations
70:2D:D1 NewingsC # Newings Communication CO., LTD.
70:2E:22 Zte # zte corporation
70:2F:4B Polyvisi # PolyVision Inc.
@@ -22502,9 +22517,11 @@
70:B3:D5:03:30:00/36 SailmonB # Sailmon BV
70:B3:D5:03:B0:00/36 Ssl-Elec # SSL - Electrical Aerospace Ground Equipment Section
70:B3:D5:03:F0:00/36 Elesar # Elesar Limited
+70:B3:D5:04:10:00/36 Fibernet # FIBERNET LTD
70:B3:D5:04:20:00/36 CovelozT # Coveloz Technologies Inc.
70:B3:D5:04:40:00/36 DonElect # Don Electronics Ltd
70:B3:D5:04:60:00/36 Shenzhen # Shenzhen Rihuida Electronics Co,. Ltd
+70:B3:D5:04:B0:00/36 DreamISy # Dream I System Co., Ltd
70:B3:D5:04:C0:00/36 MapnaGro # mapna group
70:B3:D5:04:D0:00/36 SiconSrl # Sicon srl
70:B3:D5:05:20:00/36 SudoPrem # Sudo Premium Engineering
@@ -22566,6 +22583,7 @@
70:B3:D5:0D:C0:00/36 Talleres # Talleres de Escoriaza
70:B3:D5:0D:F0:00/36 BEASa # B.E.A. sa
70:B3:D5:0E:00:00/36 Plcis
+70:B3:D5:0E:50:00/36 DeltaSol # Delta Solutions LLC
70:B3:D5:0E:60:00/36 Nasdaq
70:B3:D5:0E:C0:00/36 AcsMotio # ACS MOTION CONTROL
70:B3:D5:0E:E0:00/36 PictureE # Picture Elements, Inc.
@@ -22708,6 +22726,7 @@
70:B3:D5:28:30:00/36 Textninj # TextNinja Co.
70:B3:D5:28:50:00/36 BentecDr # Bentec GmbH Drilling & Oilfield Systems
70:B3:D5:28:60:00/36 PedaxDan # Pedax Danmark
+70:B3:D5:28:90:00/36 Shenzhen # Shenzhen Rongda Computer Co.,Ltd
70:B3:D5:28:A0:00/36 TransitS # Transit Solutions, LLC.
70:B3:D5:28:B0:00/36 ArnouseD # Arnouse Digital Devices, Corp.
70:B3:D5:28:D0:00/36 Technica # Technica Engineering GmbH
@@ -22819,6 +22838,7 @@
70:B3:D5:3B:80:00/36 Nvideon # nVideon, Inc.
70:B3:D5:3B:B0:00/36 A-M # A-M Systems
70:B3:D5:3B:C0:00/36 Scitroni # SciTronix
+70:B3:D5:3B:E0:00/36 Mydefenc # MyDefence Communication ApS
70:B3:D5:3C:00:00/36 Dk-Techn # DK-Technologies A/S
70:B3:D5:3C:20:00/36 Cellular # Cellular Specialties, Inc.
70:B3:D5:3C:30:00/36 Aimco
@@ -22879,6 +22899,7 @@
70:B3:D5:44:B0:00/36 OpenSyst # Open System Solutions Limited
70:B3:D5:44:E0:00/36 Solace # Solace Systems Inc.
70:B3:D5:45:50:00/36 Heartlan # Heartlandmicropayments
+70:B3:D5:45:70:00/36 VivaldiC # Vivaldi Clima Srl
70:B3:D5:45:90:00/36 ProtiumT # Protium Technologies, Inc.
70:B3:D5:45:C0:00/36 Alytech
70:B3:D5:45:D0:00/36 Sensapex # Sensapex Oy
@@ -22894,6 +22915,7 @@
70:B3:D5:47:90:00/36 LineageP # LINEAGE POWER PVT. LTD.
70:B3:D5:47:C0:00/36 Par-Tech # Par-Tech, Inc.
70:B3:D5:48:60:00/36 Chongqin # ChongQing JianTao Technology Co., Ltd.
+70:B3:D5:48:A0:00/36 GeorgeWi # George Wilson Industries Ltd
70:B3:D5:48:C0:00/36 Integrat # Integrated Systems Engineering, Inc.
70:B3:D5:48:D0:00/36 OmegaBil # OMEGA BILANCE SRL SOCIETA' UNIPERSONALE
70:B3:D5:48:E0:00/36 AllimSys # Allim System Co,.Ltd.
@@ -22939,6 +22961,7 @@
70:B3:D5:50:00:00/36 MistralS # Mistral Solutions Pvt. LTD
70:B3:D5:50:10:00/36 PeekTraf # Peek Traffic
70:B3:D5:50:20:00/36 Glidewel # Glidewell Laboratories
+70:B3:D5:50:30:00/36 ItestCom # Itest communication Tech Co., LTD
70:B3:D5:50:40:00/36 Xsight # Xsight Systems Ltd.
70:B3:D5:50:50:00/36 Mc2-Tech # MC2-Technologies
70:B3:D5:50:70:00/36 HumanOri # Human Oriented Technology, Inc.
@@ -22960,6 +22983,7 @@
70:B3:D5:53:10:00/36 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:C0:00/36 HustyMSt # Husty M.Styczen J.Hupert Sp.J.
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:54:F0:00/36 Assembly # Assembly Contracts Limited
@@ -23009,6 +23033,7 @@
70:B3:D5:5C:C0:00/36 AkseSrl # Akse srl
70:B3:D5:5C:D0:00/36 MvtVideo # MVT Video Technologies R + H Maedler GbR
70:B3:D5:5D:10:00/36 Software # Software Motor Corp
+70:B3:D5:5D:60:00/36 BmtMesst # BMT Messtechnik Gmbh
70:B3:D5:5E:40:00/36 DspDesig # DSP DESIGN
70:B3:D5:5E:60:00/36 Mechatro # Mechatronics Systems Private Limited
70:B3:D5:5E:80:00/36 Vitec
@@ -23017,6 +23042,7 @@
70:B3:D5:5E:D0:00/36 EaElektr # EA Elektroautomatik GmbH & Co. KG
70:B3:D5:5E:E0:00/36 Mikrotro # Mikrotron Mikrocomputer, Digital- und Analogtechnik GmbH
70:B3:D5:5F:00:00/36 Managee # managee GmbH & Co KG
+70:B3:D5:5F:40:00/36 Fdstimin # FDSTiming
70:B3:D5:5F:C0:00/36 Surtec
70:B3:D5:5F:D0:00/36 WindarPh # Windar Photonics
70:B3:D5:5F:F0:00/36 VaisalaO # Vaisala Oyj
@@ -23219,6 +23245,7 @@
70:B3:D5:81:70:00/36 AplexTec # Aplex Technology Inc.
70:B3:D5:81:80:00/36 Crde
70:B3:D5:81:90:00/36 «Intelle # «Intellect module» LLC
+70:B3:D5:81:E0:00/36 Novathin # Novathings
70:B3:D5:82:00:00/36 BeckerNa # Becker Nachrichtentechnik GmbH
70:B3:D5:82:10:00/36 Hl2Group # HL2 group
70:B3:D5:82:30:00/36 SpContro # SP Controls
@@ -23371,6 +23398,7 @@
70:B3:D5:9F:50:00/36 VickersE # Vickers Electronics Ltd
70:B3:D5:9F:60:00/36 Edgeware # Edgeware AB
70:B3:D5:9F:A0:00/36 IdeasSrl # Ideas srl
+70:B3:D5:9F:B0:00/36 UnicomGl # Unicom Global, Inc.
70:B3:D5:A0:00:00/36 AtxNetwo # ATX NETWORKS LTD
70:B3:D5:A0:10:00/36 Feldtech # FeldTech GmbH
70:B3:D5:A0:40:00/36 GaleaEle # Galea Electric S.L.
@@ -23570,6 +23598,7 @@
70:B3:D5:C0:70:00/36 Areco
70:B3:D5:C0:A0:00/36 Infosock # Infosocket Co., Ltd.
70:B3:D5:C0:E0:00/36 SysdevSr # SYSDEV Srl
+70:B3:D5:C0:F0:00/36 Honeywel # Honeywell Safety Products USA, Inc
70:B3:D5:C1:50:00/36 Sensobox # Sensobox GmbH
70:B3:D5:C1:B0:00/36 Labinven # Labinvent JSC
70:B3:D5:C2:10:00/36 AplexTec # Aplex Technology Inc.
@@ -23585,6 +23614,7 @@
70:B3:D5:C3:90:00/36 Meshwork # MeshWorks Wireless Oy
70:B3:D5:C3:B0:00/36 Vironova # Vironova AB
70:B3:D5:C3:C0:00/36 PeekTraf # PEEK TRAFFIC
+70:B3:D5:C3:E0:00/36 Dosadore # DOSADORES ALLTRONIC
70:B3:D5:C3:F0:00/36 CodeBlue # Code Blue Corporation
70:B3:D5:C4:30:00/36 FutureSk # Future Skies
70:B3:D5:C4:F0:00/36 AeVanDeV # AE Van de Vliet BVBA
@@ -23638,6 +23668,7 @@
70:B3:D5:CC:E0:00/36 Proconex # Proconex 2010 Inc.
70:B3:D5:CC:F0:00/36 Netberg
70:B3:D5:CD:20:00/36 HbhMicro # HBH Microwave GmbH
+70:B3:D5:CD:50:00/36 ApantacL # Apantac LLC
70:B3:D5:CD:60:00/36 Videoray # VideoRay LLC
70:B3:D5:CD:90:00/36 PeterHub # Peter Huber Kaeltemaschinenbau GmbH
70:B3:D5:CD:E0:00/36 Multipur # Multipure International
@@ -23668,6 +23699,7 @@
70:B3:D5:D2:B0:00/36 Streampl # StreamPlay Oy Ltd
70:B3:D5:D2:D0:00/36 EvoluteP # Evolute Systems Private Limited
70:B3:D5:D2:F0:00/36 LIFESa # L.I.F.E. Corporation SA
+70:B3:D5:D3:20:00/36 EuklisBy # Euklis by GSG International
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
@@ -23691,6 +23723,7 @@
70:B3:D5:D7:00:00/36 Rational # Rational Production srl Unipersonale
70:B3:D5:D7:30:00/36 Ermine # ERMINE Corporation
70:B3:D5:D7:40:00/36 SandiaNa # Sandia National Laboratories
+70:B3:D5:D7:50:00/36 HyundaiM # Hyundai MNSOFT
70:B3:D5:D7:60:00/36 Attocube # attocube systems AG
70:B3:D5:D7:90:00/36 GomaElet # GOMA ELETTRONICA SpA
70:B3:D5:D7:A0:00/36 Speedifi # Speedifi Inc
@@ -23810,6 +23843,7 @@
70:B3:D5:EC:10:00/36 XafaxNed # Xafax Nederland bv
70:B3:D5:EC:60:00/36 Esii
70:B3:D5:EC:A0:00/36 Transtro # Transtronic AB
+70:B3:D5:EC:B0:00/36 Re-Contr # Re spa - Controlli Industriali - IT01782300154
70:B3:D5:EC:D0:00/36 Sbs-Fein # SBS-Feintechnik GmbH & Co. KG
70:B3:D5:EC:E0:00/36 Comm-Con # COMM-connect A/S
70:B3:D5:EC:F0:00/36 Ipitek
@@ -24037,6 +24071,7 @@
74:5E:1C Pioneer # PIONEER CORPORATION
74:5F:00 SamsungS # Samsung Semiconductor Inc.
74:5F:AE TslPpl # TSL PPL
+74:61:4B Chongqin # Chongqing Huijiatong Information Technology Co., Ltd.
74:63:DF Vts # VTS GmbH
74:65:D1 Atlinks
74:66:30 T:MiYtti # T:mi Ytti
@@ -24991,7 +25026,7 @@
88:03:55 Arcadyan # Arcadyan Technology Corporation
88:07:4B LgElectr # LG Electronics (Mobile Communications)
88:09:05 Mtmcommu # MTMCommunications
-88:09:AF Masimo # Masimo Corp.
+88:09:AF Masimo # Masimo Corporation
88:0F:10 HuamiInf # Huami Information Technology Co.,Ltd.
88:0F:B6 JabilCir # Jabil Circuits India Pvt Ltd,-EHTP unit
88:10:36 PanodicS # Panodic(ShenZhen) Electronics Limted
@@ -25253,6 +25288,7 @@
8C:90:D3 Nokia
8C:91:09 Toyoshim # Toyoshima Electric Technoeogy(Suzhou) Co.,Ltd.
8C:92:36 AusLinxT # Aus.Linx Technology Co., Ltd.
+8C:93:51 Jigowatt # Jigowatts Inc.
8C:94:CF EncellTe # Encell Technology, Inc.
8C:99:E6 TctMobil # TCT mobile ltd
8C:A0:48 BeijingN # Beijing NeTopChip Technology Co.,LTD
@@ -25363,6 +25399,7 @@
90:4C:E5 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
90:4D:4A Sagemcom # Sagemcom Broadband SAS
90:4E:2B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
+90:50:5A Unglue # unGlue, Inc
90:50:7B Advanced # Advanced PANMOBIL Systems GmbH & Co. KG
90:51:3F Elettron # Elettronica Santerno SpA
90:54:46 TesElect # TES ELECTRONIC SOLUTIONS
@@ -25639,6 +25676,7 @@
94:F6:A3 Apple # Apple, Inc.
94:F7:20 TianjinD # Tianjin Deviser Electronics Instrument Co., Ltd
94:FA:E8 Shenzhen # Shenzhen Eycom Technology Co., Ltd
+94:FB:29 ZebraTec # Zebra Technologies Inc.
94:FB:B2 Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd
94:FD:1D Wherewhe # WhereWhen Corp
94:FD:2E Shanghai # Shanghai Uniscope Technologies Co.,Ltd
@@ -25764,6 +25802,7 @@
98:AA:3C WillI-Te # Will i-tech Co., Ltd.
98:AA:D7 BlueWave # BLUE WAVE NETWORKING CO LTD
98:B0:39 Nokia
+98:B6:E9 Nintendo # Nintendo Co.,Ltd
98:B8:E3 Apple # Apple, Inc.
98:BB:1E BydPreci # BYD Precision Manufacture Company Ltd.
98:BC:57 SvaTechn # SVA TECHNOLOGIES CO.LTD
@@ -25774,6 +25813,7 @@
98:CB:27 GaloreNe # Galore Networks Pvt. Ltd.
98:CD:B4 Virident # Virident Systems, Inc.
98:CF:53 BbkEduca # BBK EDUCATIONAL ELECTRONICS CORP.,LTD.
+98:D2:93 Google # Google, Inc.
98:D3:31 Shenzhen # Shenzhen Bolutek Technology Co.,Ltd.
98:D6:86 ChyiLeeI # Chyi Lee industry Co., ltd.
98:D6:BB Apple # Apple, Inc.
@@ -25935,6 +25975,7 @@
9C:C7:A6 Avm # AVM GmbH
9C:C7:D1 Sharp # SHARP Corporation
9C:CA:D9 Nokia # Nokia Corporation
+9C:CC:83 JuniperN # Juniper Networks
9C:CD:82 ChengUei # CHENG UEI PRECISION INDUSTRY CO.,LTD
9C:D2:1E HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
9C:D2:4B Zte # zte corporation
@@ -27530,6 +27571,7 @@ C0:D3:91:C0:00:00/28 Zhinengg # Zhinengguo technology company limi
C0:D3:91:D0:00:00/28 Regulus # REGULUS CO.,LTD.
C0:D3:91:E0:00:00/28 SamsaraN # SAMSARA NETWORKS INC
C0:D9:62 AskeyCom # ASKEY COMPUTER CORP
+C0:D9:F7 Shandong # ShanDong Domor Intelligent S&T CO.,Ltd
C0:DA:74 Hangzhou # Hangzhou Sunyard Technology Co., Ltd.
C0:DC:6A QingdaoE # Qingdao Eastsoft Communication Technology Co.,LTD
C0:DF:77 ConradEl # Conrad Electronic SE
@@ -28486,6 +28528,7 @@ D8:31:CF SamsungE # Samsung Electronics Co.,Ltd
D8:33:7F OfficeFa # Office FA.com Co.,Ltd.
D8:37:BE Shanghai # Shanghai Gongjing Telecom Technology Co,LTD
D8:38:0D Shenzhen # SHENZHEN IP-COM Network Co.,Ltd
+D8:38:FC RuckusWi # Ruckus Wireless
D8:3C:69 Shenzhen # Shenzhen TINNO Mobile Technology Corp.
D8:42:AC Shanghai # Shanghai Feixun Communication Co.,Ltd.
D8:42:E2 CanaryCo # Canary Connect, Inc.
@@ -29865,6 +29908,7 @@ F8:93:F3 Volans
F8:95:50 ProtonPr # Proton Products Chengdu Ltd
F8:95:C7 LgElectr # LG Electronics (Mobile Communications)
F8:97:CF Daeshin- # DAESHIN-INFORMATION TECHNOLOGY CO., LTD.
+F8:98:3A LeemanIn # Leeman International (HongKong) Limited
F8:98:B9 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
F8:99:55 Fortress # Fortress Technology Inc
F8:9D:0D ControlT # Control Technology Inc.
diff --git a/services b/services
index 1072f01e05..ddc4de70ab 100644
--- a/services
+++ b/services
@@ -3691,8 +3691,8 @@ ias-reg 2140/tcp # IAS-REG
ias-reg 2140/udp # IAS-REG
ias-admind 2141/tcp # IAS-ADMIND [Baiju_V_Patel] [Baiju_V_Patel]
ias-admind 2141/udp # IAS-ADMIND [Baiju_V_Patel] [Baiju_V_Patel]
-tdmoip 2142/tcp # TDM OVER IP [RFC5087]
-tdmoip 2142/udp # TDM OVER IP [RFC5087]
+tdmoip 2142/tcp # TDM OVER IP [Yaakov_Stein] [Yaakov_Stein] 2016-09-21 [RFC5087]
+tdmoip 2142/udp # TDM OVER IP [Yaakov_Stein] [Yaakov_Stein] 2016-09-21 [RFC5087]
lv-jc 2143/tcp # Live Vault Job Control
lv-jc 2143/udp # Live Vault Job Control
lv-ffx 2144/tcp # Live Vault Fast Object Transfer
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index a5e6a252e8..d8498f7556 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -789,12 +789,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="782"/>
+ <location filename="capture_file_dialog.cpp" line="784"/>
<source>%1, error after %2 packets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="789"/>
+ <location filename="capture_file_dialog.cpp" line="791"/>
<source>%1, timed out at %2 packets</source>
<translation type="unfinished"></translation>
</message>
@@ -909,17 +909,17 @@
<translation type="vanished">-</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="728"/>
+ <location filename="capture_file_dialog.cpp" line="730"/>
<source>directory</source>
<translation>Verzeichnis</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="735"/>
+ <location filename="capture_file_dialog.cpp" line="737"/>
<source>unknown file format</source>
<translation>unbekanntes Dateiformat</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="737"/>
+ <location filename="capture_file_dialog.cpp" line="739"/>
<source>error opening file</source>
<translation>Fehler beim Öffnen der Datei</translation>
</message>
@@ -940,7 +940,7 @@
<translation type="vanished">?</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="816"/>
+ <location filename="capture_file_dialog.cpp" line="818"/>
<source>unknown</source>
<translation>unbekannt</translation>
</message>
@@ -6905,6 +6905,11 @@ text-decoration: underline;
<source>Copy file path</source>
<translation>Dateipfad kopieren</translation>
</message>
+ <message>
+ <location filename="main_welcome.cpp" line="478"/>
+ <source>Remove</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
@@ -9127,33 +9132,33 @@ text-decoration: underline;
<translation>Einzelne Protokolle aktivieren/deaktivieren</translation>
</message>
<message>
- <location filename="main_window.cpp" line="437"/>
+ <location filename="main_window.cpp" line="441"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>Nach Aktualisierungen suchen</translation>
</message>
<message>
- <location filename="main_window.cpp" line="819"/>
+ <location filename="main_window.cpp" line="823"/>
<source> before quitting</source>
<translation> vor dem Schließen</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1004"/>
+ <location filename="main_window.cpp" line="1008"/>
<source>Save packets before merging?</source>
<translation>Pakete vor dem Zusammenführen speichern?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1009"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>Eine temporäre Mitschnittdatei kann nicht zusammengeführt werden.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1011"/>
+ <location filename="main_window.cpp" line="1015"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>Vor der Zusammenführung Änderungen in &quot;%1&quot; speichern?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1013"/>
+ <location filename="main_window.cpp" line="1017"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Änderungen müssen vor dem Zusammenführen gespeichert werden.</translation>
</message>
@@ -9163,117 +9168,117 @@ text-decoration: underline;
<translation>Ungültiger Anzeigefilter</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1050"/>
+ <location filename="main_window.cpp" line="1054"/>
<source>Invalid Read Filter</source>
<translation>Ungültiger Lesefilter</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1051"/>
+ <location filename="main_window.cpp" line="1055"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>Der Filterausdruck %1 ist kein gültiger Lesefilter. (%2).</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1141"/>
+ <location filename="main_window.cpp" line="1145"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation> vor dem Importieren einer Aufzeichnung</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1417"/>
+ <location filename="main_window.cpp" line="1421"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>Kann nicht nach &quot;%1&quot; exportieren.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1418"/>
+ <location filename="main_window.cpp" line="1422"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Pakete können nicht in die aktuelle Mitschnittdatei exportiert werden.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1505"/>
- <location filename="main_window.cpp" line="1530"/>
+ <location filename="main_window.cpp" line="1509"/>
+ <location filename="main_window.cpp" line="1534"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1581"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation>Wollen Sie die durchgeführten Änderungen speichern%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1573"/>
- <location filename="main_window.cpp" line="1581"/>
+ <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1585"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>Die aufgezeichneten Pakete gehen verloren wenn sie nicht gespeichert werden.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1586"/>
+ <location filename="main_window.cpp" line="1590"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>Sollen die Änderungen an der Mitschnittdatei &quot;%1&quot;%2 gespeichert werden?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
- <location filename="main_window.cpp" line="1587"/>
+ <location filename="main_window.cpp" line="1582"/>
+ <location filename="main_window.cpp" line="1591"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Änderungen gehen verloren, wenn sie nicht gesichert werden.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1576"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation>Wollen Sie die Aufzeichnung stoppen und die aufgezeichneten Pakete speichern%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Do you want to save the captured packets%1?</source>
<translation>Wollen Sie die aufgezeichneten Pakete speichern%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1604"/>
+ <location filename="main_window.cpp" line="1608"/>
<source>Save before Continue</source>
<translation>Vor dem Fortsetzen speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1606"/>
+ <location filename="main_window.cpp" line="1610"/>
<source>Stop and Save</source>
<translation>Stoppen und speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1622"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation>Stoppen und beenden &amp;ohne zu speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1634"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation>&amp;Ohne speichern beenden</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1621"/>
- <location filename="main_window.cpp" line="1634"/>
+ <location filename="main_window.cpp" line="1625"/>
+ <location filename="main_window.cpp" line="1638"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation>Fortsetzen &amp;ohne zu Speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1624"/>
+ <location filename="main_window.cpp" line="1628"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation>Stoppen und Fortsetzen &amp;ohne zu Speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1956"/>
+ <location filename="main_window.cpp" line="1960"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Dateiname kann nicht auf UTF-8 angewendet werden)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1977"/>
+ <location filename="main_window.cpp" line="1981"/>
<source>The Wireshark Network Analyzer</source>
<translation>Die Wireshark Netzwerk Analysesoftware</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2002"/>
+ <location filename="main_window.cpp" line="2006"/>
<source>Capturing from %1</source>
<translation>Aufzeichnen von %1</translation>
</message>
@@ -9288,52 +9293,52 @@ text-decoration: underline;
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="801"/>
+ <location filename="main_window_slots.cpp" line="799"/>
<source>Saving %1</source>
<translation>Speichere %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="839"/>
<source>No interface selected</source>
<translation>Keine Schnittstelle ausgewählt</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="851"/>
+ <location filename="main_window_slots.cpp" line="849"/>
<source>Invalid capture filter</source>
<translation>Ungültiger Mitschnittfilter</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1099"/>
+ <location filename="main_window_slots.cpp" line="1097"/>
<source>Clear Menu</source>
<translation>Menüeinträge löschen</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1579"/>
+ <location filename="main_window_slots.cpp" line="1577"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Bitte Warten während Wireshark initialisiert wird</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1669"/>
+ <location filename="main_window_slots.cpp" line="1667"/>
<source> before closing the file</source>
<translation> vor dem Schließen der Datei</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1757"/>
+ <location filename="main_window_slots.cpp" line="1749"/>
<source>Export Selected Packet Bytes</source>
<translation>Ausgewählte Paketbytes exportieren</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1823"/>
+ <location filename="main_window_slots.cpp" line="1815"/>
<source>No Keys</source>
<translation>Keine Schlüssel</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1824"/>
+ <location filename="main_window_slots.cpp" line="1816"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Es sind keine SSL Sitzungsschlüssel zum Speichern vorhanden.</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1830"/>
+ <location filename="main_window_slots.cpp" line="1822"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9342,69 +9347,69 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1759"/>
+ <location filename="main_window_slots.cpp" line="1751"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Rohdaten (*.bin *.dat *.raw);; Alle Dateien (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1834"/>
+ <location filename="main_window_slots.cpp" line="1826"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>SSL Sitzungsschlüssel (*.keys *.txt);; Alle Dateien (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1972"/>
+ <location filename="main_window_slots.cpp" line="1964"/>
<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="2382"/>
- <location filename="main_window_slots.cpp" line="3484"/>
+ <location filename="main_window_slots.cpp" line="2374"/>
+ <location filename="main_window_slots.cpp" line="3476"/>
<source>Unable to build conversation filter.</source>
<translation>Verbindungsfilter kann nicht erstellt werden.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
- <location filename="main_window_slots.cpp" line="2545"/>
+ <location filename="main_window_slots.cpp" line="2524"/>
+ <location filename="main_window_slots.cpp" line="2537"/>
<source> before reloading the file</source>
<translation> vor dem Neuladen der Datei</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2579"/>
+ <location filename="main_window_slots.cpp" line="2571"/>
<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="3491"/>
+ <location filename="main_window_slots.cpp" line="3483"/>
<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="3500"/>
+ <location filename="main_window_slots.cpp" line="3492"/>
<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="3577"/>
+ <location filename="main_window_slots.cpp" line="3569"/>
<source>No Interface Selected</source>
<translation>Keine Schnittstelle ausgewählt</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3584"/>
+ <location filename="main_window_slots.cpp" line="3576"/>
<source> before starting a new capture</source>
<translation> vor dem Starten einer neuen Aufzeichnung</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3602"/>
+ <location filename="main_window_slots.cpp" line="3594"/>
<source> before restarting the capture</source>
<translation> vor dem Neustart der Aufzeichnung</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3815"/>
+ <location filename="main_window_slots.cpp" line="3807"/>
<source>Wiki Page for %1</source>
<translation>Wikiseite für &amp;1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3816"/>
+ <location filename="main_window_slots.cpp" line="3808"/>
<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 gehen?&lt;/p&gt;</translation>
</message>
@@ -10037,47 +10042,47 @@ text-decoration: underline;
<translation>Zusammenfassung als Text</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="723"/>
+ <location filename="packet_list.cpp" line="719"/>
<source>Align Left</source>
<translation>Links ausrichten</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="724"/>
+ <location filename="packet_list.cpp" line="720"/>
<source>Align Center</source>
<translation>Zentriert ausrichten</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="725"/>
+ <location filename="packet_list.cpp" line="721"/>
<source>Align Right</source>
<translation>Rechts ausrichten</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="727"/>
+ <location filename="packet_list.cpp" line="723"/>
<source>Column Preferences</source>
<translation>Spalteneigenschaft</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="728"/>
+ <location filename="packet_list.cpp" line="724"/>
<source>Edit Column</source>
<translation>Spalte editieren</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="729"/>
+ <location filename="packet_list.cpp" line="725"/>
<source>Resize To Contents</source>
<translation>Größe an Inhalt anpassen</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="730"/>
+ <location filename="packet_list.cpp" line="726"/>
<source>Resolve Names</source>
<translation>Namen auflösen</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="735"/>
+ <location filename="packet_list.cpp" line="731"/>
<source>Remove This Column</source>
<translation>Spalte entfernen</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1093"/>
+ <location filename="packet_list.cpp" line="1085"/>
<source>Frame %1: %2
</source>
@@ -10086,7 +10091,7 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1097"/>
+ <location filename="packet_list.cpp" line="1089"/>
<source>[ Comment text exceeds %1. Stopping. ]</source>
<translation>[ Kommentartext überschreitet %1. Anhalten der Verarbeitung. ]</translation>
</message>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 7fa866a791..e09d9affc6 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -785,12 +785,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="782"/>
+ <location filename="capture_file_dialog.cpp" line="784"/>
<source>%1, error after %2 packets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="789"/>
+ <location filename="capture_file_dialog.cpp" line="791"/>
<source>%1, timed out at %2 packets</source>
<translation type="unfinished"></translation>
</message>
@@ -869,22 +869,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="728"/>
+ <location filename="capture_file_dialog.cpp" line="730"/>
<source>directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="735"/>
+ <location filename="capture_file_dialog.cpp" line="737"/>
<source>unknown file format</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="737"/>
+ <location filename="capture_file_dialog.cpp" line="739"/>
<source>error opening file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="816"/>
+ <location filename="capture_file_dialog.cpp" line="818"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
@@ -6725,6 +6725,11 @@ a:hover {
<source>Copy file path</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="main_welcome.cpp" line="478"/>
+ <source>Remove</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
@@ -8947,33 +8952,33 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="437"/>
+ <location filename="main_window.cpp" line="441"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="819"/>
+ <location filename="main_window.cpp" line="823"/>
<source> before quitting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1004"/>
+ <location filename="main_window.cpp" line="1008"/>
<source>Save packets before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1009"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1011"/>
+ <location filename="main_window.cpp" line="1015"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1013"/>
+ <location filename="main_window.cpp" line="1017"/>
<source>Changes must be saved before the files can be merged.</source>
<translation type="unfinished"></translation>
</message>
@@ -8983,117 +8988,117 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1050"/>
+ <location filename="main_window.cpp" line="1054"/>
<source>Invalid Read Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1051"/>
+ <location filename="main_window.cpp" line="1055"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1141"/>
+ <location filename="main_window.cpp" line="1145"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1417"/>
+ <location filename="main_window.cpp" line="1421"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1418"/>
+ <location filename="main_window.cpp" line="1422"/>
<source>You cannot export packets to the current capture file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1505"/>
- <location filename="main_window.cpp" line="1530"/>
+ <location filename="main_window.cpp" line="1509"/>
+ <location filename="main_window.cpp" line="1534"/>
<source>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1581"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1573"/>
- <location filename="main_window.cpp" line="1581"/>
+ <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1585"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1586"/>
+ <location filename="main_window.cpp" line="1590"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
- <location filename="main_window.cpp" line="1587"/>
+ <location filename="main_window.cpp" line="1582"/>
+ <location filename="main_window.cpp" line="1591"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1576"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Do you want to save the captured packets%1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1604"/>
+ <location filename="main_window.cpp" line="1608"/>
<source>Save before Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1606"/>
+ <location filename="main_window.cpp" line="1610"/>
<source>Stop and Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1622"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1634"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1621"/>
- <location filename="main_window.cpp" line="1634"/>
+ <location filename="main_window.cpp" line="1625"/>
+ <location filename="main_window.cpp" line="1638"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1624"/>
+ <location filename="main_window.cpp" line="1628"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1956"/>
+ <location filename="main_window.cpp" line="1960"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1977"/>
+ <location filename="main_window.cpp" line="1981"/>
<source>The Wireshark Network Analyzer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="2002"/>
+ <location filename="main_window.cpp" line="2006"/>
<source>Capturing from %1</source>
<translation type="unfinished"></translation>
</message>
@@ -9108,52 +9113,52 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="801"/>
+ <location filename="main_window_slots.cpp" line="799"/>
<source>Saving %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="839"/>
<source>No interface selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="851"/>
+ <location filename="main_window_slots.cpp" line="849"/>
<source>Invalid capture filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1099"/>
+ <location filename="main_window_slots.cpp" line="1097"/>
<source>Clear Menu</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1579"/>
+ <location filename="main_window_slots.cpp" line="1577"/>
<source>Please wait while Wireshark is initializing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1669"/>
+ <location filename="main_window_slots.cpp" line="1667"/>
<source> before closing the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1757"/>
+ <location filename="main_window_slots.cpp" line="1749"/>
<source>Export Selected Packet Bytes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1823"/>
+ <location filename="main_window_slots.cpp" line="1815"/>
<source>No Keys</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1824"/>
+ <location filename="main_window_slots.cpp" line="1816"/>
<source>There are no SSL Session Keys to save.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1830"/>
+ <location filename="main_window_slots.cpp" line="1822"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9162,69 +9167,69 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1759"/>
+ <location filename="main_window_slots.cpp" line="1751"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1834"/>
+ <location filename="main_window_slots.cpp" line="1826"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1972"/>
+ <location filename="main_window_slots.cpp" line="1964"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2382"/>
- <location filename="main_window_slots.cpp" line="3484"/>
+ <location filename="main_window_slots.cpp" line="2374"/>
+ <location filename="main_window_slots.cpp" line="3476"/>
<source>Unable to build conversation filter.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
- <location filename="main_window_slots.cpp" line="2545"/>
+ <location filename="main_window_slots.cpp" line="2524"/>
+ <location filename="main_window_slots.cpp" line="2537"/>
<source> before reloading the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2579"/>
+ <location filename="main_window_slots.cpp" line="2571"/>
<source>No filter available. Try another </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3491"/>
+ <location filename="main_window_slots.cpp" line="3483"/>
<source>Error compiling filter for this conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3500"/>
+ <location filename="main_window_slots.cpp" line="3492"/>
<source>No previous/next packet in conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3577"/>
+ <location filename="main_window_slots.cpp" line="3569"/>
<source>No Interface Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3584"/>
+ <location filename="main_window_slots.cpp" line="3576"/>
<source> before starting a new capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3602"/>
+ <location filename="main_window_slots.cpp" line="3594"/>
<source> before restarting the capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3815"/>
+ <location filename="main_window_slots.cpp" line="3807"/>
<source>Wiki Page for %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3816"/>
+ <location filename="main_window_slots.cpp" line="3808"/>
<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>
@@ -9857,54 +9862,54 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="723"/>
+ <location filename="packet_list.cpp" line="719"/>
<source>Align Left</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="724"/>
+ <location filename="packet_list.cpp" line="720"/>
<source>Align Center</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="725"/>
+ <location filename="packet_list.cpp" line="721"/>
<source>Align Right</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="727"/>
+ <location filename="packet_list.cpp" line="723"/>
<source>Column Preferences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="728"/>
+ <location filename="packet_list.cpp" line="724"/>
<source>Edit Column</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="729"/>
+ <location filename="packet_list.cpp" line="725"/>
<source>Resize To Contents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="730"/>
+ <location filename="packet_list.cpp" line="726"/>
<source>Resolve Names</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="735"/>
+ <location filename="packet_list.cpp" line="731"/>
<source>Remove This Column</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1093"/>
+ <location filename="packet_list.cpp" line="1085"/>
<source>Frame %1: %2
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1097"/>
+ <location filename="packet_list.cpp" line="1089"/>
<source>[ Comment text exceeds %1. Stopping. ]</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 451aaa85d9..955375dfa6 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -789,12 +789,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="782"/>
+ <location filename="capture_file_dialog.cpp" line="784"/>
<source>%1, error after %2 packets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="789"/>
+ <location filename="capture_file_dialog.cpp" line="791"/>
<source>%1, timed out at %2 packets</source>
<translation type="unfinished"></translation>
</message>
@@ -909,17 +909,17 @@
<translation type="vanished">-</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="728"/>
+ <location filename="capture_file_dialog.cpp" line="730"/>
<source>directory</source>
<translation>dossier</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="735"/>
+ <location filename="capture_file_dialog.cpp" line="737"/>
<source>unknown file format</source>
<translation>Format du fichier inconnu</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="737"/>
+ <location filename="capture_file_dialog.cpp" line="739"/>
<source>error opening file</source>
<translation>erreur pour ouvrir le fichier</translation>
</message>
@@ -940,7 +940,7 @@
<translation type="vanished">?</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="816"/>
+ <location filename="capture_file_dialog.cpp" line="818"/>
<source>unknown</source>
<translation>inconnu</translation>
</message>
@@ -6877,6 +6877,11 @@ a:hover {
<source>Copy file path</source>
<translation>Copier le chemin du fichier</translation>
</message>
+ <message>
+ <location filename="main_welcome.cpp" line="478"/>
+ <source>Remove</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
@@ -9099,33 +9104,33 @@ a:hover {
<translation>Active et désactive des protocoles spécifiques</translation>
</message>
<message>
- <location filename="main_window.cpp" line="437"/>
+ <location filename="main_window.cpp" line="441"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>Vérifier Mises à Jour</translation>
</message>
<message>
- <location filename="main_window.cpp" line="819"/>
+ <location filename="main_window.cpp" line="823"/>
<source> before quitting</source>
<translation>avant de quitter</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1004"/>
+ <location filename="main_window.cpp" line="1008"/>
<source>Save packets before merging?</source>
<translation>Sauvegarder les paquets avant la fusion?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1009"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>une capture temporaire ne peut pas etre fusionner.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1011"/>
+ <location filename="main_window.cpp" line="1015"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>Sauvegarder les changements dans &quot;%1&quot; avant la fusion?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1013"/>
+ <location filename="main_window.cpp" line="1017"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Les changements doivent etre sauvegarder avant la fusion de fichier.</translation>
</message>
@@ -9135,117 +9140,117 @@ a:hover {
<translation>Filtre d&apos;affichage invalide</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1050"/>
+ <location filename="main_window.cpp" line="1054"/>
<source>Invalid Read Filter</source>
<translation>Filtre de Lecture Invalide</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1051"/>
+ <location filename="main_window.cpp" line="1055"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>L&apos;expression de filtre %1 n&apos;est pas un filtre de lecture valide. (%2).</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1141"/>
+ <location filename="main_window.cpp" line="1145"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1417"/>
+ <location filename="main_window.cpp" line="1421"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>Impossible d&apos;exporter dans &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1418"/>
+ <location filename="main_window.cpp" line="1422"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Vous ne pouvez pas exporter les paquets de la capture en cours.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1505"/>
- <location filename="main_window.cpp" line="1530"/>
+ <location filename="main_window.cpp" line="1509"/>
+ <location filename="main_window.cpp" line="1534"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1581"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1573"/>
- <location filename="main_window.cpp" line="1581"/>
+ <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1585"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>Votre capture de paquet sera perdu si vous ne les enregistrez pas.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1586"/>
+ <location filename="main_window.cpp" line="1590"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>Voulez-vous enregistrer les modifications que vous avez apportées au fichier de capture &quot;%1&quot;%2?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
- <location filename="main_window.cpp" line="1587"/>
+ <location filename="main_window.cpp" line="1582"/>
+ <location filename="main_window.cpp" line="1591"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Vos changements seront perdus si vous ne les enregistrez pas.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1576"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Do you want to save the captured packets%1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1604"/>
+ <location filename="main_window.cpp" line="1608"/>
<source>Save before Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1606"/>
+ <location filename="main_window.cpp" line="1610"/>
<source>Stop and Save</source>
<translation>Arreter et Sauvegarder</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1622"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1634"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1621"/>
- <location filename="main_window.cpp" line="1634"/>
+ <location filename="main_window.cpp" line="1625"/>
+ <location filename="main_window.cpp" line="1638"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1624"/>
+ <location filename="main_window.cpp" line="1628"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1956"/>
+ <location filename="main_window.cpp" line="1960"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Nom du fichier ne peut pas être mappé à l&apos;UTF-8)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1977"/>
+ <location filename="main_window.cpp" line="1981"/>
<source>The Wireshark Network Analyzer</source>
<translation>L&apos;analyseur de réseau Wireshark</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2002"/>
+ <location filename="main_window.cpp" line="2006"/>
<source>Capturing from %1</source>
<translation>Capture en cours de %1</translation>
</message>
@@ -9260,52 +9265,52 @@ a:hover {
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="801"/>
+ <location filename="main_window_slots.cpp" line="799"/>
<source>Saving %1</source>
<translation>Sauvegarde en cours %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="839"/>
<source>No interface selected</source>
<translation>Aucune interface sélectionnée</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="851"/>
+ <location filename="main_window_slots.cpp" line="849"/>
<source>Invalid capture filter</source>
<translation>Filtre de capture invalide</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1099"/>
+ <location filename="main_window_slots.cpp" line="1097"/>
<source>Clear Menu</source>
<translation>Effacer les fichiers récemment ouverts</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1579"/>
+ <location filename="main_window_slots.cpp" line="1577"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Veuillez patienter pendant que Wireshark s&apos;initialise. . .</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1669"/>
+ <location filename="main_window_slots.cpp" line="1667"/>
<source> before closing the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1757"/>
+ <location filename="main_window_slots.cpp" line="1749"/>
<source>Export Selected Packet Bytes</source>
<translation>Exporter Octets de Paquets Sélectionnés</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1823"/>
+ <location filename="main_window_slots.cpp" line="1815"/>
<source>No Keys</source>
<translation>Aucune clés</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1824"/>
+ <location filename="main_window_slots.cpp" line="1816"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Il y a aucune clé de Session SSL à sauvegarder.</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1830"/>
+ <location filename="main_window_slots.cpp" line="1822"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation type="unfinished">
@@ -9314,69 +9319,69 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1759"/>
+ <location filename="main_window_slots.cpp" line="1751"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1834"/>
+ <location filename="main_window_slots.cpp" line="1826"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1972"/>
+ <location filename="main_window_slots.cpp" line="1964"/>
<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="2382"/>
- <location filename="main_window_slots.cpp" line="3484"/>
+ <location filename="main_window_slots.cpp" line="2374"/>
+ <location filename="main_window_slots.cpp" line="3476"/>
<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="2532"/>
- <location filename="main_window_slots.cpp" line="2545"/>
+ <location filename="main_window_slots.cpp" line="2524"/>
+ <location filename="main_window_slots.cpp" line="2537"/>
<source> before reloading the file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2579"/>
+ <location filename="main_window_slots.cpp" line="2571"/>
<source>No filter available. Try another </source>
<translation>Aucun filtre disponible. Essayer un autre</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3491"/>
+ <location filename="main_window_slots.cpp" line="3483"/>
<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="3500"/>
+ <location filename="main_window_slots.cpp" line="3492"/>
<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="3577"/>
+ <location filename="main_window_slots.cpp" line="3569"/>
<source>No Interface Selected</source>
<translation>Aucune Interface Sélectionnée</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3584"/>
+ <location filename="main_window_slots.cpp" line="3576"/>
<source> before starting a new capture</source>
<translation>avant de commencer une nouvelle capture</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3602"/>
+ <location filename="main_window_slots.cpp" line="3594"/>
<source> before restarting the capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3815"/>
+ <location filename="main_window_slots.cpp" line="3807"/>
<source>Wiki Page for %1</source>
<translation>Page Wiki pour %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3816"/>
+ <location filename="main_window_slots.cpp" line="3808"/>
<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;
@@ -10011,47 +10016,47 @@ a:hover {
<translation>Résumé en Texte</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="723"/>
+ <location filename="packet_list.cpp" line="719"/>
<source>Align Left</source>
<translation>Aligner à gauche</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="724"/>
+ <location filename="packet_list.cpp" line="720"/>
<source>Align Center</source>
<translation>Aligner au centre</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="725"/>
+ <location filename="packet_list.cpp" line="721"/>
<source>Align Right</source>
<translation>Aligner à droite</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="727"/>
+ <location filename="packet_list.cpp" line="723"/>
<source>Column Preferences</source>
<translation>Préferences de la colonne</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="728"/>
+ <location filename="packet_list.cpp" line="724"/>
<source>Edit Column</source>
<translation>Éditer la colonne</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="729"/>
+ <location filename="packet_list.cpp" line="725"/>
<source>Resize To Contents</source>
<translation>Ajuster la taille au contenu</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="730"/>
+ <location filename="packet_list.cpp" line="726"/>
<source>Resolve Names</source>
<translation>Résoudre les noms</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="735"/>
+ <location filename="packet_list.cpp" line="731"/>
<source>Remove This Column</source>
<translation>Supprimer cette colonne</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1093"/>
+ <location filename="packet_list.cpp" line="1085"/>
<source>Frame %1: %2
</source>
@@ -10060,7 +10065,7 @@ a:hover {
</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1097"/>
+ <location filename="packet_list.cpp" line="1089"/>
<source>[ Comment text exceeds %1. Stopping. ]</source>
<translation>[ Taille maximum de commentaire dépassé %1 Arrêt !]</translation>
</message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 129a51fb12..616265c333 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -789,12 +789,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="782"/>
+ <location filename="capture_file_dialog.cpp" line="784"/>
<source>%1, error after %2 packets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="789"/>
+ <location filename="capture_file_dialog.cpp" line="791"/>
<source>%1, timed out at %2 packets</source>
<translation type="unfinished"></translation>
</message>
@@ -909,17 +909,17 @@
<translation type="vanished">-</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="728"/>
+ <location filename="capture_file_dialog.cpp" line="730"/>
<source>directory</source>
<translation>cartella</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="735"/>
+ <location filename="capture_file_dialog.cpp" line="737"/>
<source>unknown file format</source>
<translation>formato dii file sconosciuto</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="737"/>
+ <location filename="capture_file_dialog.cpp" line="739"/>
<source>error opening file</source>
<translation>errore nell&apos;apertura del file</translation>
</message>
@@ -940,7 +940,7 @@
<translation type="vanished">?</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="816"/>
+ <location filename="capture_file_dialog.cpp" line="818"/>
<source>unknown</source>
<translation>sconosciuto</translation>
</message>
@@ -6903,6 +6903,11 @@ a:hover {
<source>Copy file path</source>
<translation>Copia percorso del file</translation>
</message>
+ <message>
+ <location filename="main_welcome.cpp" line="478"/>
+ <source>Remove</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
@@ -9125,33 +9130,33 @@ a:hover {
<translation>Abilita e disabilita protocolli specifici</translation>
</message>
<message>
- <location filename="main_window.cpp" line="437"/>
+ <location filename="main_window.cpp" line="441"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>Verifica aggiornamenti</translation>
</message>
<message>
- <location filename="main_window.cpp" line="819"/>
+ <location filename="main_window.cpp" line="823"/>
<source> before quitting</source>
<translation>prima di uscire</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1004"/>
+ <location filename="main_window.cpp" line="1008"/>
<source>Save packets before merging?</source>
<translation>Salvare i pacchetti prima di unire?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1009"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>Un file di cattura temporaneo non può essere unito.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1011"/>
+ <location filename="main_window.cpp" line="1015"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>Salvare le modifiche a &quot;%1&quot; prima di unire?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1013"/>
+ <location filename="main_window.cpp" line="1017"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Le modifiche devono essere salvate prima di unire.</translation>
</message>
@@ -9161,117 +9166,117 @@ a:hover {
<translation>Filtro di visualizzazione non valido</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1050"/>
+ <location filename="main_window.cpp" line="1054"/>
<source>Invalid Read Filter</source>
<translation>Filtro di lettura non valido</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1051"/>
+ <location filename="main_window.cpp" line="1055"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>L&apos;espressione %1 non è un filtro di lettura valido. (%2).</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1141"/>
+ <location filename="main_window.cpp" line="1145"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation>prima di importare una cattura</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1417"/>
+ <location filename="main_window.cpp" line="1421"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>Impossibile esportare su &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1418"/>
+ <location filename="main_window.cpp" line="1422"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Non puoi esportare pacchetti sul file di cattura attuale.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1505"/>
- <location filename="main_window.cpp" line="1530"/>
+ <location filename="main_window.cpp" line="1509"/>
+ <location filename="main_window.cpp" line="1534"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1581"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation>Vuoi salvare le modifiche che hai apportato%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1573"/>
- <location filename="main_window.cpp" line="1581"/>
+ <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1585"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>I pacchetti catturati saranno persi se non li salvi.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1586"/>
+ <location filename="main_window.cpp" line="1590"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>Vuoi salvare le modifiche che hai apportato al file di cattura &quot;%1&quot;%2?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
- <location filename="main_window.cpp" line="1587"/>
+ <location filename="main_window.cpp" line="1582"/>
+ <location filename="main_window.cpp" line="1591"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Le modifiche saranno perse se non le salvi.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1576"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation>Vuoi interrompere la cattura e salvare i pacchetti catturati%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Do you want to save the captured packets%1?</source>
<translation>Vuoi salvare i pacchetti catturati%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1604"/>
+ <location filename="main_window.cpp" line="1608"/>
<source>Save before Continue</source>
<translation>Salva prima di continuare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1606"/>
+ <location filename="main_window.cpp" line="1610"/>
<source>Stop and Save</source>
<translation>Ferma e salva</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1622"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation>Ferma ed esci senza sal&amp;vare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1634"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation>Esci senza sal&amp;vare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1621"/>
- <location filename="main_window.cpp" line="1634"/>
+ <location filename="main_window.cpp" line="1625"/>
+ <location filename="main_window.cpp" line="1638"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation>Continua senza sal&amp;vare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1624"/>
+ <location filename="main_window.cpp" line="1628"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation>Ferma e continua senza sal&amp;vare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1956"/>
+ <location filename="main_window.cpp" line="1960"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Il nome del file non può essere associato in UTF-8)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1977"/>
+ <location filename="main_window.cpp" line="1981"/>
<source>The Wireshark Network Analyzer</source>
<translation>Wireshark l&apos;analizzatore di rete</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2002"/>
+ <location filename="main_window.cpp" line="2006"/>
<source>Capturing from %1</source>
<translation>Cattura da %1</translation>
</message>
@@ -9286,52 +9291,52 @@ a:hover {
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="801"/>
+ <location filename="main_window_slots.cpp" line="799"/>
<source>Saving %1</source>
<translation>Salvataggio di %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="839"/>
<source>No interface selected</source>
<translation>Nessuna interfaccia selezionata</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="851"/>
+ <location filename="main_window_slots.cpp" line="849"/>
<source>Invalid capture filter</source>
<translation>Filtro di cattura invalido</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1099"/>
+ <location filename="main_window_slots.cpp" line="1097"/>
<source>Clear Menu</source>
<translation>Pulisci menu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1579"/>
+ <location filename="main_window_slots.cpp" line="1577"/>
<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="1669"/>
+ <location filename="main_window_slots.cpp" line="1667"/>
<source> before closing the file</source>
<translation>prima della chiusura del file</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1757"/>
+ <location filename="main_window_slots.cpp" line="1749"/>
<source>Export Selected Packet Bytes</source>
<translation>Esporta i byte del pacchetto selezionato</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1823"/>
+ <location filename="main_window_slots.cpp" line="1815"/>
<source>No Keys</source>
<translation>Nessuna chiave</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1824"/>
+ <location filename="main_window_slots.cpp" line="1816"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Non ci sono chiavi di sessione SSL da salvare.</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1830"/>
+ <location filename="main_window_slots.cpp" line="1822"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9340,69 +9345,69 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1759"/>
+ <location filename="main_window_slots.cpp" line="1751"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Dati grezzi (*.bin *.dat *.raw);;Tutti i file (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1834"/>
+ <location filename="main_window_slots.cpp" line="1826"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>Chiavi di sessione SSL (*.keys *.txt);;Any File (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1972"/>
+ <location filename="main_window_slots.cpp" line="1964"/>
<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="2382"/>
- <location filename="main_window_slots.cpp" line="3484"/>
+ <location filename="main_window_slots.cpp" line="2374"/>
+ <location filename="main_window_slots.cpp" line="3476"/>
<source>Unable to build conversation filter.</source>
<translation>Impossibile creare il filtro di conversazione.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
- <location filename="main_window_slots.cpp" line="2545"/>
+ <location filename="main_window_slots.cpp" line="2524"/>
+ <location filename="main_window_slots.cpp" line="2537"/>
<source> before reloading the file</source>
<translation>prima di ricaricare il file</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2579"/>
+ <location filename="main_window_slots.cpp" line="2571"/>
<source>No filter available. Try another </source>
<translation>Nessun filtro disponibile. Provane un altro </translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3491"/>
+ <location filename="main_window_slots.cpp" line="3483"/>
<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="3500"/>
+ <location filename="main_window_slots.cpp" line="3492"/>
<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="3577"/>
+ <location filename="main_window_slots.cpp" line="3569"/>
<source>No Interface Selected</source>
<translation>Nessuna interfaccia selezionata</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3584"/>
+ <location filename="main_window_slots.cpp" line="3576"/>
<source> before starting a new capture</source>
<translation>prima di iniziare una nuova cattura</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3602"/>
+ <location filename="main_window_slots.cpp" line="3594"/>
<source> before restarting the capture</source>
<translation>prima di riavviare la cattura</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3815"/>
+ <location filename="main_window_slots.cpp" line="3807"/>
<source>Wiki Page for %1</source>
<translation>Pagina wiki per %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3816"/>
+ <location filename="main_window_slots.cpp" line="3808"/>
<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>
@@ -10035,47 +10040,47 @@ a:hover {
<translation>Riepilogo come testo</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="723"/>
+ <location filename="packet_list.cpp" line="719"/>
<source>Align Left</source>
<translation>Allinea a sinistra</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="724"/>
+ <location filename="packet_list.cpp" line="720"/>
<source>Align Center</source>
<translation>Allinea al centro</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="725"/>
+ <location filename="packet_list.cpp" line="721"/>
<source>Align Right</source>
<translation>Allinea a destra</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="727"/>
+ <location filename="packet_list.cpp" line="723"/>
<source>Column Preferences</source>
<translation>Preferenze delle colonne</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="728"/>
+ <location filename="packet_list.cpp" line="724"/>
<source>Edit Column</source>
<translation>Modifica colonna</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="729"/>
+ <location filename="packet_list.cpp" line="725"/>
<source>Resize To Contents</source>
<translation>Ridimensiona come il contenuto</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="730"/>
+ <location filename="packet_list.cpp" line="726"/>
<source>Resolve Names</source>
<translation>Risolvi i nomi</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="735"/>
+ <location filename="packet_list.cpp" line="731"/>
<source>Remove This Column</source>
<translation>Rimuovi questa colonna</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1093"/>
+ <location filename="packet_list.cpp" line="1085"/>
<source>Frame %1: %2
</source>
@@ -10084,7 +10089,7 @@ a:hover {
</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1097"/>
+ <location filename="packet_list.cpp" line="1089"/>
<source>[ Comment text exceeds %1. Stopping. ]</source>
<translation>[ Il testo del commento supera %1. Interruzione. ]</translation>
</message>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 36212f2502..9bd123d8b5 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -789,12 +789,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="782"/>
+ <location filename="capture_file_dialog.cpp" line="784"/>
<source>%1, error after %2 packets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="789"/>
+ <location filename="capture_file_dialog.cpp" line="791"/>
<source>%1, timed out at %2 packets</source>
<translation type="unfinished"></translation>
</message>
@@ -909,17 +909,17 @@
<translation type="vanished">-</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="728"/>
+ <location filename="capture_file_dialog.cpp" line="730"/>
<source>directory</source>
<translation>ディレクトリ</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="735"/>
+ <location filename="capture_file_dialog.cpp" line="737"/>
<source>unknown file format</source>
<translation>不明なファイルフォーマット</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="737"/>
+ <location filename="capture_file_dialog.cpp" line="739"/>
<source>error opening file</source>
<translation>ファイルオープンエラー</translation>
</message>
@@ -940,7 +940,7 @@
<translation type="vanished">?</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="816"/>
+ <location filename="capture_file_dialog.cpp" line="818"/>
<source>unknown</source>
<translation>不明</translation>
</message>
@@ -6860,6 +6860,11 @@ a:hover {
<source>Copy file path</source>
<translation>ファイルパスをコピー</translation>
</message>
+ <message>
+ <location filename="main_welcome.cpp" line="478"/>
+ <source>Remove</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
@@ -9082,33 +9087,33 @@ a:hover {
<translation>指定プロトコルを有効および無効化します</translation>
</message>
<message>
- <location filename="main_window.cpp" line="437"/>
+ <location filename="main_window.cpp" line="441"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>更新を確認…</translation>
</message>
<message>
- <location filename="main_window.cpp" line="819"/>
+ <location filename="main_window.cpp" line="823"/>
<source> before quitting</source>
<translation>終了前</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1004"/>
+ <location filename="main_window.cpp" line="1008"/>
<source>Save packets before merging?</source>
<translation>結合する前にパケットを保存しますか?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1009"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>一時的なキャプチャファイルは結合することができません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1011"/>
+ <location filename="main_window.cpp" line="1015"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>結合する前に &quot;%1&quot; に変更を保存しますか?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1013"/>
+ <location filename="main_window.cpp" line="1017"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>ファイルを結合する前に変更を保存する必要があります</translation>
</message>
@@ -9118,117 +9123,117 @@ a:hover {
<translation>無効な表示フィルタ</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1050"/>
+ <location filename="main_window.cpp" line="1054"/>
<source>Invalid Read Filter</source>
<translation>無効な読込フィルタ</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1051"/>
+ <location filename="main_window.cpp" line="1055"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>フィルタ式 %1 は有効な読込みフィルタではありません(%2)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1141"/>
+ <location filename="main_window.cpp" line="1145"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation>新しいキャプチャファイルをインポートする前に</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1417"/>
+ <location filename="main_window.cpp" line="1421"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>&quot;%1&quot; をエクスポートすることができません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1418"/>
+ <location filename="main_window.cpp" line="1422"/>
<source>You cannot export packets to the current capture file.</source>
<translation>現在のキャプチャファイルへパケットをエクスポートすることはできません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1505"/>
- <location filename="main_window.cpp" line="1530"/>
+ <location filename="main_window.cpp" line="1509"/>
+ <location filename="main_window.cpp" line="1534"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1581"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation>%1 に作成した変更を保存したいですか?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1573"/>
- <location filename="main_window.cpp" line="1581"/>
+ <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1585"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>保存しない場合キャプチャしたパケットは失われます</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1586"/>
+ <location filename="main_window.cpp" line="1590"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>キャプチャスタイルに行った変更を保存しますか</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
- <location filename="main_window.cpp" line="1587"/>
+ <location filename="main_window.cpp" line="1582"/>
+ <location filename="main_window.cpp" line="1591"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>保存しない場合変更は失われます</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1576"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation>キャプチャを停止してキャプチャしたパケットを保存しますか?%1</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Do you want to save the captured packets%1?</source>
<translation>キャプチャしたパケットを保存しますか?%1</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1604"/>
+ <location filename="main_window.cpp" line="1608"/>
<source>Save before Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1606"/>
+ <location filename="main_window.cpp" line="1610"/>
<source>Stop and Save</source>
<translation>停止して保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1622"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1634"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1621"/>
- <location filename="main_window.cpp" line="1634"/>
+ <location filename="main_window.cpp" line="1625"/>
+ <location filename="main_window.cpp" line="1638"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1624"/>
+ <location filename="main_window.cpp" line="1628"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1956"/>
+ <location filename="main_window.cpp" line="1960"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>ファイル名をUTF-8形式に割り当てできません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1977"/>
+ <location filename="main_window.cpp" line="1981"/>
<source>The Wireshark Network Analyzer</source>
<translation>ワイヤーシャークネットワークアナライザ</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2002"/>
+ <location filename="main_window.cpp" line="2006"/>
<source>Capturing from %1</source>
<translation>%1 からキャプチャ中</translation>
</message>
@@ -9243,52 +9248,52 @@ a:hover {
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="801"/>
+ <location filename="main_window_slots.cpp" line="799"/>
<source>Saving %1</source>
<translation>保存中 %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="839"/>
<source>No interface selected</source>
<translation>インターフェースが選択されていません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="851"/>
+ <location filename="main_window_slots.cpp" line="849"/>
<source>Invalid capture filter</source>
<translation>無効なキャプチャフィルタ</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1099"/>
+ <location filename="main_window_slots.cpp" line="1097"/>
<source>Clear Menu</source>
<translation>メニューをクリア</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1579"/>
+ <location filename="main_window_slots.cpp" line="1577"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Wiresharkが初期化している間お待ちください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1669"/>
+ <location filename="main_window_slots.cpp" line="1667"/>
<source> before closing the file</source>
<translation>ファイルを閉じる前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1757"/>
+ <location filename="main_window_slots.cpp" line="1749"/>
<source>Export Selected Packet Bytes</source>
<translation>選択したパケットバイト列をエクスポート</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1823"/>
+ <location filename="main_window_slots.cpp" line="1815"/>
<source>No Keys</source>
<translation>キーはありません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1824"/>
+ <location filename="main_window_slots.cpp" line="1816"/>
<source>There are no SSL Session Keys to save.</source>
<translation>保存するSSLセッション鍵はありません</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1830"/>
+ <location filename="main_window_slots.cpp" line="1822"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9296,69 +9301,69 @@ a:hover {
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1759"/>
+ <location filename="main_window_slots.cpp" line="1751"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Raw(無加工)データ形式 (*.bin *.dat *.raw);;すべてのファイル(</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1834"/>
+ <location filename="main_window_slots.cpp" line="1826"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>SSLセッション鍵 (*.keys *.txt);;すべてのファイル (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1972"/>
+ <location filename="main_window_slots.cpp" line="1964"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>テキストをコピーできません 別の項目を試してみてください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2382"/>
- <location filename="main_window_slots.cpp" line="3484"/>
+ <location filename="main_window_slots.cpp" line="2374"/>
+ <location filename="main_window_slots.cpp" line="3476"/>
<source>Unable to build conversation filter.</source>
<translation>会話フィルタを作成できません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
- <location filename="main_window_slots.cpp" line="2545"/>
+ <location filename="main_window_slots.cpp" line="2524"/>
+ <location filename="main_window_slots.cpp" line="2537"/>
<source> before reloading the file</source>
<translation>ファイルを再読み込みする前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2579"/>
+ <location filename="main_window_slots.cpp" line="2571"/>
<source>No filter available. Try another </source>
<translation>フィルタが利用できません 別のものを試してください</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3491"/>
+ <location filename="main_window_slots.cpp" line="3483"/>
<source>Error compiling filter for this conversation.</source>
<translation>この対話の間のフィルタ翻訳エラー</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3500"/>
+ <location filename="main_window_slots.cpp" line="3492"/>
<source>No previous/next packet in conversation.</source>
<translation>対話の前/次のパケットがありません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3577"/>
+ <location filename="main_window_slots.cpp" line="3569"/>
<source>No Interface Selected</source>
<translation>インターフェースが選択されていません</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3584"/>
+ <location filename="main_window_slots.cpp" line="3576"/>
<source> before starting a new capture</source>
<translation>新規キャプチャを開始する前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3602"/>
+ <location filename="main_window_slots.cpp" line="3594"/>
<source> before restarting the capture</source>
<translation>キャプチャを再スタートする前に</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3815"/>
+ <location filename="main_window_slots.cpp" line="3807"/>
<source>Wiki Page for %1</source>
<translation>%1 の Wikiページ</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3816"/>
+ <location filename="main_window_slots.cpp" line="3808"/>
<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>
@@ -9991,47 +9996,47 @@ a:hover {
<translation>テキストとしての概要</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="723"/>
+ <location filename="packet_list.cpp" line="719"/>
<source>Align Left</source>
<translation>左揃え</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="724"/>
+ <location filename="packet_list.cpp" line="720"/>
<source>Align Center</source>
<translation>中央揃え</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="725"/>
+ <location filename="packet_list.cpp" line="721"/>
<source>Align Right</source>
<translation>右揃え</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="727"/>
+ <location filename="packet_list.cpp" line="723"/>
<source>Column Preferences</source>
<translation>列の設定</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="728"/>
+ <location filename="packet_list.cpp" line="724"/>
<source>Edit Column</source>
<translation>列の編集</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="729"/>
+ <location filename="packet_list.cpp" line="725"/>
<source>Resize To Contents</source>
<translation>内容にあわせて列幅を揃える</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="730"/>
+ <location filename="packet_list.cpp" line="726"/>
<source>Resolve Names</source>
<translation>名前を解決</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="735"/>
+ <location filename="packet_list.cpp" line="731"/>
<source>Remove This Column</source>
<translation>この列を削除</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1093"/>
+ <location filename="packet_list.cpp" line="1085"/>
<source>Frame %1: %2
</source>
@@ -10040,7 +10045,7 @@ a:hover {
</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1097"/>
+ <location filename="packet_list.cpp" line="1089"/>
<source>[ Comment text exceeds %1. Stopping. ]</source>
<translation>[ コメントテキスト超過 %1 停止中 ]</translation>
</message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 853981c3ed..71880c362d 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -789,12 +789,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="782"/>
+ <location filename="capture_file_dialog.cpp" line="784"/>
<source>%1, error after %2 packets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="789"/>
+ <location filename="capture_file_dialog.cpp" line="791"/>
<source>%1, timed out at %2 packets</source>
<translation type="unfinished"></translation>
</message>
@@ -909,17 +909,17 @@
<translation type="vanished">-</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="728"/>
+ <location filename="capture_file_dialog.cpp" line="730"/>
<source>directory</source>
<translation>katalog</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="735"/>
+ <location filename="capture_file_dialog.cpp" line="737"/>
<source>unknown file format</source>
<translation>nieznany format pliku</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="737"/>
+ <location filename="capture_file_dialog.cpp" line="739"/>
<source>error opening file</source>
<translation>błąd podczas otwierania pliku</translation>
</message>
@@ -940,7 +940,7 @@
<translation type="vanished">?</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="816"/>
+ <location filename="capture_file_dialog.cpp" line="818"/>
<source>unknown</source>
<translation>nieznany</translation>
</message>
@@ -6904,6 +6904,11 @@ text-decoration: underline;
<source>Copy file path</source>
<translation>Kopiuj ścieżkę</translation>
</message>
+ <message>
+ <location filename="main_welcome.cpp" line="478"/>
+ <source>Remove</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
@@ -9126,33 +9131,33 @@ text-decoration: underline;
<translation>Włącz lub wyłącz wybrane protokoły</translation>
</message>
<message>
- <location filename="main_window.cpp" line="437"/>
+ <location filename="main_window.cpp" line="441"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>Sprawdź aktualizacje</translation>
</message>
<message>
- <location filename="main_window.cpp" line="819"/>
+ <location filename="main_window.cpp" line="823"/>
<source> before quitting</source>
<translation>przed wyjściem</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1004"/>
+ <location filename="main_window.cpp" line="1008"/>
<source>Save packets before merging?</source>
<translation>Zapisać pakiety przed scaleniem?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1009"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>Tymczasowy plik przechwytywania nie może zostać scalony.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1011"/>
+ <location filename="main_window.cpp" line="1015"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>Zapisać zmiany w &quot;%1&quot; przed scaleniem?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1013"/>
+ <location filename="main_window.cpp" line="1017"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Zmiany muszą być zapisane przed próbą scalenia plików.</translation>
</message>
@@ -9162,117 +9167,117 @@ text-decoration: underline;
<translation>Niepoprawny filtr</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1050"/>
+ <location filename="main_window.cpp" line="1054"/>
<source>Invalid Read Filter</source>
<translation>Niepoprawny filtr wczytywania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1051"/>
+ <location filename="main_window.cpp" line="1055"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>Postać filtru wczytywania %1 nie jest poprawna. (%2).</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1141"/>
+ <location filename="main_window.cpp" line="1145"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation>przed zaimportowaniem nowego pliku przechwytywania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1417"/>
+ <location filename="main_window.cpp" line="1421"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>Nie można wyeksportować do &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1418"/>
+ <location filename="main_window.cpp" line="1422"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Nie można wyeksportować pakietów do aktualnego pliku.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1505"/>
- <location filename="main_window.cpp" line="1530"/>
+ <location filename="main_window.cpp" line="1509"/>
+ <location filename="main_window.cpp" line="1534"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1581"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation>Czy chcesz zapisać zrobione zmiany %1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1573"/>
- <location filename="main_window.cpp" line="1581"/>
+ <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1585"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>Twoje przechwycone pakiety zostaną utracone jeśli nie zapiszesz ich.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1586"/>
+ <location filename="main_window.cpp" line="1590"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>Czy chcesz zapisać zmiany, które zrobiłeś do pliku przechytywania &quot;%1&quot;%2?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
- <location filename="main_window.cpp" line="1587"/>
+ <location filename="main_window.cpp" line="1582"/>
+ <location filename="main_window.cpp" line="1591"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Twoje zmiany zostaną utracone jeśli nie zapiszesz ich.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1576"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation>Czy chcesz zatrzymać przechwytywanie i zapisać przechwycone pakiety%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Do you want to save the captured packets%1?</source>
<translation>Czy chcesz zapisać przechwycone pakiety%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1604"/>
+ <location filename="main_window.cpp" line="1608"/>
<source>Save before Continue</source>
<translation>Zapisz przed kontynuowaniem</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1606"/>
+ <location filename="main_window.cpp" line="1610"/>
<source>Stop and Save</source>
<translation>Zatrzymaj i zapisz</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1622"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation>Zatrzymaj i wyjdź bez zapisy&amp;wania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1634"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation>Wyjdź bez zapisy&amp;wania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1621"/>
- <location filename="main_window.cpp" line="1634"/>
+ <location filename="main_window.cpp" line="1625"/>
+ <location filename="main_window.cpp" line="1638"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation>Kontynuuj bez zapisy&amp;wania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1624"/>
+ <location filename="main_window.cpp" line="1628"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation>Zatrzymaj i kontynuuj bez zapisy&amp;wania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1956"/>
+ <location filename="main_window.cpp" line="1960"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Nazwa pliku nie może być przekonwertowana do formatu UTF-8)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1977"/>
+ <location filename="main_window.cpp" line="1981"/>
<source>The Wireshark Network Analyzer</source>
<translation>Analizator Wireshark</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2002"/>
+ <location filename="main_window.cpp" line="2006"/>
<source>Capturing from %1</source>
<translation>Przechwytywanie z %1</translation>
</message>
@@ -9287,52 +9292,52 @@ text-decoration: underline;
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="801"/>
+ <location filename="main_window_slots.cpp" line="799"/>
<source>Saving %1</source>
<translation>Zapisywanie %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="839"/>
<source>No interface selected</source>
<translation>Nie wybrano interfejsu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="851"/>
+ <location filename="main_window_slots.cpp" line="849"/>
<source>Invalid capture filter</source>
<translation>Niepoprawny filtr przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1099"/>
+ <location filename="main_window_slots.cpp" line="1097"/>
<source>Clear Menu</source>
<translation>Wyczyść Menu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1579"/>
+ <location filename="main_window_slots.cpp" line="1577"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Proszę czekać, trwa uruchamianie Wiresharka</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1669"/>
+ <location filename="main_window_slots.cpp" line="1667"/>
<source> before closing the file</source>
<translation>przed zapisaniem pliku</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1757"/>
+ <location filename="main_window_slots.cpp" line="1749"/>
<source>Export Selected Packet Bytes</source>
<translation>Eksportuj zaznaczony bajty pakietu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1823"/>
+ <location filename="main_window_slots.cpp" line="1815"/>
<source>No Keys</source>
<translation>Brak kluczy</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1824"/>
+ <location filename="main_window_slots.cpp" line="1816"/>
<source>There are no SSL Session Keys to save.</source>
<translation>Nie ma żadnych kluczy sesji SSL do zapisu.</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1830"/>
+ <location filename="main_window_slots.cpp" line="1822"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9342,69 +9347,69 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1759"/>
+ <location filename="main_window_slots.cpp" line="1751"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>Surowe dane (*.bin *.dat *.raw);;Dowolny plik (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1834"/>
+ <location filename="main_window_slots.cpp" line="1826"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>Klucze sesji SSL (*.keys *.txt);; Dowolny plik (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1972"/>
+ <location filename="main_window_slots.cpp" line="1964"/>
<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="2382"/>
- <location filename="main_window_slots.cpp" line="3484"/>
+ <location filename="main_window_slots.cpp" line="2374"/>
+ <location filename="main_window_slots.cpp" line="3476"/>
<source>Unable to build conversation filter.</source>
<translation>Nie można stworzyć filtru konwersacji.</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
- <location filename="main_window_slots.cpp" line="2545"/>
+ <location filename="main_window_slots.cpp" line="2524"/>
+ <location filename="main_window_slots.cpp" line="2537"/>
<source> before reloading the file</source>
<translation>przed przeładowaniem pliku</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2579"/>
+ <location filename="main_window_slots.cpp" line="2571"/>
<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="3491"/>
+ <location filename="main_window_slots.cpp" line="3483"/>
<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="3500"/>
+ <location filename="main_window_slots.cpp" line="3492"/>
<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="3577"/>
+ <location filename="main_window_slots.cpp" line="3569"/>
<source>No Interface Selected</source>
<translation>Nie wybrano interfejsu</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3584"/>
+ <location filename="main_window_slots.cpp" line="3576"/>
<source> before starting a new capture</source>
<translation>przed wystartowaniem nowego przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3602"/>
+ <location filename="main_window_slots.cpp" line="3594"/>
<source> before restarting the capture</source>
<translation>przed restartem przechwytywania</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3815"/>
+ <location filename="main_window_slots.cpp" line="3807"/>
<source>Wiki Page for %1</source>
<translation>Strona Wiki dla %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3816"/>
+ <location filename="main_window_slots.cpp" line="3808"/>
<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>
@@ -10037,47 +10042,47 @@ text-decoration: underline;
<translation>Podsumowanie jako tekst</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="723"/>
+ <location filename="packet_list.cpp" line="719"/>
<source>Align Left</source>
<translation>Wyrównaj do lewej</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="724"/>
+ <location filename="packet_list.cpp" line="720"/>
<source>Align Center</source>
<translation>Wyrównaj do środka</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="725"/>
+ <location filename="packet_list.cpp" line="721"/>
<source>Align Right</source>
<translation>Wyrównaj do prawej</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="727"/>
+ <location filename="packet_list.cpp" line="723"/>
<source>Column Preferences</source>
<translation>Ustawienia kolumny</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="728"/>
+ <location filename="packet_list.cpp" line="724"/>
<source>Edit Column</source>
<translation>Edytuj kolumnę</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="729"/>
+ <location filename="packet_list.cpp" line="725"/>
<source>Resize To Contents</source>
<translation>Dopasuj szerokość do zawartości</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="730"/>
+ <location filename="packet_list.cpp" line="726"/>
<source>Resolve Names</source>
<translation>Rozwiązuj nazwy</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="735"/>
+ <location filename="packet_list.cpp" line="731"/>
<source>Remove This Column</source>
<translation>Usuń tę kolumnę</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1093"/>
+ <location filename="packet_list.cpp" line="1085"/>
<source>Frame %1: %2
</source>
@@ -10085,7 +10090,7 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1097"/>
+ <location filename="packet_list.cpp" line="1089"/>
<source>[ Comment text exceeds %1. Stopping. ]</source>
<translation>[ Długość komentarza przekracza %1. Wstrzymano. ]</translation>
</message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 698a9f81cd..8f89e18d35 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -789,12 +789,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="782"/>
+ <location filename="capture_file_dialog.cpp" line="784"/>
<source>%1, error after %2 packets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="789"/>
+ <location filename="capture_file_dialog.cpp" line="791"/>
<source>%1, timed out at %2 packets</source>
<translation type="unfinished"></translation>
</message>
@@ -909,17 +909,17 @@
<translation type="vanished">-</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="728"/>
+ <location filename="capture_file_dialog.cpp" line="730"/>
<source>directory</source>
<translation>目录</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="735"/>
+ <location filename="capture_file_dialog.cpp" line="737"/>
<source>unknown file format</source>
<translation>未知文件格式</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="737"/>
+ <location filename="capture_file_dialog.cpp" line="739"/>
<source>error opening file</source>
<translation>打开文件出错</translation>
</message>
@@ -940,7 +940,7 @@
<translation type="vanished">?</translation>
</message>
<message>
- <location filename="capture_file_dialog.cpp" line="816"/>
+ <location filename="capture_file_dialog.cpp" line="818"/>
<source>unknown</source>
<translation>未知</translation>
</message>
@@ -6893,6 +6893,11 @@ text-decoration: underline;
<source>Copy file path</source>
<translation>复制文件路径</translation>
</message>
+ <message>
+ <location filename="main_welcome.cpp" line="478"/>
+ <source>Remove</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
@@ -9115,33 +9120,33 @@ text-decoration: underline;
<translation>启用和禁用特定的协议</translation>
</message>
<message>
- <location filename="main_window.cpp" line="437"/>
+ <location filename="main_window.cpp" line="441"/>
<source>Check for Updates</source>
<oldsource>Check for Updates...</oldsource>
<translation>检查更新</translation>
</message>
<message>
- <location filename="main_window.cpp" line="819"/>
+ <location filename="main_window.cpp" line="823"/>
<source> before quitting</source>
<translation>在退出前</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1004"/>
+ <location filename="main_window.cpp" line="1008"/>
<source>Save packets before merging?</source>
<translation>是否在合并之前保存分组?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1005"/>
+ <location filename="main_window.cpp" line="1009"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>无法合并临时捕获文件。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1011"/>
+ <location filename="main_window.cpp" line="1015"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>是否在合并前保存对“%1”的更改?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1013"/>
+ <location filename="main_window.cpp" line="1017"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>在文件合并之前,其更改必须先保存。</translation>
</message>
@@ -9151,117 +9156,117 @@ text-decoration: underline;
<translation>无效显示过滤器</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1050"/>
+ <location filename="main_window.cpp" line="1054"/>
<source>Invalid Read Filter</source>
<translation>无效读取过滤器</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1051"/>
+ <location filename="main_window.cpp" line="1055"/>
<source>The filter expression %1 isn&apos;t a valid read filter. (%2).</source>
<translation>过滤器表达式 %1 不是有效的读取过滤器 (%2)。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1141"/>
+ <location filename="main_window.cpp" line="1145"/>
<source> before importing a capture</source>
<oldsource> before importing a new capture</oldsource>
<translation> 导入新捕获前</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1417"/>
+ <location filename="main_window.cpp" line="1421"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>无法导出“%1”。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1418"/>
+ <location filename="main_window.cpp" line="1422"/>
<source>You cannot export packets to the current capture file.</source>
<translation>您不能将分组导出到当前捕获文件。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1505"/>
- <location filename="main_window.cpp" line="1530"/>
+ <location filename="main_window.cpp" line="1509"/>
+ <location filename="main_window.cpp" line="1534"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1581"/>
<source>Do you want to save the changes you&apos;ve made%1?</source>
<oldsource>Do you want to save the captured packets</oldsource>
<translation>您是否要保存已做出的更改%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1573"/>
- <location filename="main_window.cpp" line="1581"/>
+ <location filename="main_window.cpp" line="1577"/>
+ <location filename="main_window.cpp" line="1585"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>若不保存,您已经捕获的分组将会丢失。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1586"/>
+ <location filename="main_window.cpp" line="1590"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>是否希望保存对捕获文件“%1”%2 的更改?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1578"/>
- <location filename="main_window.cpp" line="1587"/>
+ <location filename="main_window.cpp" line="1582"/>
+ <location filename="main_window.cpp" line="1591"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>若不保存,您的更改将会丢失。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1572"/>
+ <location filename="main_window.cpp" line="1576"/>
<source>Do you want to stop the capture and save the captured packets%1?</source>
<translation>您是否要停止捕获,并保存已捕获的分组%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1580"/>
+ <location filename="main_window.cpp" line="1584"/>
<source>Do you want to save the captured packets%1?</source>
<translation>您是否要保存已捕获的分组%1?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1604"/>
+ <location filename="main_window.cpp" line="1608"/>
<source>Save before Continue</source>
<translation>继续前保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1606"/>
+ <location filename="main_window.cpp" line="1610"/>
<source>Stop and Save</source>
<translation>停止并保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1618"/>
+ <location filename="main_window.cpp" line="1622"/>
<source>Stop and Quit &amp;without Saving</source>
<oldsource>Stop and Quit without Saving</oldsource>
<translation>停止并退出,不保存(&amp;W)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1634"/>
<source>Quit &amp;without Saving</source>
<oldsource>Quit without Saving</oldsource>
<translation>直接退出,不保存(&amp;W)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1621"/>
- <location filename="main_window.cpp" line="1634"/>
+ <location filename="main_window.cpp" line="1625"/>
+ <location filename="main_window.cpp" line="1638"/>
<source>Continue &amp;without Saving</source>
<oldsource>Continue without Saving</oldsource>
<translation>继续,不保存(&amp;W)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1624"/>
+ <location filename="main_window.cpp" line="1628"/>
<source>Stop and Continue &amp;without Saving</source>
<oldsource>Stop and Continue without Saving</oldsource>
<translation>停止并继续,不保存(&amp;W)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1956"/>
+ <location filename="main_window.cpp" line="1960"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>文件名不能映射到UTF-8</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1977"/>
+ <location filename="main_window.cpp" line="1981"/>
<source>The Wireshark Network Analyzer</source>
<translation>Wireshark 网络分析器</translation>
</message>
<message>
- <location filename="main_window.cpp" line="2002"/>
+ <location filename="main_window.cpp" line="2006"/>
<source>Capturing from %1</source>
<translation>正在捕获 %1</translation>
</message>
@@ -9276,52 +9281,52 @@ text-decoration: underline;
<translation>%1: %2</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="801"/>
+ <location filename="main_window_slots.cpp" line="799"/>
<source>Saving %1</source>
<translation>正在保存 %1</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="841"/>
+ <location filename="main_window_slots.cpp" line="839"/>
<source>No interface selected</source>
<translation>未选中接口</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="851"/>
+ <location filename="main_window_slots.cpp" line="849"/>
<source>Invalid capture filter</source>
<translation>无效捕获过滤器</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1099"/>
+ <location filename="main_window_slots.cpp" line="1097"/>
<source>Clear Menu</source>
<translation>清除菜单</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1579"/>
+ <location filename="main_window_slots.cpp" line="1577"/>
<source>Please wait while Wireshark is initializing</source>
<translation>Wireshark 正在初始化,请稍候</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1669"/>
+ <location filename="main_window_slots.cpp" line="1667"/>
<source> before closing the file</source>
<translation>关闭文件前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1757"/>
+ <location filename="main_window_slots.cpp" line="1749"/>
<source>Export Selected Packet Bytes</source>
<translation>导出选择分组字节流</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1823"/>
+ <location filename="main_window_slots.cpp" line="1815"/>
<source>No Keys</source>
<translation>无密钥</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1824"/>
+ <location filename="main_window_slots.cpp" line="1816"/>
<source>There are no SSL Session Keys to save.</source>
<translation>没有可以保存的 SSL 会话密钥。</translation>
</message>
<message numerus="yes">
- <location filename="main_window_slots.cpp" line="1830"/>
+ <location filename="main_window_slots.cpp" line="1822"/>
<source>Export SSL Session Keys (%Ln key(s))</source>
<oldsource>Export SSL Session Keys (%1 key%2</oldsource>
<translation>
@@ -9329,69 +9334,69 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1759"/>
+ <location filename="main_window_slots.cpp" line="1751"/>
<source>Raw data (*.bin *.dat *.raw);;All Files (</source>
<translation>原始数据 (*.bin *.dat *.raw);;所有文件 (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1834"/>
+ <location filename="main_window_slots.cpp" line="1826"/>
<source>SSL Session Keys (*.keys *.txt);;All Files (</source>
<translation>SSL 会话密钥 (*.keys *.txt);;所有文件 (</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="1972"/>
+ <location filename="main_window_slots.cpp" line="1964"/>
<source>Couldn&apos;t copy text. Try another item.</source>
<translation>无法复制文本。请尝试其他对象。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2382"/>
- <location filename="main_window_slots.cpp" line="3484"/>
+ <location filename="main_window_slots.cpp" line="2374"/>
+ <location filename="main_window_slots.cpp" line="3476"/>
<source>Unable to build conversation filter.</source>
<translation>无法建立对话过滤器。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2532"/>
- <location filename="main_window_slots.cpp" line="2545"/>
+ <location filename="main_window_slots.cpp" line="2524"/>
+ <location filename="main_window_slots.cpp" line="2537"/>
<source> before reloading the file</source>
<translation>重新载入文件前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="2579"/>
+ <location filename="main_window_slots.cpp" line="2571"/>
<source>No filter available. Try another </source>
<translation>无过滤器可用。请尝试其他 </translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3491"/>
+ <location filename="main_window_slots.cpp" line="3483"/>
<source>Error compiling filter for this conversation.</source>
<translation>为此对话编译过滤器时出错。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3500"/>
+ <location filename="main_window_slots.cpp" line="3492"/>
<source>No previous/next packet in conversation.</source>
<translation>此对话中没有上一个/下一个分组。</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3577"/>
+ <location filename="main_window_slots.cpp" line="3569"/>
<source>No Interface Selected</source>
<translation>未选中接口</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3584"/>
+ <location filename="main_window_slots.cpp" line="3576"/>
<source> before starting a new capture</source>
<translation>在开始新捕获前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3602"/>
+ <location filename="main_window_slots.cpp" line="3594"/>
<source> before restarting the capture</source>
<translation>重新开始捕获前</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3815"/>
+ <location filename="main_window_slots.cpp" line="3807"/>
<source>Wiki Page for %1</source>
<translation>%1 的 Wiki 页面</translation>
</message>
<message>
- <location filename="main_window_slots.cpp" line="3816"/>
+ <location filename="main_window_slots.cpp" line="3808"/>
<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>
@@ -10024,47 +10029,47 @@ text-decoration: underline;
<translation>摘要为文本</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="723"/>
+ <location filename="packet_list.cpp" line="719"/>
<source>Align Left</source>
<translation>左对齐</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="724"/>
+ <location filename="packet_list.cpp" line="720"/>
<source>Align Center</source>
<translation>居中对齐</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="725"/>
+ <location filename="packet_list.cpp" line="721"/>
<source>Align Right</source>
<translation>右对齐</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="727"/>
+ <location filename="packet_list.cpp" line="723"/>
<source>Column Preferences</source>
<translation>列首选项</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="728"/>
+ <location filename="packet_list.cpp" line="724"/>
<source>Edit Column</source>
<translation>编辑列</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="729"/>
+ <location filename="packet_list.cpp" line="725"/>
<source>Resize To Contents</source>
<translation>适应内容</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="730"/>
+ <location filename="packet_list.cpp" line="726"/>
<source>Resolve Names</source>
<translation>名称解析</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="735"/>
+ <location filename="packet_list.cpp" line="731"/>
<source>Remove This Column</source>
<translation>删除此列</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1093"/>
+ <location filename="packet_list.cpp" line="1085"/>
<source>Frame %1: %2
</source>
@@ -10072,7 +10077,7 @@ text-decoration: underline;
</translation>
</message>
<message>
- <location filename="packet_list.cpp" line="1097"/>
+ <location filename="packet_list.cpp" line="1089"/>
<source>[ Comment text exceeds %1. Stopping. ]</source>
<translation>[ 注释文本超过 %1。正在停止。 ]</translation>
</message>