[Automatic update for 2016-03-13]

Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id764cddac44715977f4abbd1f55bfc961a1973a4 Reviewed-on: https://code.wireshark.org/review/14443 Reviewed-by: Gerald Combs <gerald@wireshark.org>
author: Gerald Combs <gerald@wireshark.org> 2016-03-13 08:08:50 -0700
committer: Gerald Combs <gerald@wireshark.org> 2016-03-13 15:08:59 +0000
commit: 30563e6c3a87357adf62f175c579d5da11e7e5ea (patch)
tree: 0ef43a957cb021c4155b0d2d22c0c716f7990620
parent: 6f220a343e476fb1df1f98c719b0fedf5c4f8c7f (diff)
17 files changed, 859 insertions, 726 deletions
diff --git a/AUTHORS b/AUTHORS
index 4660c5de36..4c2af69cff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3929,23 +3929,144 @@ João Valverde		<joao.valverde[AT]tecnico.ulisboa.pt>
 
 From git log
 ---------------
+Tom Haynes			<loghyr[AT]primarydata.com>
+Juanjo Martin			<juanjo[AT]rti.com>
+Maarten Bezemer			<maarten.bezemer[AT]gmail.com>
+Petr Gotthard			<petr.gotthard[AT]honeywell.com>
+Marian Ďurkovič			<md[AT]bts.sk>
+Adrian Simionov			<daniel.simionov[AT]gmail.com>
+Mikael Kanstrup			<mikael.kanstrup[AT]gmail.com>
+Luke Mewburn			<luke[AT]mewburn.net>
+dsrsupport			<eugene.exarevsky[AT]dsr-company.com>
+D. Ulis				<daulis0[AT]gmail.com>
+Diederik de Groot		<ddegroot[AT]talon.nl>
+Jim Young			<jyoung[AT]gsu.edu>
+Kevin Bracey			<kevin.bracey[AT]arm.com>
+Chris Brandson			<chris.brandson[AT]gmail.com>
+Gloria Pozuelo			<gloria.pozuelo[AT]bics.com>
+Gregor Beck			<gbeck[AT]sernet.de>
+Mikhail Koreshkov		<drkor[AT]hotbox.ru>
+Tatsuhiro Tsujikawa		<tatsuhiro.t[AT]gmail.com>
+Aditya Jain			<aditya.jain[AT]samsung.com>
+Birol Capa			<birol.capa[AT]siemens.com>
+Cedric Izoard			<cedric.izoard[AT]ceva-dsp.com>
+J. Bruce Fields			<bfields[AT]redhat.com>
+Lukas Emersberger		<lukas.emersberger[AT]gmail.com>
+Marko Hrastovec			<marko.hrastovec[AT]gmail.com>
+Matthieu Coudron		<mattator[AT]gmail.com>
+Philip Rosenberg-Watt		<p.rosenberg-watt[AT]cablelabs.com>
+Sergey Avseyev			<sergey.avseyev[AT]gmail.com>
+Darshan Nevgi			<darshan.sn[AT]samsung.com>
+Jeffrey Smith			<whydoubt[AT]gmail.com>
+Peter Ross			<peter.ross[AT]dsto.defence.gov.au>
+Richard Sharpe			<rsharpe[AT]samba.org>
+Yan Burman			<yanb[AT]mellanox.com>
+anilkumar911			<anilkumar911[AT]gmail.com>
+Alex Badea			<abadea[AT]ixiacom.com>
+Andreas Gruenbacher		<andreas.gruenbacher[AT]gmail.com>
+Daniël van Eeden		<wireshark[AT]myname.nl>
+Dmitry Bazhenov			<dima_b[AT]pigeonpoint.com>
+Hanspeter Portner		<dev[AT]open-music-kontrollers.ch>
+Joseph Huffman			<jhuffman[AT]codeaurora.org>
+Josip Medved			<jmedved[AT]jmedved.com>
+Michal Pazdera			<michal.pazdera[AT]gmail.com>
+Rishi Dev Singh			<rishi.dev[AT]samsung.com>
+Roland Knall			<rknall[AT]gmail.com>
+Sylvain Munaut			<tnt[AT]246tNt.com>
+Tim Furlong			<tim.furlong[AT]gmail.com>
+Weston Andros Adamson		<dros[AT]primarydata.com>
+Yann Lejeune			<ylejeune[AT]netyl.org>
+Alexander Wetzel		<alexander.wetzel[AT]web.de>
+Branislav Makan			<branislav.makan1994[AT]gmail.com>
+Britt McKinley			<bmckinley[AT]sonusnet.com>
+David Morsberger		<dave[AT]morsberger.com>
+DiablosOffens			<DiablosOffens[AT]gmx.de>
+Ebben Aries			<exa[AT]fb.com>
+Edwin Groothuis			<edwin[AT]mavetju.org>
+Eugene Sukhodolin		<eugene[AT]sukhodolin.com>
+John A. Thacker			<johnthacker[AT]gmail.com>
+Julien STAUB			<atsju2[AT]yahoo.fr>
+Jérôme LAFORGE			<jerome.laforge[AT]gmail.com>
+Nicolas S. Dade			<nic.dade[AT]gmail.com>
+Paul Offord			<paul.offord[AT]advance7.com>
+Simon Barber			<simon.barber[AT]meraki.net>
+Thies Moeller			<thies.moeller[AT]baslerweb.com>
+Wasim Abu Moch			<wasim[AT]mellanox.com>
+YFdyh000			<yfdyh000[AT]gmail.com>
+Christoph Schlosser		<christoph.schlosser[AT]br-automation.com>
+Claudius Zingerli		<czingerl[AT]gmail.com>
+Cody Doucette			<doucette[AT]bu.edu>
+Daniel Mack			<daniel[AT]zonque.org>
+Dave Rigby			<daver[AT]couchbase.com>
+Florian Lohoff			<f[AT]zz.de>
+Mark Weel			<markweel[AT]hotmail.com>
+Martin Tibenský			<martin.tibensky[AT]alcatel-lucent.com>
+Nathan Cole			<nath[AT]thecoleresidence.co.uk>
+Pascal Artho			<pascalartho[AT]gmail.com>
+Pedro Jose Marron		<pjmarron[AT]locoslab.com>
+Peter Membrey			<peter[AT]membrey.hk>
+Ryan Mullen			<rmmullen[AT]gmail.com>
+Shu Shen			<shu.shen[AT]gmail.com>
+Tigran Mkrtchyan		<tigran.mkrtchyan[AT]desy.de>
+Vasil Velichckov		<vvvelichkov[AT]gmail.com>
+Alan Partis			<alpartis[AT]thundernet.com>
+Alexander Gärtner		<sphinxs1988[AT]googlemail.com>
+Alexander Stein			<alexanders83[AT]web.de>
+Andreas Schultz			<aschultz[AT]warp10.net>
+Aurelien Aptel			<aaptel[AT]suse.com>
+Christian Lamparter		<chunkeey[AT]googlemail.com>
+Christian Tellefsen		<chris-git[AT]tellefsen.net>
+Christoph Burger-Scheidlin	<mail[AT]christoph.burger-scheidlin.name>
+Christoph Jähnigen		<nuabaranda[AT]web.de>
+Christopher Kilgour		<techie[AT]whiterocker.com>
+David Ameiss			<david[AT]ameissnet.com>
+Dhiru Kholia			<kholia[AT]kth.se>
+Dom Gifford			<Dominic.Gifford[AT]atmel.com>
+Francois Schneider		<francois.schneider[AT]airbus.com>
+Jamil Nimeh			<jnimeh[AT]gmail.com>
+Jason Heimann			<jheimann[AT]pertino.com>
+Jean Thomas			<jeanthomas[AT]sierrawireless.com>
+Jo Rueschel			<wireshark[AT]rueschel.de>
+Josef Baumgartner		<josef.baumgartner[AT]br-automation.com>
+Kevin Grigorenko		<kevin.grigorenko[AT]us.ibm.com>
+Lotte Steenbrink		<lotte[AT]zombietetris.de>
+Luca Melette			<luca[AT]srlabs.de>
+Luke Chou			<luke.chou[AT]gmail.com>
+Marcel Essig			<marcel.essig[AT]gmx.de>
+Marius				<mareko.paliga[AT]gmail.com>
+Michael Oed			<michael.oed[AT]gmail.com>
+Michal Prívozník		<mprivozn[AT]redhat.com>
+Michele Baldessari		<michele[AT]acksyn.org>
+Mike Gerschefske		<msgersch2[AT]gmail.com>
+Moraney Jalil			<moraney.jalil[AT]outlook.com>
+Noel Power			<noel.power[AT]suse.com>
+Owen Williams			<williams.owen[AT]gmail.com>
+Pavel Karneliuk			<pavel_karneliuk[AT]epam.com>
+Pavlos Antoniou			<pant[AT]intracom-telecom.com>
+Ray Gomez			<rayvincent.gomez[AT]gmail.com>
+Richard Kuemmel			<kuemmel.ric[AT]googlemail.com>
+Robert Cragie			<robert.cragie[AT]arm.com>
+Shinjo Park			<peremen[AT]gmail.com>
+Slava Shwartsman		<slavash[AT]mellanox.com>
+Sven Eckelmann			<sven[AT]open-mesh.com>
+Tobias Brunner			<tobias[AT]strongswan.org>
+Vikhyat Umrao			<vumrao[AT]redhat.com>
+Vikram Hegde			<vikram.h[AT]samsung.com>
+Vincent Helfre			<vincent.helfre[AT]gmx.net>
+Vincenzo Reale			<smart2128[AT]baslug.org>
+Volker Lendecke			<vl[AT]samba.org>
+Warren Moxam			<warrenmptgrey[AT]gmail.com>
+anonsvn				<anonsvn[AT]localhost>
+Дмитрий Цветцих			<dmitrycvet[AT]gmail.com>
 Adam Goldman			<adam.goldman[AT]intel.com>
 Adam Pridgen			<adam.pridgen[AT]thecoverofnight.com>
-Aditya Jain			<aditya.jain[AT]samsung.com>
-Adrian Simionov			<daniel.simionov[AT]gmail.com>
+Adrian				<daniel.simionov[AT]gmail.com>
 Adrian-Ken Rueegsegger		<ken[AT]codelabs.ch>
-Alan Partis			<alpartis[AT]thundernet.com>
-Alex Badea			<abadea[AT]ixiacom.com>
 Alex Tessmer			<dev[AT]tessmer.me>
 AlexL				<loginov.alex.valer[AT]gmail.com>
-Alexander Gärtner		<sphinxs1988[AT]googlemail.com>
-Alexander Stein			<alexanders83[AT]web.de>
-Alexander Wetzel		<alexander.wetzel[AT]web.de>
 Ambarish Malpani		<ambarish[AT]defend7.com>
 Amine Kherbouche		<amine.kherbouche[AT]6wind.com>
-Andreas Gruenbacher		<andreas.gruenbacher[AT]gmail.com>
 Andreas Leibold			<andreas.leibold[AT]harman.com>
-Andreas Schultz			<aschultz[AT]warp10.net>
 Andreas Stieger			<andreas.stieger[AT]gmx.de>
 Andreas Urke			<arurke[AT]netwurke.com>
 Andrei Cipu			<acipu[AT]ixiacom.com>
@@ -3958,7 +4079,6 @@ Anthony Coddington		<anthony.coddington[AT]endace.com>
 Anton Thomasson			<anton.thomasson[AT]ericsson.com>
 Arnd Hannemann			<arnd[AT]arndnet.de>
 Artur Nowosielski		<artnowo[AT]gmail.com>
-Aurelien Aptel			<aaptel[AT]suse.com>
 Basil				<addremover[AT]gmail.com>
 Bastien Bailly			<babassbailly[AT]free.fr>
 Ben Burwell			<bburwell[AT]lutron.com>
@@ -3966,211 +4086,119 @@ Ben Fox-Moore			<ben.foxmoore[AT]accelleran.com>
 Benjamin Hesmans		<benjamin.hesmans[AT]uclouvain.be>
 Benjamin Roch			<benjamin.roch[AT]tttech.com>
 Bertrand Bonnefoy-Claudet	<bertrandbc[AT]gmail.com>
-Birol Capa			<birol.capa[AT]siemens.com>
 Bradford Boyle			<bradford.d.boyle[AT]gmail.com>
-Branislav Makan			<branislav.makan1994[AT]gmail.com>
-Britt McKinley			<bmckinley[AT]sonusnet.com>
 Cathy Yang Y			<cathy.y.yang[AT]ericsson.com>
-Cedric Izoard			<cedric.izoard[AT]ceva-dsp.com>
 Cedric Izoard			<cedric.izoard[AT]rivierawaves.com>
 Cenk Gündoğan			<cnkgndgn[AT]gmail.com>
 Charles Nepveu			<charles.nepveu[AT]verint.com>
-Chris Brandson			<chris.brandson[AT]gmail.com>
 Chris Dunlop			<chris.dunlop3[AT]gmail.com>
-Christian Lamparter		<chunkeey[AT]googlemail.com>
 Christian M. Amsüss		<chrysn[AT]fsfe.org>
-Christian Tellefsen		<chris-git[AT]tellefsen.net>
-Christoph Burger-Scheidlin	<mail[AT]christoph.burger-scheidlin.name>
-Christoph Jähnigen		<nuabaranda[AT]web.de>
-Christoph Schlosser		<christoph.schlosser[AT]br-automation.com>
-Christopher Kilgour		<techie[AT]whiterocker.com>
 Chuan He			<bupthc[AT]gmail.com>
 Chugzilla			<chugzilla77[AT]gmail.com>
 Chun-Yeow Yeoh			<yeohchunyeow[AT]gmail.com>
-Claudius Zingerli		<czingerl[AT]gmail.com>
-Cody Doucette			<doucette[AT]bu.edu>
 Cédric Delmas			<cedricde[AT]outlook.fr>
-D. Ulis				<daulis0[AT]gmail.com>
-Daniel Mack			<daniel[AT]zonque.org>
 Daniel Stenberg			<daniel[AT]haxx.se>
-Daniël van Eeden		<wireshark[AT]myname.nl>
-Darshan Nevgi			<darshan.sn[AT]samsung.com>
-Dave Rigby			<daver[AT]couchbase.com>
 Dave Tapuska			<dtapuska[AT]google.com>
-David Ameiss			<david[AT]ameissnet.com>
 David Arnold			<d[AT]0x1.org>
 David Creswick			<dcrewi[AT]gyrae.net>
-David Morsberger		<dave[AT]morsberger.com>
+David Snowdon			<daves[AT]metamako.com>
 David Tapuska			<dave[AT]tapuska.com>
 Denis Janssen			<janssend[AT]gmail.com>
 Dhananjay Patki			<dhpatki[AT]cisco.com>
-Dhiru Kholia			<kholia[AT]kth.se>
-DiablosOffens			<DiablosOffens[AT]gmx.de>
 Didier Arenzana			<darenzana[AT]yahoo.fr>
-Diederik de Groot		<ddegroot[AT]talon.nl>
-Dmitry Bazhenov			<dima_b[AT]pigeonpoint.com>
-Dom Gifford			<Dominic.Gifford[AT]atmel.com>
 Doug Brown			<doug[AT]downtowndougbrown.com>
-Ebben Aries			<exa[AT]fb.com>
 Edward Dao			<edmailbox[AT]gmail.com>
-Edwin Groothuis			<edwin[AT]mavetju.org>
+Eric Anderson			<andersoe[AT]cs.cmu.edu>
 Etienne Millon			<etienne[AT]cryptosense.com>
 Eugene Adell			<eugene.adell[AT]d2-si.eu>
-Eugene Sukhodolin		<eugene[AT]sukhodolin.com>
 Fabian Raetz			<fabian.raetz[AT]gmail.com>
 Fabrizio Demaria		<fabrizio.demaria[AT]intel.com>
-Florian Lohoff			<f[AT]zz.de>
-Francois Schneider		<francois.schneider[AT]airbus.com>
 Ganesh Nawsupe			<ganesh991[AT]gmail.com>
 Garming Sam			<garming[AT]catalyst.net.nz>
 Gergely Nagy			<ngg[AT]ngg.hu>
-Gloria Pozuelo			<gloria.pozuelo[AT]bics.com>
-Gregor Beck			<gbeck[AT]sernet.de>
 Gregor Jasny			<gjasny[AT]googlemail.com>
 Gregor Miernik			<gregor.miernik[AT]hytec.de>
 Guy Davies			<aguydavies[AT]gmail.com>
-Hanspeter Portner		<dev[AT]open-music-kontrollers.ch>
 Herwin Weststrate		<herwin[AT]quarantainenet.nl>
 Hiroaki KAWAI			<hiroaki.kawai[AT]gmail.com>
 Ilya Gavrilov			<ilya.dev[AT]gmail.com>
 Ionut Ceausu			<ionut.ceausu[AT]gmail.com>
-J. Bruce Fields			<bfields[AT]redhat.com>
 JC Wren				<jcwren[AT]jcwren.com>
 James Coleman			<jamesc[AT]dspsrv.com>
-Jamil Nimeh			<jnimeh[AT]gmail.com>
 Jan Kaisrlik			<j.kaisrlik[AT]seznam.cz>
 Jan Seda			<hodor[AT]hodor.cz>
 Jan-Hendrik Bolte		<jabolte[AT]uos.de>
-Jason Heimann			<jheimann[AT]pertino.com>
-Jean Thomas			<jeanthomas[AT]sierrawireless.com>
-Jeffrey Smith			<whydoubt[AT]gmail.com>
 Jeroen Roovers			<jer[AT]gentoo.org>
 Jeroen Sack			<jeroen[AT]jeroensack.nl>
-Jim Young			<jyoung[AT]gsu.edu>
-Jo Rueschel			<wireshark[AT]rueschel.de>
 Johan Wahl			<johan.wahl[AT]ericsson.com>
-John A. Thacker			<johnthacker[AT]gmail.com>
 John Miner			<optommp[AT]gmail.com>
 Jonas Falkevik			<jonas.falkevik[AT]gmail.com>
 Jorge Power			<jpower[AT]rsscorp.org>
-Josef Baumgartner		<josef.baumgartner[AT]br-automation.com>
-Joseph Huffman			<jhuffman[AT]codeaurora.org>
-Josip Medved			<jmedved[AT]jmedved.com>
 Juan Jose Martin Carrascosa	<juanjo[AT]rti.com>
 Juan Matias			<jmrepetti[AT]gmail.com>
-Juanjo Martin			<juanjo[AT]rti.com>
-Julien STAUB			<atsju2[AT]yahoo.fr>
 Jun Wang			<sdn_app[AT]163.com>
 JustinKu			<jiunrong[AT]gmail.com>
-Jérôme LAFORGE			<jerome.laforge[AT]gmail.com>
 Kary Rogers			<kary.rogers[AT]gmail.com>
-Kevin Bracey			<kevin.bracey[AT]arm.com>
-Kevin Grigorenko		<kevin.grigorenko[AT]us.ibm.com>
 Krishna Chaitanya		<chaitanya.mgit[AT]gmail.com>
 Lars Sundström			<lars.x.sundstrom[AT]ericsson.com>
 Lasse Luttermann Poulsen	<lasse.luttermann[AT]gmail.com>
 Laurenz Kamp			<laurenz.kamp[AT]gmx.de>
 Lev Stipakov			<lstipakov[AT]gmail.com>
-Lotte Steenbrink		<lotte[AT]zombietetris.de>
-Luca Melette			<luca[AT]srlabs.de>
-Lukas Emersberger		<lukas.emersberger[AT]gmail.com>
-Luke Chou			<luke.chou[AT]gmail.com>
-Luke Mewburn			<luke[AT]mewburn.net>
-Maarten Bezemer			<maarten.bezemer[AT]gmail.com>
 Malcolm Walters			<malcolm.walters[AT]acano.com>
 Marc Bevand			<mbevand[AT]google.com>
 Marc Fournier			<marc.fournier[AT]camptocamp.com>
-Marcel Essig			<marcel.essig[AT]gmx.de>
-Marian Ďurkovič			<md[AT]bts.sk>
-Marius				<mareko.paliga[AT]gmail.com>
 Mark Cunningham			<launchpad[AT]markcunningham.ie>
-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>
 Matej Košík			<5764c029b688c1c0d24a2e97cd764f[AT]gmail.com>
-Matthieu Coudron		<mattator[AT]gmail.com>
 Micha Reiser			<michafamreiser.ch>
 Michael Adam			<obnox[AT]samba.org>
 Michael McConville		<mmcco[AT]mykolab.com>
-Michael Oed			<michael.oed[AT]gmail.com>
 Michael Pergament		<mpergament[AT]googlemail.com>
-Michal Pazdera			<michal.pazdera[AT]gmail.com>
-Michal Prívozník		<mprivozn[AT]redhat.com>
-Michele Baldessari		<michele[AT]acksyn.org>
-Mikael Kanstrup			<mikael.kanstrup[AT]gmail.com>
 Mike Frysinger			<vapier[AT]chromium.org>
-Mike Gerschefske		<msgersch2[AT]gmail.com>
-Mikhail Koreshkov		<drkor[AT]hotbox.ru>
 Miltos Patsiouras		<mipatsio[AT]gmail.com>
-Moraney Jalil			<moraney.jalil[AT]outlook.com>
 Moshe Kaplan			<me[AT]moshekaplan.com>
-Nathan Cole			<nath[AT]thecoleresidence.co.uk>
 Nick Bedbury			<npbedbur[AT]syr.edu>
 Nick Carter			<ncarter100[AT]gmail.com>
 Nicolas Cavallari		<nicolas.cavallari[AT]green-communications.fr>
-Nicolas S. Dade			<nic.dade[AT]gmail.com>
 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>
 Oren Koler			<clicker78[AT]gmail.com>
 Orgad Shaneh			<orgads[AT]gmail.com>
 Oscar Gonzalez de Dios		<oscar.gonzalezdedios[AT]telefonica.com>
 Osman Sakalla			<osman.sakalla[AT]ericsson.com>
-Owen Williams			<williams.owen[AT]gmail.com>
-Pascal Artho			<pascalartho[AT]gmail.com>
 Patrice Fournier		<patrice.fournier[AT]ifax.com>
 Patrick MacArthur		<pmacarth[AT]iol.unh.edu>
 Patrick Servello		<patrick.servello[AT]gmail.com>
 Paul Emge			<paul.emge[AT]digidescorp.com>
-Paul Offord			<paul.offord[AT]advance7.com>
-Pavel Karneliuk			<pavel_karneliuk[AT]epam.com>
 Pavel Moravec			<mgr.pavel[AT]gmail.com>
 Pavel Odintsov			<pavel.odintsov[AT]gmail.com>
 Pavel Strnad			<pavel_strnad[AT]hotmail.com>
-Pavlos Antoniou			<pant[AT]intracom-telecom.com>
-Pedro Jose Marron		<pjmarron[AT]locoslab.com>
 Peng Li				<seudut[AT]gmail.com>
 Peng Tao			<tao.peng[AT]primarydata.com>
-Peter Membrey			<peter[AT]membrey.hk>
 Peter Palúch			<Peter.Paluch[AT]fri.uniza.sk>
-Peter Ross			<peter.ross[AT]dsto.defence.gov.au>
-Petr Gotthard			<petr.gotthard[AT]honeywell.com>
 Petr Štetiar			<petr.stetiar[AT]gaben.cz>
-Philip Rosenberg-Watt		<p.rosenberg-watt[AT]cablelabs.com>
 Philipp Hancke			<fippo[AT]andyet.net>
 Pino Toscano			<pino[AT]debian.org>
-Ray Gomez			<rayvincent.gomez[AT]gmail.com>
+Remi Gacogne			<remi.gacogne[AT]powerdns.com>
 Ricardo Cristian Ramirez	<r.cristian.ramirez[AT]gmail.com>
 Rich Coe			<richcoe2[AT]gmail.com>
-Richard Kuemmel			<kuemmel.ric[AT]googlemail.com>
-Richard Sharpe			<rsharpe[AT]samba.org>
-Rishi Dev Singh			<rishi.dev[AT]samsung.com>
 Robert Beardsworth		<rob_beardsworth[AT]hotmail.com>
-Robert Cragie			<robert.cragie[AT]arm.com>
 Robert Cragie			<robert.cragie[AT]gmail.com>
 Robert P			<tehownt[AT]gmail.com>
-Roland Knall			<rknall[AT]gmail.com>
 Roman Leonhartsberger		<ro.leonhartsberger[AT]gmail.com>
 Roman Volkov			<volkoff_roman[AT]ukr.net>
 Russel Howe			<russel[AT]appliedinvention.com>
 Rustam Safargalin		<rustam.safargalin[AT]sifox.ru>
-Ryan Mullen			<rmmullen[AT]gmail.com>
 Sebastian Kloeppel		<sk[AT]nakedape.net>
 Sebastian Schildt		<sebastian[AT]frozenlight.de>
 Selva Kumar			<v.selvamuthukumar[AT]gmail.com>
 Selvamegala			<sselvamegala[AT]gmail.com>
-Sergey Avseyev			<sergey.avseyev[AT]gmail.com>
 Sergio Moreno Mozota		<sergio.morenomozota[AT]telefonica.com>
 Shekhar Chandra			<ranushekhar[AT]gmail.com>
-Shinjo Park			<peremen[AT]gmail.com>
 Shoichi Sakane			<wireshark-shoichi[AT]tanu.org>
-Shu Shen			<shu.shen[AT]gmail.com>
 Simon Barber			<sbarber[AT]parc.com>
-Simon Barber			<simon.barber[AT]meraki.net>
 Simon Zhong			<szhong.jnpr[AT]gmail.com>
-Slava Shwartsman		<slavash[AT]mellanox.com>
 Soumya Koduri			<skoduri[AT]redhat.com>
 Steev Klimaszewski		<threeway[AT]gmail.com>
 Stefan Doehla			<stefan.doehla[AT]iis.fraunhofer.de>
@@ -4179,49 +4207,25 @@ Stephan Kappertz		<octopus.sk[AT]googlemail.com>
 Stephane Bryant			<stephane.ml.bryant[AT]gmail.com>
 Stephen Donnelly		<stephen.donnelly[AT]emulex.com>
 Sunil Mushran			<sunil.mushran[AT]oracle.com>
-Sven Eckelmann			<sven[AT]open-mesh.com>
-Sylvain Munaut			<tnt[AT]246tNt.com>
-Tatsuhiro Tsujikawa		<tatsuhiro.t[AT]gmail.com>
-Thies Moeller			<thies.moeller[AT]baslerweb.com>
-Tigran Mkrtchyan		<tigran.mkrtchyan[AT]desy.de>
 Tim (Thanh) Nguyen		<tnnguyen[AT]broadcom.com>
-Tim Furlong			<tim.furlong[AT]gmail.com>
 Timo Warns			<timow+github[AT]DiningPhilosopher.DE>
 Timothy Geiser			<slimshady007[AT]inbox.lv>
-Tobias Brunner			<tobias[AT]strongswan.org>
 Tobias Stoeckmann		<tobias[AT]stoeckmann.org>
-Tom Haynes			<loghyr[AT]primarydata.com>
 Trond Myklebust			<trond.myklebust[AT]primarydata.com>
 Umberto Corponi			<umberto.corponi[AT]athonet.com>
-Vasil Velichckov		<vvvelichkov[AT]gmail.com>
 Victor Dodon			<dodonvictor[AT]gmail.com>
 Victor Voronkov			<victor.voronkov[AT]gmail.com>
 Vik				<vkp129+ubuntu[AT]gmail.com>
-Vikhyat Umrao			<vumrao[AT]redhat.com>
 Vikram Hegde			<vikram.h[AT]amsung.com>
-Vikram Hegde			<vikram.h[AT]samsung.com>
 Ville Skyttä			<ville.skytta[AT]iki.fi>
-Vincent Helfre			<vincent.helfre[AT]gmx.net>
-Vincenzo Reale			<smart2128[AT]baslug.org>
 Vladimir Kondratiev		<qca_vkondrat[AT]qca.qualcomm.com>
-Volker Lendecke			<vl[AT]samba.org>
-Warren Moxam			<warrenmptgrey[AT]gmail.com>
-Wasim Abu Moch			<wasim[AT]mellanox.com>
-Weston Andros Adamson		<dros[AT]primarydata.com>
 Weston Schmidt			<weston_schmidt[AT]alumni.purdue.edu>
 Xavier Brouckaert		<xabrouck[AT]cisco.com>
-YFdyh000			<yfdyh000[AT]gmail.com>
-Yan Burman			<yanb[AT]mellanox.com>
-Yann Lejeune			<ylejeune[AT]netyl.org>
 Yasuyuki Tanaka			<yatch[AT]isl.rdc.toshiba.co.jp>
-anilkumar911			<anilkumar911[AT]gmail.com>
-anonsvn				<anonsvn[AT]localhost>
 cff339				<cff339[AT]gmail.com>
-dsrsupport			<eugene.exarevsky[AT]dsr-company.com>
 kardam				<netkardam[AT]gmail.com>
 kkoizumi			<kkoizumi46[AT]gmail.com>
 Øyvind Rønningstad		<ronningstad[AT]gmail.com>
-Дмитрий Цветцих			<dmitrycvet[AT]gmail.com>
 
 
 Acknowledgements
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 8c1785d7a5..9ae392131e 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2016-03-06)
+(last updated 2016-03-13)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -6374,9 +6374,9 @@ Decimal
     Ole Rieck Sorensen
       ors&cri.dk
 1590
-  LuchtVerkeersBeveiliging
-    D. Helmer
-      sss&lvb.nl
+  Luchtverkeersleiding Nederland
+    Antony Verheijen
+      a.p.a.verheijen&lvnl.nl
 1591
   GTIL
     Yakov Roitman
@@ -142858,7 +142858,7 @@ Decentralization / Helenic Public Administra
 35819
   Digithurst Bildverarbeitungssysteme
     Raimund Jakobsmeyer
-      rja&msdesign.de
+      rja&digithurst.de
 35820
   RCS Kladno, s.r.o.
     Petr Paryzek
@@ -176856,9 +176856,9 @@ Decentralization / Helenic Public Administra
     Mohamad Fajar Aditya Masyhur
       aditya_mh&telkom.co.id
 44319
-  Tulsa Cancer Institute PLLC
+  Oklahoma Cancer Specialists and Research Institute
     Russell McCarty
-      Russell.McCarty&tciok.org
+      Russell.McCarty&ocsri.org
 44320
   Lake Norman Hematology Oncology
     Betty Adams
@@ -188824,7 +188824,7 @@ Decentralization / Helenic Public Administra
     Nicolas Dubost
       systeme&botanic.com
 47311
-  Seacomp
+  Seacomp s.r.o.
     Ivo Hlavaty
       admin&seacomp.cz
 47312
@@ -188883,6 +188883,142 @@ Decentralization / Helenic Public Administra
   Suzhou Robot Information Technology Co.,Ltd.
     Yin Haibo
       yhb&szrobot.net
+47326
+  yanyuxieyang
+    dong pan
+      361435262&qq.com
+47327
+  Kassenärztliche Vereinigung Nordrhein
+    Cornelius Vaessen
+      Zertifikate&kvno.de
+47328
+  Simulity Labs
+    Colin Tebbutt
+      colin.tebbutt&simulity.com
+47329
+  Stancke Transporte GmbH & Co. KG
+    Christoph Becker
+      it&stancke.com
+47330
+  Murrelektronik GmbH
+    Daniel Wolfram
+      licenses.rnd&murrelektronik.de
+47331
+  Pro:Atria Ltd.
+    Adi Roiban
+      adi.roiban&proatria.com
+47332
+  Current, powered by GE
+    SiNguyen Vo
+      singuyen.vo&ge.com
+47333
+  Asintel, S.L.
+    Victor Orero
+      info&asintel.net
+47334
+  trendytech
+    Xiaoyin Liu
+      liuxy&trendytech.com.cn
+47335
+  Superwave Group LLC
+    Dmitriy Novokhatniy
+      admin&swgroup.ru
+47336
+  Iguana Comunicacions SL
+    Aleix Solé Romeu
+      aleix.sole&iguana.cat
+47337
+  Security On-Demand, Inc.
+    Marcus Rosenberg
+      sysadmin&securityondemand.com
+47338
+  Bob Ziuchkovski Free/Libre and Open Source Software
+    Bob Ziuchkovski
+      bob.ziuchkovski&gmail.com
+47339
+  Hessware GmbH
+    Sebastian Heß
+      shess&hessware.de
+47340
+  Handysoft,co.ltd.
+    Kim keehwan
+      kimkeehwan&handysoft.co.kr
+47341
+  Syllaba Press International Inc.
+    Ernesto Rodriguez
+      info&syllabapress.us
+47342
+  VITAL WILLIAM CONSEIL
+    William VITAL
+      william.vital&william-vital.fr
+47343
+  ElektronIT GmbH
+    Jörn Volkhausen
+      service&elektronit.de
+47344
+  COMSYS Communications Systems Service GmbH
+    Robert Sander
+      robert.sander&comsysgmbh.de
+47345
+  Variant
+    Oleg Avrutin
+      avrutin&variant.kiev.ua
+47346
+  Laurenz Wagner
+    Laurenz Wagner
+      mail&ldd.li
+47347
+  MIRACL
+    John McCane-Whitney
+      john.mccane-whitney&miracl.com
+47348
+  Centro de Tradições Nordestinas
+    Arthur Stanev
+      cti&radioatual.com.br
+47349
+  Rockwell Automation
+    Julie Farrell
+      jmfarrell&ra.rockwell.com
+47350
+  Securian Financial Group
+    Nicholas LaFleur
+      nick.lafleur&securian.com
+47351
+  Premium Security Broadband
+    Tony Ledbetter
+      tledbetter&utiglobal.com
+47352
+  AMPAREX GmbH
+    Thomas Marquardt
+      thomas.marquardt&amparex.com
+47353
+  HornasjövägenIT
+    Tom Tjörnhed
+      tom.tjornhed&gmail.com
+47354
+  Avista Corporation
+    Security Operations
+      corpsecurityoperations&avistacorp.com
+47355
+  Metamarkets
+    Jeff Strunk
+      jeff.strunk&metamarkets.com
+47356
+  Cress Enterprises
+    Michael Cress
+      michael.cress&cress.us
+47357
+  Technology Concepts & Design, Inc.
+    Terry Spotts
+      t_spotts&tcdi.com
+47358
+  HenzHome Services
+    Tobias Henz
+      tobias.henz&henzhome.ch
+47359
+  stary tec
+    staryzhou
+      staryzhou&163.com
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 97033956d6..ef97ce12d7 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -1610,7 +1610,7 @@ const value_string sminmpec_values[] = {
     {  1587, "Switched Network Technologies (SNT)" },
     {  1588, "Brocade Communications Systems, Inc." },
     {  1589, "Computer Resources International A/S (CRI)" },
-    {  1590, "LuchtVerkeersBeveiliging" },
+    {  1590, "Luchtverkeersleiding Nederland" },
     {  1591, "GTIL" },
     {  1592, "XactLabs Corporation" },
     {  1593, "Quest Software, Inc. (formerly 'NetPro Computing, Inc.')" },
@@ -44339,7 +44339,7 @@ const value_string sminmpec_values[] = {
     { 44316, "Softneta UAB" },
     { 44317, "Kanton Zug (www.zg.ch)" },
     { 44318, "PT. Telekomunikasi Indonesia" },
-    { 44319, "Tulsa Cancer Institute PLLC" },
+    { 44319, "Oklahoma Cancer Specialists and Research Institute" },
     { 44320, "Lake Norman Hematology Oncology" },
     { 44321, "TrilioData, Inc" },
     { 44322, "Shenzhen Mailian Electronics Co.,Ltd" },
@@ -47331,7 +47331,7 @@ const value_string sminmpec_values[] = {
     { 47308, "Lanbowan Technology Ltd." },
     { 47309, "Sofia Digital, Ltd." },
     { 47310, "botanic" },
-    { 47311, "Seacomp" },
+    { 47311, "Seacomp s.r.o." },
     { 47312, "Searidge Technologies" },
     { 47313, "Adenon Bilisim ve Iletisim Tek. San. ve Tic. Ltd. Sti." },
     { 47314, "Torrential Data Solutions, Inc." },
@@ -47346,6 +47346,40 @@ const value_string sminmpec_values[] = {
     { 47323, "TrustKo" },
     { 47324, "Mokop, Bartosz Rebe\0305\0233" },
     { 47325, "Suzhou Robot Information Technology Co.,Ltd." },
+    { 47326, "yanyuxieyang" },
+    { 47327, "Kassen\0303\0244rztliche Vereinigung Nordrhein" },
+    { 47328, "Simulity Labs" },
+    { 47329, "Stancke Transporte GmbH & Co. KG" },
+    { 47330, "Murrelektronik GmbH" },
+    { 47331, "Pro:Atria Ltd." },
+    { 47332, "Current, powered by GE" },
+    { 47333, "Asintel, S.L." },
+    { 47334, "trendytech" },
+    { 47335, "Superwave Group LLC" },
+    { 47336, "Iguana Comunicacions SL" },
+    { 47337, "Security On-Demand, Inc." },
+    { 47338, "Bob Ziuchkovski Free/Libre and Open Source Software" },
+    { 47339, "Hessware GmbH" },
+    { 47340, "Handysoft,co.ltd." },
+    { 47341, "Syllaba Press International Inc." },
+    { 47342, "VITAL WILLIAM CONSEIL" },
+    { 47343, "ElektronIT GmbH" },
+    { 47344, "COMSYS Communications Systems Service GmbH" },
+    { 47345, "Variant" },
+    { 47346, "Laurenz Wagner" },
+    { 47347, "MIRACL" },
+    { 47348, "Centro de Tradi\0303\0247\0303\0265es Nordestinas" },
+    { 47349, "Rockwell Automation" },
+    { 47350, "Securian Financial Group" },
+    { 47351, "Premium Security Broadband" },
+    { 47352, "AMPAREX GmbH" },
+    { 47353, "Hornasj\0303\0266v\0303\0244genIT" },
+    { 47354, "Avista Corporation" },
+    { 47355, "Metamarkets" },
+    { 47356, "Cress Enterprises" },
+    { 47357, "Technology Concepts & Design, Inc." },
+    { 47358, "HenzHome Services" },
+    { 47359, "stary tec" },
     {    0, NULL}
 };
 
diff --git a/manuf b/manuf
index 479ff2eed5..21757b741d 100644
--- a/manuf
+++ b/manuf
@@ -5905,7 +5905,7 @@
 00:16:F8	Aviqtech               # AVIQTECH TECHNOLOGY CO., LTD.
 00:16:F9	CetrtaPo               # CETRTA POT, d.o.o., Kranj
 00:16:FA	EciTelec               # ECI Telecom Ltd.
-00:16:FB	Shenzhen               # SHENZHEN MTC CO.,LTD.
+00:16:FB	Shenzhen               # SHENZHEN MTC CO LTD
 00:16:FC	Tohken                 # TOHKEN CO.,LTD.
 00:16:FD	JatyElec               # Jaty Electronics
 00:16:FE	AlpsElec               # ALPS ELECTRIC CO.,LTD.
@@ -6910,7 +6910,7 @@
 00:1A:E5	MvoxTech               # Mvox Technologies Inc.
 00:1A:E6	AtlantaA               # Atlanta Advanced Communications Holdings Limited
 00:1A:E7	AztekNet               # Aztek Networks, Inc.
-00:1A:E8	UnifyAnd               # Unify GmbH and Co KG
+00:1A:E8	UnifySof               # Unify Software and Solutions GmbH & Co. KG
 00:1A:E9	Nintendo               # Nintendo Co., Ltd.
 00:1A:EA	RadioTer               # Radio Terminal Systems Pty Ltd
 00:1A:EB	AlliedTe               # Allied Telesis R&D Center K.K.
@@ -15144,6 +15144,7 @@
 00:5B:A1	Shanghai               # shanghai huayuan chuangxin software CO., LTD.
 00:5C:B1	GospellD               # Gospell DIGITAL TECHNOLOGY CO., LTD
 00:5D:03	XilinxIn               # Xilinx, Inc
+00:5F:86	CiscoInc               # Cisco Systems, Inc
 00:60:00	Xycom                  # XYCOM INC.
 00:60:01	Innosys                # InnoSys, Inc.
 00:60:02	ScreenSu               # SCREEN SUBTITLING SYSTEMS, LTD
@@ -15959,6 +15960,7 @@
 00:9A:CD	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 00:9C:02	HewlettP               # Hewlett Packard
 00:9D:8E	CardiacR               # CARDIAC RECORDERS, INC.
+00:9E:1E	CiscoInc               # Cisco Systems, Inc
 00:9E:C8	XiaomiCo               # Xiaomi Communications Co Ltd
 00:A0:00	Centilli               # CENTILLION NETWORKS, INC.
 00:A0:01	DrsSigna               # DRS Signal Solutions
@@ -17416,6 +17418,7 @@
 08:00:8E	TandemCo               # Tandem Computers
 08:00:8F	ChipcomC               # CHIPCOM CORPORATION
 08:00:90	Retix
+08:01:0F	SichuanT               # SICHUAN TIANYI COMHEART TELECOMCO.,LTD
 08:03:71	KrgCorpo               # KRG CORPORATE
 08:05:81	Roku                   # Roku, Inc.
 08:05:CD	Dongguan               # DongGuang EnMai Electronic Product Co.Ltd.
@@ -17569,6 +17572,7 @@
 0C:1D:AF	XiaomiCo               # Xiaomi Communications Co Ltd
 0C:1D:C2	SeahNetw               # SeAH Networks
 0C:20:26	NoaxTech               # noax Technologies AG
+0C:25:76	Longchee               # LONGCHEER TELECOMMUNICATION LIMITED
 0C:27:24	CiscoInc               # Cisco Systems, Inc
 0C:27:55	Valuable               # Valuable Techologies Limited
 0C:2A:69	Electric               # electric imp, incorporated
@@ -18351,6 +18355,7 @@
 1C:B1:7F	NecPlatf               # NEC Platforms, Ltd.
 1C:B2:43	TdcA/S                 # TDC A/S
 1C:B7:2C	AsustekC               # ASUSTek COMPUTER INC.
+1C:B9:C4	RuckusWi               # Ruckus Wireless
 1C:BA:8C	TexasIns               # Texas Instruments
 1C:BB:A8	OjscUfim               # OJSC Ufimskiy Zavod Promsvyaz
 1C:BD:0E	Amplifie               # Amplified Engineering Pty Ltd
@@ -19322,6 +19327,7 @@
 38:1C:1A	CiscoInc               # Cisco Systems, Inc
 38:1C:23	HilanTec               # Hilan Technology CO.,LTD
 38:1C:4A	SimcomWi               # SIMCom Wireless Solutions Co.,Ltd.
+38:1D:D9	Fn-LinkT               # FN-LINK TECHNOLOGY LIMITED
 38:20:56	CiscoInc               # Cisco Systems, Inc
 38:21:87	MideaGro               # Midea Group Co., Ltd.
 38:22:9D	AdbBroad               # ADB Broadband Italia
@@ -19365,6 +19371,7 @@
 38:70:0C	ArrisGro               # ARRIS Group, Inc.
 38:71:DE	Apple                  # Apple, Inc.
 38:72:C0	Comtrend               # Comtrend Corporation
+38:76:D1	EurondaS               # Euronda SpA
 38:7B:47	Akela                  # AKELA, Inc.
 38:83:45	Tp-LinkT               # TP-LINK TECHNOLOGIES CO.,LTD.
 38:86:02	Flexopti               # Flexoptix GmbH
@@ -20313,6 +20320,7 @@
 44:3C:9C	PintschT               # Pintsch Tiefenbach GmbH
 44:3D:21	Nuvolt                 # Nuvolt
 44:3E:B2	Deotron                # DEOTRON Co., LTD.
+44:44:50	Ottoq                  # OttoQ
 44:45:53	Microsoft
 44:46:49	DfiDiamo               # DFI (Diamond Flower Industries)
 44:48:91	HdmiLice               # HDMI Licensing, LLC
@@ -20507,6 +20515,7 @@
 48:C0:49	BroadTel               # Broad Telecom SA
 48:C0:93	Xirrus                 # Xirrus, Inc.
 48:C1:AC	Plantron               # PLANTRONICS, INC.
+48:C6:63	GtoAcces               # GTO Access Systems LLC
 48:C8:62	SimoWire               # Simo Wireless,Inc.
 48:C8:B6	SystecGm               # SysTec GmbH
 48:CB:6E	CelloEle               # Cello Electronics (UK) Ltd
@@ -20760,6 +20769,7 @@
 50:A7:2B	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 50:A7:33	RuckusWi               # Ruckus Wireless
 50:A9:DE	Smartcom               # Smartcom - Bulgaria AD
+50:AB:3E	QibixxAg               # Qibixx AG
 50:AB:BF	HoseoTel               # Hoseo Telecom
 50:AD:D5	DynalecC               # Dynalec Corporation
 50:AF:73	Shenzhen               # Shenzhen Bitland Information Technology Co., Ltd.
@@ -20796,6 +20806,7 @@
 50:F0:D3	SamsungE               # Samsung Electronics Co.,Ltd
 50:F4:3C	LeeoInc                # Leeo Inc
 50:F5:20	SamsungE               # Samsung Electronics Co.,Ltd
+50:F5:DA	AmazonTe               # Amazon Technologies Inc.
 50:F6:1A	KunshanJ               # Kunshan JADE Technologies co., Ltd.
 50:FA:84	Tp-LinkT               # TP-LINK TECHNOLOGIES CO.,LTD.
 50:FA:AB	L-TekDOO               # L-tek d.o.o.
@@ -21303,6 +21314,7 @@
 60:36:96	SaplingC               # The Sapling Company
 60:36:DD	IntelCor               # Intel Corporate
 60:38:0E	AlpsElec               # ALPS ELECTRIC CO.,LTD.
+60:38:E0	BelkinIn               # Belkin International Inc.
 60:39:1F	AbbLtd                 # ABB Ltd
 60:3E:CA	Cambridg               # Cambridge Medical Robotics Ltd
 60:3F:C5	CoxLtd                 # COX CO., LTD
@@ -21321,6 +21333,7 @@
 60:5B:B4	Azurewav               # AzureWave Technology Inc.
 60:60:1F	SzDjiTec               # SZ DJI TECHNOLOGY CO.,LTD
 60:63:FD	Transcen               # Transcend Communication Beijing Co.,Ltd.
+60:64:53	Aod                    # AOD Co.,Ltd.
 60:64:A1	Radiflow               # RADiflow Ltd.
 60:67:20	IntelCor               # Intel Corporate
 60:69:44	Apple                  # Apple, Inc.
@@ -21806,7 +21819,7 @@
 6C:92:BF	InspurEl               # Inspur Electronic Information Industry Co.,Ltd.
 6C:93:54	YaojinTe               # Yaojin Technology (Shenzhen) Co., LTD.
 6C:94:F8	Apple                  # Apple, Inc.
-6C:98:EB	OcedoGmb               # Ocedo GmbH
+6C:98:EB	Riverbed               # Riverbed Technology, Inc.
 6C:99:89	CiscoInc               # Cisco Systems, Inc
 6C:9A:C9	Valentin               # Valentine Research, Inc.
 6C:9B:02	NokiaCor               # Nokia Corporation
@@ -22009,6 +22022,7 @@
 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	ElesarLi               # Elesar Limited
+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:D0:00/36	SiconSrl               # Sicon srl
@@ -22301,6 +22315,7 @@
 70:B3:D5:43:90:00/36	Triled                 # TriLED
 70:B3:D5:43:B0:00/36	Kalycito               # Kalycito Infotech Private Limited
 70:B3:D5:43:D0:00/36	VeryxTec               # Veryx Technologies Private Limited
+70:B3:D5:44:00:00/36	Discover               # Discover Video
 70:B3:D5:44: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
@@ -22353,6 +22368,8 @@
 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.
+70:B3:D5:50:80:00/36	InsevisG               # INSEVIS GmbH
+70:B3:D5:50:E0:00/36	MicroTre               # Micro Trend Automation Co., LTD
 70:B3:D5:51:70:00/36	Ispher                 # ISPHER
 70:B3:D5:51:D0:00/36	TecnintH               # Tecnint HTE SRL
 70:B3:D5:51:E0:00/36	Fundació               # Fundación Cardiovascular de Colombia
@@ -22555,6 +22572,7 @@
 70:B3:D5:7F:10:00/36	Aerovisi               # AeroVision Avionics, Inc.
 70:B3:D5:7F:20:00/36	Tci                    # TCI
 70:B3:D5:7F:80:00/36	SolveraL               # Solvera Lynx d.d.
+70:B3:D5:80:40:00/36	PmtCorpo               # PMT Corporation
 70:B3:D5:80:A0:00/36	SensingL               # SENSING LABS
 70:B3:D5:80:D0:00/36	DataPhys               # Data Physics Corporation
 70:B3:D5:80:F0:00/36	Quickwar               # Quickware Eng & Des LLC
@@ -22584,6 +22602,7 @@
 70:B3:D5:87:00:00/36	BentrupI               # bentrup Industriesteuerungen
 70:B3:D5:87:10:00/36	OsoTechn               # Oso Technologies
 70:B3:D5:87:50:00/36	PeekTraf               # Peek Traffic
+70:B3:D5:87:90:00/36	ZigposGm               # ZIGPOS GmbH
 70:B3:D5:87:B0:00/36	LiquidIn               # Liquid Instruments Pty Ltd
 70:B3:D5:88:20:00/36	SimonTec               # SIMON TECH, S.L.
 70:B3:D5:88:A0:00/36	Percepti               # Perceptics, LLC
@@ -22611,6 +22630,7 @@
 70:B3:D5:8E:10:00/36	Woka-Ele               # WoKa-Elektronik GmbH
 70:B3:D5:8E:F0:00/36	BeeperCo               # Beeper Communications Ltd.
 70:B3:D5:8F:00:00/36	Eraeseed               # ERAESEEDS co.,ltd.
+70:B3:D5:8F:20:00/36	RimotaLi               # Rimota Limited
 70:B3:D5:8F:30:00/36	TattileS               # TATTILE SRL
 70:B3:D5:8F:50:00/36	Stmovic                # Stmovic
 70:B3:D5:8F:60:00/36	Dofuntec               # Dofuntech Co.,LTD.
@@ -22643,6 +22663,7 @@
 70:B3:D5:96:F0:00/36	4camGmbh               # 4CAM GmbH
 70:B3:D5:97:40:00/36	JirehInd               # Jireh Industries Ltd.
 70:B3:D5:97:50:00/36	CoesterA               # Coester Automação Ltda
+70:B3:D5:97:C0:00/36	Nu-TekPo               # Nu-Tek Power Controls and Automation
 70:B3:D5:98:60:00/36	AplexTec               # Aplex Technology Inc.
 70:B3:D5:99:40:00/36	KeffNetw               # KeFF Networks
 70:B3:D5:99:50:00/36	LaytecAg               # LayTec AG
@@ -22735,6 +22756,7 @@
 70:B3:D5:AD:60:00/36	Lemonade               # Lemonade Lab Inc
 70:B3:D5:AD:A0:00/36	Private                # Private
 70:B3:D5:AD:D0:00/36	GhlBerha               # GHL Systems Berhad
+70:B3:D5:AD:E0:00/36	IsacSrl                # ISAC SRL
 70:B3:D5:AE:00:00/36	Anycomm                # AnyComm.Co.,Ltd.
 70:B3:D5:AE:10:00/36	Dimocore               # DimoCore Corporation
 70:B3:D5:AE:20:00/36	TransasM               # Transas Marine Limited
@@ -22817,6 +22839,7 @@
 70:B3:D5:C0:10:00/36	Smartgua               # SmartGuard LLC
 70:B3:D5:C0:30:00/36	XaviTech               # XAVi Technologies Corp.
 70:B3:D5:C0:70:00/36	Areco                  # ARECO
+70:B3:D5:C1:B0:00/36	Labinven               # Labinvent JSC
 70:B3:D5:C2:10:00/36	AplexTec               # Aplex Technology Inc.
 70:B3:D5:C2:40:00/36	ElbitOfA               # Elbit Systems of America - Fort Worth Operations
 70:B3:D5:C2:50:00/36	Speedsig               # speedsignal GmbH
@@ -22854,6 +22877,7 @@
 70:B3:D5:C9:70:00/36	Csinfote               # CSINFOTEL
 70:B3:D5:C9:B0:00/36	TietoSwe               # Tieto Sweden AB
 70:B3:D5:C9:D0:00/36	ApgCashD               # APG Cash Drawer
+70:B3:D5:C9:F0:00/36	TriaxA/S               # Triax A/S
 70:B3:D5:CA:80:00/36	GrupoEpe               # Grupo Epelsa S.L.
 70:B3:D5:CA:90:00/36	Nxcontro               # Nxcontrol system Co., Ltd.
 70:B3:D5:CA:C0:00/36	Crde                   # CRDE
@@ -22963,6 +22987,7 @@
 70:B3:D5:E2:60:00/36	Feitian                # FEITIAN CO.,LTD.
 70:B3:D5:E2:70:00/36	Woodside               # Woodside Electronics
 70:B3:D5:E2:80:00/36	IotecGmb               # iotec GmbH
+70:B3:D5:E2:E0:00/36	MerzSRO                # Merz s.r.o.
 70:B3:D5:E3:00:00/36	QuissAg                # QUISS AG
 70:B3:D5:E3:50:00/36	Nanospee               # Nanospeed Technologies Limited
 70:B3:D5:E3:60:00/36	Guidance               # Guidance Navigation Limited
@@ -22989,6 +23014,7 @@
 70:B3:D5:E7:A0:00/36	ArtSpa                 # ART SPA
 70:B3:D5:E7:C0:00/36	AplexTec               # Aplex Technology Inc.
 70:B3:D5:E7:E0:00/36	GroupeCi               # Groupe Citypassenger Inc
+70:B3:D5:E8:50:00/36	Explorer               # Explorer Inc.
 70:B3:D5:E9:00:00/36	GeteinBi               # Getein Biotechnology Co.,ltd
 70:B3:D5:E9:20:00/36	FujiData               # FUJI DATA SYSTEM CO.,LTD.
 70:B3:D5:E9:30:00/36	EconTech               # ECON Technology Co.Ltd
@@ -23042,6 +23068,7 @@
 70:B3:D5:F3:60:00/36	Dinosys                # dinosys
 70:B3:D5:F3:80:00/36	Scanvaeg               # Scanvaegt Nordic A/S
 70:B3:D5:F3:90:00/36	ZenrosAp               # Zenros ApS
+70:B3:D5:F3:C0:00/36	Gigaray                # Gigaray
 70:B3:D5:F4:C0:00/36	GlobalLi               # Global Lightning Protection Services A(S
 70:B3:D5:F4:D0:00/36	Honeywel               # Honeywell International Inc.
 70:B3:D5:F5:40:00/36	Revoluti               # Revolution Retail Systems
@@ -23261,6 +23288,7 @@
 74:C6:3B	Azurewav               # AzureWave Technology Inc.
 74:C9:9A	Ericsson               # Ericsson AB
 74:CA:25	Calxeda                # Calxeda, Inc.
+74:CC:39	Fiberhom               # Fiberhome Telecommunication Technologies Co.,LTD
 74:CD:0C	SmithMye               # Smith Myers Communications Ltd.
 74:CE:56	PacketFo               # Packet Force Technology Limited Company
 74:D0:2B	AsustekC               # ASUSTek COMPUTER INC.
@@ -24317,6 +24345,7 @@
 8C:CD:E8	Nintendo               # Nintendo Co., Ltd.
 8C:CF:5C	BefegaGm               # BEFEGA GmbH
 8C:D1:7B	CgMobile               # CG Mobile
+8C:D2:E9	NipponSm               # NIPPON SMT Co.Ltｄ
 8C:D3:A2	VissimAs               # VisSim AS
 8C:D6:28	IkorMete               # Ikor Metering
 8C:DB:25	EsgSolut               # ESG Solutions
@@ -24528,6 +24557,7 @@
 94:10:3E	BelkinIn               # Belkin International Inc.
 94:11:DA	ItfFrösc               # ITF Fröschl GmbH
 94:16:73	PointCor               # Point Core SARL
+94:18:82	HewlettP               # Hewlett Packard Enterprise
 94:1D:1C	TlabWest               # TLab West Systems AB
 94:20:53	NokiaCor               # Nokia Corporation
 94:21:97	Stalmart               # Stalmart Technology Limited
@@ -24556,6 +24586,7 @@
 94:53:30	HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
 94:54:93	RigadoLl               # Rigado, LLC
 94:57:A5	HewlettP               # Hewlett Packard
+94:59:07	Shanghai               # Shanghai HITE-BELDEN Network Technology Co., Ltd.
 94:59:2D	EkeBuild               # EKE Building Technology Systems Ltd
 94:5B:7E	Trilobit               # TRILOBIT LTDA.
 94:61:24	PasonSys               # Pason Systems
@@ -25407,6 +25438,7 @@ A8:AD:3D	Alcatel-               # Alcatel-Lucent Shanghai Bell Co., Ltd
 A8:B0:AE	Leoni                  # LEONI 
 A8:B1:D4	CiscoInc               # Cisco Systems, Inc
 A8:B9:B3	Essys                  # ESSYS
+A8:BB:50	WizIotLi               # WiZ IoT Company Limited
 A8:BB:CF	Apple                  # Apple, Inc.
 A8:BD:1A	HoneyBee               # Honey Bee (Hong Kong) Limited
 A8:BD:3A	Unionman               # UNIONMAN TECHNOLOGY CO.,LTD
@@ -26569,6 +26601,7 @@ C8:4C:75	CiscoInc               # Cisco Systems, Inc
 C8:51:95	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 C8:56:45	Intermas               # Intermas France
 C8:56:63	SunflexE               # Sunflex Europe GmbH
+C8:5B:76	LcfcHefe               # LCFC(HeFei) Electronics Technology co., ltd
 C8:60:00	AsustekC               # ASUSTek COMPUTER INC.
 C8:64:C7	ZteCorpo               # zte corporation
 C8:66:5D	Aerohive               # Aerohive Networks Inc.
@@ -26816,7 +26849,16 @@ CC:CD:64	Sm-Elect               # SM-Electronic GmbH
 CC:CE:40	JanteqCo               # Janteq Corp
 CC:D2:9B	Shenzhen               # Shenzhen Bopengfa Elec&Technology CO.,Ltd
 CC:D3:1E	IeeeRegi               # IEEE Registration Authority
+CC:D3:1E:00:00:00/28	SamimCo                # SAMIM Co
+CC:D3:1E:10:00:00/28	RondoBur               # Rondo Burgdorf AG
+CC:D3:1E:20:00:00/28	NeptuneS               # Neptune Systems
+CC:D3:1E:50:00:00/28	NtmoreLt               # NTmore.Co.,Ltd
+CC:D3:1E:60:00:00/28	BbposInt               # BBPOS International Limited
+CC:D3:1E:80:00:00/28	InoageGm               # inoage GmbH
+CC:D3:1E:A0:00:00/28	HaishuTe               # Haishu Technology LIMITED
 CC:D3:1E:B0:00:00/28	ElkProdu               # Elk Products
+CC:D3:1E:C0:00:00/28	FluidicE               # Fluidic Energy
+CC:D3:1E:D0:00:00/28	CujoLlc                # CUJO LLC
 CC:D3:E2	JiangsuY               # Jiangsu Yinhe  Electronics Co.,Ltd.
 CC:D5:39	CiscoInc               # Cisco Systems, Inc
 CC:D8:11	AiconnTe               # Aiconn Technology Corporation
@@ -26973,6 +27015,7 @@ D0:A6:37	Apple                  # Apple, Inc.
 D0:AE:EC	AlphaNet               # Alpha Networks Inc.
 D0:AF:B6	LinktopT               # Linktop Technology Co., LTD
 D0:B0:CD	Moen                   # Moen
+D0:B2:C4	Technico               # Technicolor CH USA Inc.
 D0:B3:3F	Shenzhen               # Shenzhen TINNO Mobile Technology Corp.
 D0:B4:98	RobertBo               # Robert Bosch LLC Automotive Electronics
 D0:B5:23	Bestcare               # Bestcare Cloucal Corp.
@@ -27338,6 +27381,7 @@ DC:1D:9F	UBTech                 # U & B tech
 DC:1D:D4	Microste               # Microstep-MIS spol. s r.o.
 DC:1E:A3	Accensus               # Accensus LLC
 DC:20:08	AsdElect               # ASD Electronics Ltd 
+DC:29:3A	Shenzhen               # Shenzhen Science and Technology Co., Ltd. when Nor
 DC:2A:14	Shanghai               # Shanghai Longjing Technology Co.
 DC:2B:2A	Apple                  # Apple, Inc.
 DC:2B:61	Apple                  # Apple, Inc.
@@ -27676,6 +27720,7 @@ E4:58:E7	SamsungE               # Samsung Electronics Co.,Ltd
 E4:5A:A2	VivoMobi               # vivo Mobile Communication Co., Ltd.
 E4:5D:52	AvayaInc               # Avaya Inc
 E4:5D:75	SamsungE               # Samsung Electronics Co.,Ltd
+E4:62:51	HaoCheng               # HAO CHENG GROUP LIMITED
 E4:64:49	ArrisGro               # ARRIS Group, Inc.
 E4:67:BA	DanishIn               # Danish Interpretation Systems A/S
 E4:68:A3	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
@@ -28094,6 +28139,7 @@ F0:3A:4B	Bloombas               # Bloombase, Inc.
 F0:3A:55	OmegaEle               # Omega Elektronik AS
 F0:3D:29	Actility               # Actility
 F0:3E:90	RuckusWi               # Ruckus Wireless
+F0:3E:BF	GogoroTa               # GOGORO TAIWAN LIMITED
 F0:3F:F8	RLDrake                # R L Drake
 F0:40:7B	Fiberhom               # Fiberhome Telecommunication Technologies Co.,LTD
 F0:43:35	DvnShang               # DVN(Shanghai)Ltd.
@@ -28199,7 +28245,7 @@ F0:F7:55	CiscoInc               # Cisco Systems, Inc
 F0:F7:B3	Phorm                  # Phorm
 F0:F8:42	Keebox                 # KEEBOX, Inc.
 F0:F9:F7	IesKg                  # IES GmbH & Co. KG
-F0:FD:A0	AcurixNe               # Acurix Networks LP
+F0:FD:A0	AcurixNe               # Acurix Networks Pty Ltd
 F0:FE:6B	Shanghai               # Shanghai High-Flying Electronics Technology Co., Ltd
 F4:03:04	Google                 # Google, Inc.
 F4:03:21	BenextBV               # BeNeXt B.V.
@@ -28580,6 +28626,7 @@ FC:4D:D4	Universa               # Universal Global Scientific Industrial Co., Lt
 FC:50:90	SimexSpZ               # SIMEX Sp. z o.o.
 FC:52:8D	Technico               # Technicolor CH USA
 FC:52:CE	ControlI               # Control iD
+FC:55:DC	BalticLa               # Baltic Latvian Universal Electronics LLC
 FC:58:FA	ShenZhen               # Shen Zhen Shi Xin Zhong Xin Technology Co.,Ltd.
 FC:5B:24	WeibelSc               # Weibel Scientific A/S
 FC:5B:26	Mikrobit               # MikroBits
diff --git a/services b/services
index 1d93a26e7e..ddd3cf63ad 100644
--- a/services
+++ b/services
@@ -3294,8 +3294,8 @@ dialogic-elmd    1945/tcp # dialogic-elmd [Roger_Kay] [Roger_Kay]
 dialogic-elmd    1945/udp # dialogic-elmd [Roger_Kay] [Roger_Kay]
 tekpls           1946/tcp # tekpls [Brian_Abramson_2] [Brian_Abramson_2]
 tekpls           1946/udp # tekpls [Brian_Abramson_2] [Brian_Abramson_2]
-sentinelsrm      1947/tcp # SentinelSRM [Michael_Zunke_2] [Michael_Zunke_2] 2010-07-23
-sentinelsrm      1947/udp # SentinelSRM [Michael_Zunke_2] [Michael_Zunke_2] 2010-07-23
+sentinelsrm      1947/tcp # SentinelSRM [Michael_Zunke_2] [Michael_Zunke_2] 2010-07-23 Unauthorized Use Known on port 1947
+sentinelsrm      1947/udp # SentinelSRM [Michael_Zunke_2] [Michael_Zunke_2] 2010-07-23 Unauthorized Use Known on port 1947
 eye2eye          1948/tcp # eye2eye [Trevor_Bell] [Trevor_Bell]
 eye2eye          1948/udp # eye2eye [Trevor_Bell] [Trevor_Bell]
 ismaeasdaqlive   1949/tcp # ISMA Easdaq Live [Stephen_Dunne] [Stephen_Dunne]
diff --git a/ui/qt/wireshark_de.qm b/ui/qt/wireshark_de.qm
index 313cedaf3a..abcc3d5d26 100644
--- a/ui/qt/wireshark_de.qm
+++ b/ui/qt/wireshark_de.qm
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 4ecaedee25..b93333aa58 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -563,13 +563,9 @@
         <translation>Kein mögliches Dateiformat unterstützt Kommentare. Möchten Sie die Kommentare verwerfen und in dem ausgewählten Format speichern?</translation>
     </message>
     <message>
-        <source>All Files (*.*)</source>
-        <translation type="vanished">Alle Dateien (*.*)</translation>
-    </message>
-    <message>
         <location filename="capture_file_dialog.cpp" line="392"/>
         <source>All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Dateien (</translation>
     </message>
     <message>
         <location filename="capture_file_dialog.cpp" line="398"/>
@@ -1398,83 +1394,83 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
         <translation>Leer lassen um eine temporäre Datei zu verwenden</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>enabled</source>
         <translation>aktivieren</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>disabled</source>
         <translation>deaktivieren</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="258"/>
+        <location filename="capture_interfaces_dialog.cpp" line="260"/>
         <source>Specify a Capture File</source>
         <translation>Eine Mitschnittdatei angeben</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Addresses</source>
         <translation>Adressen</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="468"/>
+        <location filename="capture_interfaces_dialog.cpp" line="470"/>
         <source>no addresses</source>
         <translation>keine Adressen</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="519"/>
+        <location filename="capture_interfaces_dialog.cpp" line="521"/>
         <source>default</source>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="509"/>
-        <location filename="capture_interfaces_dialog.cpp" line="510"/>
+        <location filename="capture_interfaces_dialog.cpp" line="511"/>
         <location filename="capture_interfaces_dialog.cpp" line="512"/>
-        <location filename="capture_interfaces_dialog.cpp" line="515"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="514"/>
+        <location filename="capture_interfaces_dialog.cpp" line="517"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>n/a</source>
         <translation>Nicht verfügbar</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="683"/>
-        <location filename="capture_interfaces_dialog.cpp" line="691"/>
-        <location filename="capture_interfaces_dialog.cpp" line="702"/>
-        <location filename="capture_interfaces_dialog.cpp" line="706"/>
-        <location filename="capture_interfaces_dialog.cpp" line="719"/>
-        <location filename="capture_interfaces_dialog.cpp" line="727"/>
+        <location filename="capture_interfaces_dialog.cpp" line="685"/>
+        <location filename="capture_interfaces_dialog.cpp" line="693"/>
+        <location filename="capture_interfaces_dialog.cpp" line="704"/>
+        <location filename="capture_interfaces_dialog.cpp" line="708"/>
+        <location filename="capture_interfaces_dialog.cpp" line="721"/>
+        <location filename="capture_interfaces_dialog.cpp" line="729"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="684"/>
-        <location filename="capture_interfaces_dialog.cpp" line="692"/>
-        <location filename="capture_interfaces_dialog.cpp" line="720"/>
-        <location filename="capture_interfaces_dialog.cpp" line="728"/>
+        <location filename="capture_interfaces_dialog.cpp" line="686"/>
+        <location filename="capture_interfaces_dialog.cpp" line="694"/>
+        <location filename="capture_interfaces_dialog.cpp" line="722"/>
+        <location filename="capture_interfaces_dialog.cpp" line="730"/>
         <source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
         <translation>Dateisatz: Angeforderte Dateigröße zu groß! Die Dateigröße kann nicht größer als 2 GiB sein.</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="703"/>
+        <location filename="capture_interfaces_dialog.cpp" line="705"/>
         <source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
         <translation>Dateisatz: Keinen Dateinamen angeben! Wenn ein Dateisatz genutzt werden soll, muss ein Dateiname angegeben werden.</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="707"/>
+        <location filename="capture_interfaces_dialog.cpp" line="709"/>
         <source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
  if you want to use multiple files.</source>
         <translation>Dateisatz: Kein Limit angegeben! Wenn ein Dateisatz genutzt werden soll, muss eine Dateigröße oder eine Laufzeit angegeben werden, bei der zur nächsten Datei gewechselt wird</translation>
@@ -2455,13 +2451,9 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
 <context>
     <name>ExtcapArgumentFileSelection</name>
     <message>
-        <source>Any File (*.*)</source>
-        <translation type="vanished">Alle Dateien (*.*)</translation>
-    </message>
-    <message>
         <location filename="extcap_argument_file.cpp" line="112"/>
         <source>All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Dateien (</translation>
     </message>
     <message>
         <location filename="extcap_argument_file.cpp" line="121"/>
@@ -4371,16 +4363,16 @@ für die Filterdateien kann nicht erstellt werden:
 <context>
     <name>InterfaceTreeDelegate</name>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1021"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1053"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1102"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1122"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1023"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1055"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1104"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1124"/>
         <source>enabled</source>
         <translation>aktiviert</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1022"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1054"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1024"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1056"/>
         <source>disabled</source>
         <translation>deaktiviert</translation>
     </message>
@@ -6591,32 +6583,32 @@ text-decoration: underline;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="226"/>
+        <location filename="main_welcome.cpp" line="224"/>
         <source>You are running Wireshark </source>
         <translation>Sie nutzen Wireshark </translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="228"/>
+        <location filename="main_welcome.cpp" line="226"/>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="231"/>
+        <location filename="main_welcome.cpp" line="229"/>
         <source> You receive automatic updates.</source>
         <translation>Updates werden automatisch heruntergeladen.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="233"/>
+        <location filename="main_welcome.cpp" line="231"/>
         <source> You have disabled automatic updates.</source>
         <translation>Automatische Aktualisierung ist deaktiviert.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="374"/>
+        <location filename="main_welcome.cpp" line="372"/>
         <source>not found</source>
         <translation>nicht gefunden</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="453"/>
+        <location filename="main_welcome.cpp" line="451"/>
         <source>Copy file path</source>
         <translation>Dateipfad kopieren</translation>
     </message>
@@ -9353,36 +9345,32 @@ text-decoration: underline;
         <translation>Menüeinträge löschen</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1575"/>
+        <location filename="main_window_slots.cpp" line="1576"/>
         <source>Please wait while Wireshark is initializing</source>
         <translation>Bitte Warten während Wireshark initalisiert wird</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1656"/>
+        <location filename="main_window_slots.cpp" line="1657"/>
         <source> before closing the file</source>
         <translation>vor dem Schließen der Datei</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1733"/>
+        <location filename="main_window_slots.cpp" line="1734"/>
         <source>Export Selected Packet Bytes</source>
         <translation>Ausgewählte Paketbytes exportieren</translation>
     </message>
     <message>
-        <source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
-        <translation type="vanished">Rohdaten (*.bin *.dat *.raw);; Alle Dateien (*.*)</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1799"/>
+        <location filename="main_window_slots.cpp" line="1800"/>
         <source>No Keys</source>
         <translation>Keine Schlüssel</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1800"/>
+        <location filename="main_window_slots.cpp" line="1801"/>
         <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="1806"/>
+        <location filename="main_window_slots.cpp" line="1807"/>
         <source>Export SSL Session Keys (%Ln key(s))</source>
         <oldsource>Export SSL Session Keys (%1 key%2</oldsource>
         <translation>
@@ -9391,73 +9379,69 @@ text-decoration: underline;
         </translation>
     </message>
     <message>
-        <source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
-        <translation type="vanished">SSL Sitzungsschlüssel (*.keys *.txt);; Alle Dateien (*.*)</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1735"/>
+        <location filename="main_window_slots.cpp" line="1736"/>
         <source>Raw data (*.bin *.dat *.raw);;All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Rohdaten (*.bin *.dat *.raw);; Alle Dateien (</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1810"/>
+        <location filename="main_window_slots.cpp" line="1811"/>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>SSL Sitzungsschlüssel (*.keys *.txt);; Alle Dateien (</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1948"/>
+        <location filename="main_window_slots.cpp" line="1949"/>
         <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="2357"/>
-        <location filename="main_window_slots.cpp" line="3431"/>
+        <location filename="main_window_slots.cpp" line="2358"/>
+        <location filename="main_window_slots.cpp" line="3432"/>
         <source>Unable to build conversation filter.</source>
         <translation>Verbindungsfilter kann nicht erstellt werden.</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2494"/>
-        <location filename="main_window_slots.cpp" line="2507"/>
+        <location filename="main_window_slots.cpp" line="2495"/>
+        <location filename="main_window_slots.cpp" line="2508"/>
         <source> before reloading the file</source>
         <translation>vor dem Neuladen der Datei</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2541"/>
+        <location filename="main_window_slots.cpp" line="2542"/>
         <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="3438"/>
+        <location filename="main_window_slots.cpp" line="3439"/>
         <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="3447"/>
+        <location filename="main_window_slots.cpp" line="3448"/>
         <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="3524"/>
+        <location filename="main_window_slots.cpp" line="3525"/>
         <source>No Interface Selected</source>
         <translation>Kein Interface ausgewählt</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3531"/>
+        <location filename="main_window_slots.cpp" line="3532"/>
         <source> before starting a new capture</source>
         <translation>vor dem Starten einer neuen Aufzeichnung</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3549"/>
+        <location filename="main_window_slots.cpp" line="3550"/>
         <source> before restarting the capture</source>
         <translation>vor dem Neustart der Aufzeichnung</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3732"/>
+        <location filename="main_window_slots.cpp" line="3733"/>
         <source>Wiki Page for %1</source>
         <translation>Wikiseite für &amp;1</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3733"/>
+        <location filename="main_window_slots.cpp" line="3734"/>
         <source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Wireshark Wiki wird durch die Community gepflegt.&lt;/p&gt;&lt;p&gt;Die Seite, die aufgerufen werden soll, kann wundervoll, unvollständig, falsch oder gar nicht vorhanden sein.&lt;/p&gt;&lt;p&gt;Zum Wiki geheni?&lt;/p&gt;</translation>
     </message>
@@ -10483,22 +10467,22 @@ text-decoration: underline;
 <context>
     <name>ProtoTree</name>
     <message>
-        <location filename="proto_tree.cpp" line="156"/>
+        <location filename="proto_tree.cpp" line="158"/>
         <source>Packet details</source>
         <translation>Paketdetails</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="203"/>
+        <location filename="proto_tree.cpp" line="205"/>
         <source>Colorize with Filter</source>
         <translation>Mit Filter einfärben</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="387"/>
+        <location filename="proto_tree.cpp" line="430"/>
         <source>, 1 byte</source>
         <translation>, 1 Byte</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="389"/>
+        <location filename="proto_tree.cpp" line="432"/>
         <source>, %1 bytes</source>
         <translation>, %1 Bytes</translation>
     </message>
@@ -11201,12 +11185,12 @@ text-decoration: underline;
         <translation>Priorität</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="436"/>
+        <location filename="main_welcome.cpp" line="434"/>
         <source>Show in Finder</source>
         <translation>Im Finder anzeigen</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="438"/>
+        <location filename="main_welcome.cpp" line="436"/>
         <source>Show in Folder</source>
         <translation>Im Ordner anzeigen</translation>
     </message>
@@ -14047,7 +14031,7 @@ text-decoration: underline;
     <message>
         <location filename="show_packet_bytes_dialog.cpp" line="77"/>
         <source>ASCII &amp; Control</source>
-        <translation type="unfinished"></translation>
+        <translation>ASCII &amp; Control</translation>
     </message>
     <message>
         <location filename="show_packet_bytes_dialog.cpp" line="78"/>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 2d18c20c3f..d5e7911a14 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1390,83 +1390,83 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="258"/>
+        <location filename="capture_interfaces_dialog.cpp" line="260"/>
         <source>Specify a Capture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>%1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="468"/>
+        <location filename="capture_interfaces_dialog.cpp" line="470"/>
         <source>no addresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="519"/>
+        <location filename="capture_interfaces_dialog.cpp" line="521"/>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="509"/>
-        <location filename="capture_interfaces_dialog.cpp" line="510"/>
+        <location filename="capture_interfaces_dialog.cpp" line="511"/>
         <location filename="capture_interfaces_dialog.cpp" line="512"/>
-        <location filename="capture_interfaces_dialog.cpp" line="515"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="514"/>
+        <location filename="capture_interfaces_dialog.cpp" line="517"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="683"/>
-        <location filename="capture_interfaces_dialog.cpp" line="691"/>
-        <location filename="capture_interfaces_dialog.cpp" line="702"/>
-        <location filename="capture_interfaces_dialog.cpp" line="706"/>
-        <location filename="capture_interfaces_dialog.cpp" line="719"/>
-        <location filename="capture_interfaces_dialog.cpp" line="727"/>
+        <location filename="capture_interfaces_dialog.cpp" line="685"/>
+        <location filename="capture_interfaces_dialog.cpp" line="693"/>
+        <location filename="capture_interfaces_dialog.cpp" line="704"/>
+        <location filename="capture_interfaces_dialog.cpp" line="708"/>
+        <location filename="capture_interfaces_dialog.cpp" line="721"/>
+        <location filename="capture_interfaces_dialog.cpp" line="729"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="684"/>
-        <location filename="capture_interfaces_dialog.cpp" line="692"/>
-        <location filename="capture_interfaces_dialog.cpp" line="720"/>
-        <location filename="capture_interfaces_dialog.cpp" line="728"/>
+        <location filename="capture_interfaces_dialog.cpp" line="686"/>
+        <location filename="capture_interfaces_dialog.cpp" line="694"/>
+        <location filename="capture_interfaces_dialog.cpp" line="722"/>
+        <location filename="capture_interfaces_dialog.cpp" line="730"/>
         <source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="703"/>
+        <location filename="capture_interfaces_dialog.cpp" line="705"/>
         <source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="707"/>
+        <location filename="capture_interfaces_dialog.cpp" line="709"/>
         <source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
  if you want to use multiple files.</source>
         <translation type="unfinished"></translation>
@@ -4317,16 +4317,16 @@ for filter files: %2.</source>
 <context>
     <name>InterfaceTreeDelegate</name>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1021"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1053"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1102"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1122"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1023"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1055"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1104"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1124"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1022"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1054"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1024"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1056"/>
         <source>disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6463,32 +6463,32 @@ a:hover {
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="226"/>
+        <location filename="main_welcome.cpp" line="224"/>
         <source>You are running Wireshark </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="228"/>
+        <location filename="main_welcome.cpp" line="226"/>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="231"/>
+        <location filename="main_welcome.cpp" line="229"/>
         <source> You receive automatic updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="233"/>
+        <location filename="main_welcome.cpp" line="231"/>
         <source> You have disabled automatic updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="374"/>
+        <location filename="main_welcome.cpp" line="372"/>
         <source>not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="453"/>
+        <location filename="main_welcome.cpp" line="451"/>
         <source>Copy file path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9225,32 +9225,32 @@ a:hover {
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1575"/>
+        <location filename="main_window_slots.cpp" line="1576"/>
         <source>Please wait while Wireshark is initializing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1656"/>
+        <location filename="main_window_slots.cpp" line="1657"/>
         <source> before closing the file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1733"/>
+        <location filename="main_window_slots.cpp" line="1734"/>
         <source>Export Selected Packet Bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1799"/>
+        <location filename="main_window_slots.cpp" line="1800"/>
         <source>No Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1800"/>
+        <location filename="main_window_slots.cpp" line="1801"/>
         <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="1806"/>
+        <location filename="main_window_slots.cpp" line="1807"/>
         <source>Export SSL Session Keys (%Ln key(s))</source>
         <oldsource>Export SSL Session Keys (%1 key%2</oldsource>
         <translation>
@@ -9259,69 +9259,69 @@ a:hover {
         </translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1735"/>
+        <location filename="main_window_slots.cpp" line="1736"/>
         <source>Raw data (*.bin *.dat *.raw);;All Files (</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1810"/>
+        <location filename="main_window_slots.cpp" line="1811"/>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1948"/>
+        <location filename="main_window_slots.cpp" line="1949"/>
         <source>Couldn&apos;t copy text. Try another item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2357"/>
-        <location filename="main_window_slots.cpp" line="3431"/>
+        <location filename="main_window_slots.cpp" line="2358"/>
+        <location filename="main_window_slots.cpp" line="3432"/>
         <source>Unable to build conversation filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2494"/>
-        <location filename="main_window_slots.cpp" line="2507"/>
+        <location filename="main_window_slots.cpp" line="2495"/>
+        <location filename="main_window_slots.cpp" line="2508"/>
         <source> before reloading the file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2541"/>
+        <location filename="main_window_slots.cpp" line="2542"/>
         <source>No filter available. Try another </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3438"/>
+        <location filename="main_window_slots.cpp" line="3439"/>
         <source>Error compiling filter for this conversation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3447"/>
+        <location filename="main_window_slots.cpp" line="3448"/>
         <source>No previous/next packet in conversation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3524"/>
+        <location filename="main_window_slots.cpp" line="3525"/>
         <source>No Interface Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3531"/>
+        <location filename="main_window_slots.cpp" line="3532"/>
         <source> before starting a new capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3549"/>
+        <location filename="main_window_slots.cpp" line="3550"/>
         <source> before restarting the capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3732"/>
+        <location filename="main_window_slots.cpp" line="3733"/>
         <source>Wiki Page for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3733"/>
+        <location filename="main_window_slots.cpp" line="3734"/>
         <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>
@@ -10345,22 +10345,22 @@ a:hover {
 <context>
     <name>ProtoTree</name>
     <message>
-        <location filename="proto_tree.cpp" line="156"/>
+        <location filename="proto_tree.cpp" line="158"/>
         <source>Packet details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="203"/>
+        <location filename="proto_tree.cpp" line="205"/>
         <source>Colorize with Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="387"/>
+        <location filename="proto_tree.cpp" line="430"/>
         <source>, 1 byte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="389"/>
+        <location filename="proto_tree.cpp" line="432"/>
         <source>, %1 bytes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11063,12 +11063,12 @@ a:hover {
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="436"/>
+        <location filename="main_welcome.cpp" line="434"/>
         <source>Show in Finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="438"/>
+        <location filename="main_welcome.cpp" line="436"/>
         <source>Show in Folder</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/ui/qt/wireshark_fr.qm b/ui/qt/wireshark_fr.qm
index 9cfcbf7afd..5d034866ee 100644
--- a/ui/qt/wireshark_fr.qm
+++ b/ui/qt/wireshark_fr.qm
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 96b2cfd3de..bd2c09254c 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -563,13 +563,9 @@
         <translation>Le format de fichier dans lequel vous voulez sauvegarder ne prendre pas en charge les commentaires. Voulez-vous supprimer les commentaires et enregistrer dans le format que vous avez choisi?</translation>
     </message>
     <message>
-        <source>All Files (*.*)</source>
-        <translation type="vanished">Tous les fichiers (*.*)</translation>
-    </message>
-    <message>
         <location filename="capture_file_dialog.cpp" line="392"/>
         <source>All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Tous les Fichiers (</translation>
     </message>
     <message>
         <location filename="capture_file_dialog.cpp" line="398"/>
@@ -1026,7 +1022,7 @@
         <location filename="capture_filter_edit.cpp" line="298"/>
         <source>Multiple filters selected. Override them here or leave this blank to preserve them.</source>
         <extracomment>This is a very long concept that needs to fit into a short space.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Plusieurs filtres sélectionnés. Les écraser ici ou laisser vide pour les préserver.</translation>
     </message>
     <message>
         <location filename="capture_filter_edit.cpp" line="299"/>
@@ -1398,83 +1394,83 @@ NOTE: Une option DOIT être sélectionnée.</translation>
         <translation>Laisser vide pour utiliser un fichier temporaire</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>enabled</source>
         <translation>activé</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>disabled</source>
         <translation>désactivé</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="258"/>
+        <location filename="capture_interfaces_dialog.cpp" line="260"/>
         <source>Specify a Capture File</source>
         <translation>Préciser un fichier de capture</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Addresses</source>
         <translation>Adresses</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="468"/>
+        <location filename="capture_interfaces_dialog.cpp" line="470"/>
         <source>no addresses</source>
         <translation>pas d&apos;adresse</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="519"/>
+        <location filename="capture_interfaces_dialog.cpp" line="521"/>
         <source>default</source>
         <translation>défaut</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="509"/>
-        <location filename="capture_interfaces_dialog.cpp" line="510"/>
+        <location filename="capture_interfaces_dialog.cpp" line="511"/>
         <location filename="capture_interfaces_dialog.cpp" line="512"/>
-        <location filename="capture_interfaces_dialog.cpp" line="515"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="514"/>
+        <location filename="capture_interfaces_dialog.cpp" line="517"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="683"/>
-        <location filename="capture_interfaces_dialog.cpp" line="691"/>
-        <location filename="capture_interfaces_dialog.cpp" line="702"/>
-        <location filename="capture_interfaces_dialog.cpp" line="706"/>
-        <location filename="capture_interfaces_dialog.cpp" line="719"/>
-        <location filename="capture_interfaces_dialog.cpp" line="727"/>
+        <location filename="capture_interfaces_dialog.cpp" line="685"/>
+        <location filename="capture_interfaces_dialog.cpp" line="693"/>
+        <location filename="capture_interfaces_dialog.cpp" line="704"/>
+        <location filename="capture_interfaces_dialog.cpp" line="708"/>
+        <location filename="capture_interfaces_dialog.cpp" line="721"/>
+        <location filename="capture_interfaces_dialog.cpp" line="729"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="684"/>
-        <location filename="capture_interfaces_dialog.cpp" line="692"/>
-        <location filename="capture_interfaces_dialog.cpp" line="720"/>
-        <location filename="capture_interfaces_dialog.cpp" line="728"/>
+        <location filename="capture_interfaces_dialog.cpp" line="686"/>
+        <location filename="capture_interfaces_dialog.cpp" line="694"/>
+        <location filename="capture_interfaces_dialog.cpp" line="722"/>
+        <location filename="capture_interfaces_dialog.cpp" line="730"/>
         <source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
         <translation>Fichier multiples : la taille demandée est trop élevée, elle ne doit pas être supérieure à 2 Go.</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="703"/>
+        <location filename="capture_interfaces_dialog.cpp" line="705"/>
         <source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
         <translation>Fichier multiples : pas de nom de fichier précisé.</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="707"/>
+        <location filename="capture_interfaces_dialog.cpp" line="709"/>
         <source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
  if you want to use multiple files.</source>
         <translation>Fichiers multiples: Aucune limite de fichier donnée! Vous devez spécifier une taille de fichier ou une durée où se produit le basculement au fichier de capture suivant 
@@ -2458,7 +2454,7 @@ si vous voulez utiliser des fichiers multiples.</translation>
     <message>
         <location filename="extcap_argument_file.cpp" line="112"/>
         <source>All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Tous les Fichiers (</translation>
     </message>
     <message>
         <location filename="extcap_argument_file.cpp" line="121"/>
@@ -4370,16 +4366,16 @@ pour fichiers de filtre : %2.</translation>
 <context>
     <name>InterfaceTreeDelegate</name>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1021"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1053"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1102"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1122"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1023"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1055"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1104"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1124"/>
         <source>enabled</source>
         <translation>activé</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1022"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1054"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1024"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1056"/>
         <source>disabled</source>
         <translation>désactivé</translation>
     </message>
@@ -6559,32 +6555,32 @@ a:hover {
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="226"/>
+        <location filename="main_welcome.cpp" line="224"/>
         <source>You are running Wireshark </source>
         <translation>Vous exécutez Wireshark</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="228"/>
+        <location filename="main_welcome.cpp" line="226"/>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="231"/>
+        <location filename="main_welcome.cpp" line="229"/>
         <source> You receive automatic updates.</source>
         <translation>Vous recevez les mises à jour automatiques.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="233"/>
+        <location filename="main_welcome.cpp" line="231"/>
         <source> You have disabled automatic updates.</source>
         <translation>Vous avez désactivé les mises à jour automatiques.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="374"/>
+        <location filename="main_welcome.cpp" line="372"/>
         <source>not found</source>
         <translation>Non trouvé</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="453"/>
+        <location filename="main_welcome.cpp" line="451"/>
         <source>Copy file path</source>
         <translation>Copier le chemin du fichier</translation>
     </message>
@@ -8461,7 +8457,7 @@ a:hover {
     <message>
         <location filename="main_window.ui" line="2074"/>
         <source>Endpoints</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminaux</translation>
     </message>
     <message>
         <location filename="main_window.ui" line="2077"/>
@@ -9321,36 +9317,32 @@ a:hover {
         <translation>Effacer les fichiers récemment ouverts</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1575"/>
+        <location filename="main_window_slots.cpp" line="1576"/>
         <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="1656"/>
+        <location filename="main_window_slots.cpp" line="1657"/>
         <source> before closing the file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1733"/>
+        <location filename="main_window_slots.cpp" line="1734"/>
         <source>Export Selected Packet Bytes</source>
         <translation>Exporter Octets de Paquets Sélectionnés</translation>
     </message>
     <message>
-        <source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
-        <translation type="vanished">Raw data (*.bin *.dat *.raw);;Tous les fichiers (*.*)</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1799"/>
+        <location filename="main_window_slots.cpp" line="1800"/>
         <source>No Keys</source>
         <translation>Aucune clés</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1800"/>
+        <location filename="main_window_slots.cpp" line="1801"/>
         <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="1806"/>
+        <location filename="main_window_slots.cpp" line="1807"/>
         <source>Export SSL Session Keys (%Ln key(s))</source>
         <oldsource>Export SSL Session Keys (%1 key%2</oldsource>
         <translation type="unfinished">
@@ -9359,73 +9351,69 @@ a:hover {
         </translation>
     </message>
     <message>
-        <source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
-        <translation type="vanished">Clé de Session SSL (*.keys *.txt);;Tous les fichiers (*.*)</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1735"/>
+        <location filename="main_window_slots.cpp" line="1736"/>
         <source>Raw data (*.bin *.dat *.raw);;All Files (</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1810"/>
+        <location filename="main_window_slots.cpp" line="1811"/>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1948"/>
+        <location filename="main_window_slots.cpp" line="1949"/>
         <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="2357"/>
-        <location filename="main_window_slots.cpp" line="3431"/>
+        <location filename="main_window_slots.cpp" line="2358"/>
+        <location filename="main_window_slots.cpp" line="3432"/>
         <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="2494"/>
-        <location filename="main_window_slots.cpp" line="2507"/>
+        <location filename="main_window_slots.cpp" line="2495"/>
+        <location filename="main_window_slots.cpp" line="2508"/>
         <source> before reloading the file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2541"/>
+        <location filename="main_window_slots.cpp" line="2542"/>
         <source>No filter available. Try another </source>
         <translation>Aucun filtre disponible. Essayer un autre</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3438"/>
+        <location filename="main_window_slots.cpp" line="3439"/>
         <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="3447"/>
+        <location filename="main_window_slots.cpp" line="3448"/>
         <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="3524"/>
+        <location filename="main_window_slots.cpp" line="3525"/>
         <source>No Interface Selected</source>
         <translation>Aucune Interface Sélectionnée</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3531"/>
+        <location filename="main_window_slots.cpp" line="3532"/>
         <source> before starting a new capture</source>
         <translation>avant de commencer une nouvelle capture</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3549"/>
+        <location filename="main_window_slots.cpp" line="3550"/>
         <source> before restarting the capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3732"/>
+        <location filename="main_window_slots.cpp" line="3733"/>
         <source>Wiki Page for %1</source>
         <translation>Page Wiki pour %1</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3733"/>
+        <location filename="main_window_slots.cpp" line="3734"/>
         <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;
@@ -10453,22 +10441,22 @@ a:hover {
 <context>
     <name>ProtoTree</name>
     <message>
-        <location filename="proto_tree.cpp" line="156"/>
+        <location filename="proto_tree.cpp" line="158"/>
         <source>Packet details</source>
         <translation>Détail du paquet</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="203"/>
+        <location filename="proto_tree.cpp" line="205"/>
         <source>Colorize with Filter</source>
         <translation>Colorier avec un Filtre</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="387"/>
+        <location filename="proto_tree.cpp" line="430"/>
         <source>, 1 byte</source>
         <translation>, 1 octet</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="389"/>
+        <location filename="proto_tree.cpp" line="432"/>
         <source>, %1 bytes</source>
         <translation>, %1 octets</translation>
     </message>
@@ -11171,12 +11159,12 @@ a:hover {
         <translation>Priorité</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="436"/>
+        <location filename="main_welcome.cpp" line="434"/>
         <source>Show in Finder</source>
         <translation>Voir dans Finder</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="438"/>
+        <location filename="main_welcome.cpp" line="436"/>
         <source>Show in Folder</source>
         <translation>Voir dans le Dossier</translation>
     </message>
diff --git a/ui/qt/wireshark_it.qm b/ui/qt/wireshark_it.qm
index 62715c431f..b084d39803 100644
--- a/ui/qt/wireshark_it.qm
+++ b/ui/qt/wireshark_it.qm
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index f906a31c9d..a79155ed27 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -563,13 +563,9 @@
         <translation>Nessun formato di file in cui può essere salvato supporta i commenti. Vuoi scartare i commenti e salvare nel formato scelto?</translation>
     </message>
     <message>
-        <source>All Files (*.*)</source>
-        <translation type="vanished">Tutti i file (*.*)</translation>
-    </message>
-    <message>
         <location filename="capture_file_dialog.cpp" line="392"/>
         <source>All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Tutti i file (</translation>
     </message>
     <message>
         <location filename="capture_file_dialog.cpp" line="398"/>
@@ -1398,83 +1394,83 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
         <translation>Lascia vuoto per utilizzare un file temporaneo</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>enabled</source>
         <translation>abilitato</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>disabled</source>
         <translation>disabilitato</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="258"/>
+        <location filename="capture_interfaces_dialog.cpp" line="260"/>
         <source>Specify a Capture File</source>
         <translation>Specifica un file di cattura</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Addresses</source>
         <translation>Indirizzi</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="468"/>
+        <location filename="capture_interfaces_dialog.cpp" line="470"/>
         <source>no addresses</source>
         <translation>nessun indirizzo</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="519"/>
+        <location filename="capture_interfaces_dialog.cpp" line="521"/>
         <source>default</source>
         <translation>predefinito</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="509"/>
-        <location filename="capture_interfaces_dialog.cpp" line="510"/>
+        <location filename="capture_interfaces_dialog.cpp" line="511"/>
         <location filename="capture_interfaces_dialog.cpp" line="512"/>
-        <location filename="capture_interfaces_dialog.cpp" line="515"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="514"/>
+        <location filename="capture_interfaces_dialog.cpp" line="517"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>n/a</source>
         <translation>n/d</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="683"/>
-        <location filename="capture_interfaces_dialog.cpp" line="691"/>
-        <location filename="capture_interfaces_dialog.cpp" line="702"/>
-        <location filename="capture_interfaces_dialog.cpp" line="706"/>
-        <location filename="capture_interfaces_dialog.cpp" line="719"/>
-        <location filename="capture_interfaces_dialog.cpp" line="727"/>
+        <location filename="capture_interfaces_dialog.cpp" line="685"/>
+        <location filename="capture_interfaces_dialog.cpp" line="693"/>
+        <location filename="capture_interfaces_dialog.cpp" line="704"/>
+        <location filename="capture_interfaces_dialog.cpp" line="708"/>
+        <location filename="capture_interfaces_dialog.cpp" line="721"/>
+        <location filename="capture_interfaces_dialog.cpp" line="729"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="684"/>
-        <location filename="capture_interfaces_dialog.cpp" line="692"/>
-        <location filename="capture_interfaces_dialog.cpp" line="720"/>
-        <location filename="capture_interfaces_dialog.cpp" line="728"/>
+        <location filename="capture_interfaces_dialog.cpp" line="686"/>
+        <location filename="capture_interfaces_dialog.cpp" line="694"/>
+        <location filename="capture_interfaces_dialog.cpp" line="722"/>
+        <location filename="capture_interfaces_dialog.cpp" line="730"/>
         <source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
         <translation>File multipli: la dimensione del file richiesta è troppo grande. La dimensione del file non può essere superiore a 2 GiB.</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="703"/>
+        <location filename="capture_interfaces_dialog.cpp" line="705"/>
         <source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
         <translation>File multipli: non è stato fornito un nome del file di cattura! Devi specificare un nome del file se vuoi usare file multipli.</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="707"/>
+        <location filename="capture_interfaces_dialog.cpp" line="709"/>
         <source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
  if you want to use multiple files.</source>
         <translation>File multipli: non è stato fornito alcun limite di file! Devi specificare una dimensione del file o la durata raggiunta la quale si passa al successivo file di cattura se vuoi usare file multipli.</translation>
@@ -2455,13 +2451,9 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
 <context>
     <name>ExtcapArgumentFileSelection</name>
     <message>
-        <source>Any File (*.*)</source>
-        <translation type="vanished">Tutti i file (*.*)</translation>
-    </message>
-    <message>
         <location filename="extcap_argument_file.cpp" line="112"/>
         <source>All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Tutti i file (</translation>
     </message>
     <message>
         <location filename="extcap_argument_file.cpp" line="121"/>
@@ -4369,16 +4361,16 @@ per i file di filtro: %2.</translation>
 <context>
     <name>InterfaceTreeDelegate</name>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1021"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1053"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1102"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1122"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1023"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1055"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1104"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1124"/>
         <source>enabled</source>
         <translation>abilitato</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1022"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1054"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1024"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1056"/>
         <source>disabled</source>
         <translation>disabilitato</translation>
     </message>
@@ -6589,32 +6581,32 @@ a:hover {
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="226"/>
+        <location filename="main_welcome.cpp" line="224"/>
         <source>You are running Wireshark </source>
         <translation>Stai eseguendo Wireshark </translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="228"/>
+        <location filename="main_welcome.cpp" line="226"/>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="231"/>
+        <location filename="main_welcome.cpp" line="229"/>
         <source> You receive automatic updates.</source>
         <translation> Ricevi aggiornamenti automatici.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="233"/>
+        <location filename="main_welcome.cpp" line="231"/>
         <source> You have disabled automatic updates.</source>
         <translation>Hai disabilitato gli aggiornamenti automatici.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="374"/>
+        <location filename="main_welcome.cpp" line="372"/>
         <source>not found</source>
         <translation>non trovato</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="453"/>
+        <location filename="main_welcome.cpp" line="451"/>
         <source>Copy file path</source>
         <translation>Copia percorso del file</translation>
     </message>
@@ -9351,36 +9343,32 @@ a:hover {
         <translation>Pulisci menu</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1575"/>
+        <location filename="main_window_slots.cpp" line="1576"/>
         <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="1656"/>
+        <location filename="main_window_slots.cpp" line="1657"/>
         <source> before closing the file</source>
         <translation>prima della chiusura del file</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1733"/>
+        <location filename="main_window_slots.cpp" line="1734"/>
         <source>Export Selected Packet Bytes</source>
         <translation>Esporta i byte del pacchetto selezionato</translation>
     </message>
     <message>
-        <source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
-        <translation type="vanished">Dati grezzi (*.bin *.dat *.raw);;Tutti i file (*.*)</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1799"/>
+        <location filename="main_window_slots.cpp" line="1800"/>
         <source>No Keys</source>
         <translation>Nessuna chiave</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1800"/>
+        <location filename="main_window_slots.cpp" line="1801"/>
         <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="1806"/>
+        <location filename="main_window_slots.cpp" line="1807"/>
         <source>Export SSL Session Keys (%Ln key(s))</source>
         <oldsource>Export SSL Session Keys (%1 key%2</oldsource>
         <translation>
@@ -9389,73 +9377,69 @@ a:hover {
         </translation>
     </message>
     <message>
-        <source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
-        <translation type="vanished">Chiavi di sessione SSL (*.keys *.txt);;Any File (*.*)</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1735"/>
+        <location filename="main_window_slots.cpp" line="1736"/>
         <source>Raw data (*.bin *.dat *.raw);;All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Dati grezzi (*.bin *.dat *.raw);;Tutti i file (</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1810"/>
+        <location filename="main_window_slots.cpp" line="1811"/>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiavi di sessione SSL (*.keys *.txt);;Any File (</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1948"/>
+        <location filename="main_window_slots.cpp" line="1949"/>
         <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="2357"/>
-        <location filename="main_window_slots.cpp" line="3431"/>
+        <location filename="main_window_slots.cpp" line="2358"/>
+        <location filename="main_window_slots.cpp" line="3432"/>
         <source>Unable to build conversation filter.</source>
         <translation>Impossibile creare il filtro di conversazione.</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2494"/>
-        <location filename="main_window_slots.cpp" line="2507"/>
+        <location filename="main_window_slots.cpp" line="2495"/>
+        <location filename="main_window_slots.cpp" line="2508"/>
         <source> before reloading the file</source>
         <translation>prima di ricaricare il file</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2541"/>
+        <location filename="main_window_slots.cpp" line="2542"/>
         <source>No filter available. Try another </source>
         <translation>Nessun filtro disponibile. Provane un altro </translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3438"/>
+        <location filename="main_window_slots.cpp" line="3439"/>
         <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="3447"/>
+        <location filename="main_window_slots.cpp" line="3448"/>
         <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="3524"/>
+        <location filename="main_window_slots.cpp" line="3525"/>
         <source>No Interface Selected</source>
         <translation>Nessuna interfaccia selezionata</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3531"/>
+        <location filename="main_window_slots.cpp" line="3532"/>
         <source> before starting a new capture</source>
         <translation>prima di iniziare una nuova cattura</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3549"/>
+        <location filename="main_window_slots.cpp" line="3550"/>
         <source> before restarting the capture</source>
         <translation>prima di riavviare la cattura</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3732"/>
+        <location filename="main_window_slots.cpp" line="3733"/>
         <source>Wiki Page for %1</source>
         <translation>Pagina wiki per %1</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3733"/>
+        <location filename="main_window_slots.cpp" line="3734"/>
         <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>
@@ -10481,22 +10465,22 @@ a:hover {
 <context>
     <name>ProtoTree</name>
     <message>
-        <location filename="proto_tree.cpp" line="156"/>
+        <location filename="proto_tree.cpp" line="158"/>
         <source>Packet details</source>
         <translation>Dettagli del pacchetto</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="203"/>
+        <location filename="proto_tree.cpp" line="205"/>
         <source>Colorize with Filter</source>
         <translation>Colora con filtro</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="387"/>
+        <location filename="proto_tree.cpp" line="430"/>
         <source>, 1 byte</source>
         <translation>, 1 byte</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="389"/>
+        <location filename="proto_tree.cpp" line="432"/>
         <source>, %1 bytes</source>
         <translation>, %1 byte</translation>
     </message>
@@ -11199,12 +11183,12 @@ a:hover {
         <translation>Priorità</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="436"/>
+        <location filename="main_welcome.cpp" line="434"/>
         <source>Show in Finder</source>
         <translation>Mostra in Finder</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="438"/>
+        <location filename="main_welcome.cpp" line="436"/>
         <source>Show in Folder</source>
         <translation>Mostra nella cartella</translation>
     </message>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 25169b2bef..e0c50a5a30 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -563,10 +563,6 @@
         <translation>コメントに対応したファイル形式ではありません。コメントを破棄して選んだ形式で保存しますか？</translation>
     </message>
     <message>
-        <source>All Files (*.*)</source>
-        <translation type="vanished">すべてのファイル (*.*)</translation>
-    </message>
-    <message>
         <location filename="capture_file_dialog.cpp" line="392"/>
         <source>All Files (</source>
         <translation type="unfinished"></translation>
@@ -1395,83 +1391,83 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>enabled</source>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>disabled</source>
         <translation>無効</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="258"/>
+        <location filename="capture_interfaces_dialog.cpp" line="260"/>
         <source>Specify a Capture File</source>
         <translation>キャプチャファイルを指定してください</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Addresses</source>
         <translation>アドレス</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Address</source>
         <translation>アドレス</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="468"/>
+        <location filename="capture_interfaces_dialog.cpp" line="470"/>
         <source>no addresses</source>
         <translation>アドレスがありません</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="519"/>
+        <location filename="capture_interfaces_dialog.cpp" line="521"/>
         <source>default</source>
         <translation>デフォルト</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="509"/>
-        <location filename="capture_interfaces_dialog.cpp" line="510"/>
+        <location filename="capture_interfaces_dialog.cpp" line="511"/>
         <location filename="capture_interfaces_dialog.cpp" line="512"/>
-        <location filename="capture_interfaces_dialog.cpp" line="515"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="514"/>
+        <location filename="capture_interfaces_dialog.cpp" line="517"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>n/a</source>
         <translation>割当なし</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="683"/>
-        <location filename="capture_interfaces_dialog.cpp" line="691"/>
-        <location filename="capture_interfaces_dialog.cpp" line="702"/>
-        <location filename="capture_interfaces_dialog.cpp" line="706"/>
-        <location filename="capture_interfaces_dialog.cpp" line="719"/>
-        <location filename="capture_interfaces_dialog.cpp" line="727"/>
+        <location filename="capture_interfaces_dialog.cpp" line="685"/>
+        <location filename="capture_interfaces_dialog.cpp" line="693"/>
+        <location filename="capture_interfaces_dialog.cpp" line="704"/>
+        <location filename="capture_interfaces_dialog.cpp" line="708"/>
+        <location filename="capture_interfaces_dialog.cpp" line="721"/>
+        <location filename="capture_interfaces_dialog.cpp" line="729"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="684"/>
-        <location filename="capture_interfaces_dialog.cpp" line="692"/>
-        <location filename="capture_interfaces_dialog.cpp" line="720"/>
-        <location filename="capture_interfaces_dialog.cpp" line="728"/>
+        <location filename="capture_interfaces_dialog.cpp" line="686"/>
+        <location filename="capture_interfaces_dialog.cpp" line="694"/>
+        <location filename="capture_interfaces_dialog.cpp" line="722"/>
+        <location filename="capture_interfaces_dialog.cpp" line="730"/>
         <source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
         <translation>複数ファイル:要求したファイルサイズが大きすぎます! ファイルサイズは2GB より大きくできません</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="703"/>
+        <location filename="capture_interfaces_dialog.cpp" line="705"/>
         <source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
         <translation>キャプチャファイル名が指定されていません! 複数ファイルを利用したい場合にはファイル名を指定しなくてはいけません</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="707"/>
+        <location filename="capture_interfaces_dialog.cpp" line="709"/>
         <source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
  if you want to use multiple files.</source>
         <translation>複数ファイル:ファイルの限界が指定されていません 次のキャプチャファイルへ切り替えるためのファイルサイズか間隔を指定する必要があります。</translation>
@@ -4350,16 +4346,16 @@ for filter files: %2.</source>
 <context>
     <name>InterfaceTreeDelegate</name>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1021"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1053"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1102"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1122"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1023"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1055"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1104"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1124"/>
         <source>enabled</source>
         <translation>有効</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1022"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1054"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1024"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1056"/>
         <source>disabled</source>
         <translation>無効</translation>
     </message>
@@ -6542,32 +6538,32 @@ a:hover {
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="226"/>
+        <location filename="main_welcome.cpp" line="224"/>
         <source>You are running Wireshark </source>
         <translation>Wiresharkを起動中です</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="228"/>
+        <location filename="main_welcome.cpp" line="226"/>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="231"/>
+        <location filename="main_welcome.cpp" line="229"/>
         <source> You receive automatic updates.</source>
         <translation>自動アップデートを受信します</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="233"/>
+        <location filename="main_welcome.cpp" line="231"/>
         <source> You have disabled automatic updates.</source>
         <translation>自動アップデートを無効にしました。</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="374"/>
+        <location filename="main_welcome.cpp" line="372"/>
         <source>not found</source>
         <translation>見つかりません</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="453"/>
+        <location filename="main_welcome.cpp" line="451"/>
         <source>Copy file path</source>
         <translation>ファイルパスをコピー</translation>
     </message>
@@ -9304,36 +9300,32 @@ a:hover {
         <translation>メニューをクリア</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1575"/>
+        <location filename="main_window_slots.cpp" line="1576"/>
         <source>Please wait while Wireshark is initializing</source>
         <translation>Wiresharkが初期化する間お待ちください</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1656"/>
+        <location filename="main_window_slots.cpp" line="1657"/>
         <source> before closing the file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1733"/>
+        <location filename="main_window_slots.cpp" line="1734"/>
         <source>Export Selected Packet Bytes</source>
         <translation>選択したパケットデータ部をエキスポート</translation>
     </message>
     <message>
-        <source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
-        <translation type="vanished">Raw形式 (*.bin *.dat *.raw);;すべてのファイル (*.*</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1799"/>
+        <location filename="main_window_slots.cpp" line="1800"/>
         <source>No Keys</source>
         <translation>キーはありません</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1800"/>
+        <location filename="main_window_slots.cpp" line="1801"/>
         <source>There are no SSL Session Keys to save.</source>
         <translation>保存する SSLセッション鍵はありません</translation>
     </message>
     <message numerus="yes">
-        <location filename="main_window_slots.cpp" line="1806"/>
+        <location filename="main_window_slots.cpp" line="1807"/>
         <source>Export SSL Session Keys (%Ln key(s))</source>
         <oldsource>Export SSL Session Keys (%1 key%2</oldsource>
         <translation type="unfinished">
@@ -9341,73 +9333,69 @@ a:hover {
         </translation>
     </message>
     <message>
-        <source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
-        <translation type="vanished">SSLセッション鍵 (*.keys *.txt);;すべてのファイル (*.*)</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1735"/>
+        <location filename="main_window_slots.cpp" line="1736"/>
         <source>Raw data (*.bin *.dat *.raw);;All Files (</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1810"/>
+        <location filename="main_window_slots.cpp" line="1811"/>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1948"/>
+        <location filename="main_window_slots.cpp" line="1949"/>
         <source>Couldn&apos;t copy text. Try another item.</source>
         <translation>テキストコピーできません 別に試してください</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2357"/>
-        <location filename="main_window_slots.cpp" line="3431"/>
+        <location filename="main_window_slots.cpp" line="2358"/>
+        <location filename="main_window_slots.cpp" line="3432"/>
         <source>Unable to build conversation filter.</source>
         <translation>会話フィルタを作成できません</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2494"/>
-        <location filename="main_window_slots.cpp" line="2507"/>
+        <location filename="main_window_slots.cpp" line="2495"/>
+        <location filename="main_window_slots.cpp" line="2508"/>
         <source> before reloading the file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2541"/>
+        <location filename="main_window_slots.cpp" line="2542"/>
         <source>No filter available. Try another </source>
         <translation>フィルタが利用できません 別に試してください</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3438"/>
+        <location filename="main_window_slots.cpp" line="3439"/>
         <source>Error compiling filter for this conversation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3447"/>
+        <location filename="main_window_slots.cpp" line="3448"/>
         <source>No previous/next packet in conversation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3524"/>
+        <location filename="main_window_slots.cpp" line="3525"/>
         <source>No Interface Selected</source>
         <translation>インターフェースが選択されていません</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3531"/>
+        <location filename="main_window_slots.cpp" line="3532"/>
         <source> before starting a new capture</source>
         <translation>新規キャプチャを開始する前に</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3549"/>
+        <location filename="main_window_slots.cpp" line="3550"/>
         <source> before restarting the capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3732"/>
+        <location filename="main_window_slots.cpp" line="3733"/>
         <source>Wiki Page for %1</source>
         <translation>%1 の Wikiページ</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3733"/>
+        <location filename="main_window_slots.cpp" line="3734"/>
         <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>
@@ -10433,22 +10421,22 @@ a:hover {
 <context>
     <name>ProtoTree</name>
     <message>
-        <location filename="proto_tree.cpp" line="156"/>
+        <location filename="proto_tree.cpp" line="158"/>
         <source>Packet details</source>
         <translation>パケット詳細</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="203"/>
+        <location filename="proto_tree.cpp" line="205"/>
         <source>Colorize with Filter</source>
         <translation>フィルタで色分け</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="387"/>
+        <location filename="proto_tree.cpp" line="430"/>
         <source>, 1 byte</source>
         <translation>, 1 バイト</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="389"/>
+        <location filename="proto_tree.cpp" line="432"/>
         <source>, %1 bytes</source>
         <translation>, %1 バイト</translation>
     </message>
@@ -11151,12 +11139,12 @@ a:hover {
         <translation>優先度</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="436"/>
+        <location filename="main_welcome.cpp" line="434"/>
         <source>Show in Finder</source>
         <translation>ファインダーで表示</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="438"/>
+        <location filename="main_welcome.cpp" line="436"/>
         <source>Show in Folder</source>
         <translation>フォルダで表示</translation>
     </message>
diff --git a/ui/qt/wireshark_pl.qm b/ui/qt/wireshark_pl.qm
index eb6ec7c710..a8f16cbf9b 100644
--- a/ui/qt/wireshark_pl.qm
+++ b/ui/qt/wireshark_pl.qm
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index a4ca13cc43..e6ad9a274b 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -563,13 +563,9 @@
         <translation>Nie ma formatu w którym możliwy jest zapis z komentarzami. Czy chcesz porzucić komentarze i zapisać plik?</translation>
     </message>
     <message>
-        <source>All Files (*.*)</source>
-        <translation type="vanished">Wszystkie pliki (*.*)</translation>
-    </message>
-    <message>
         <location filename="capture_file_dialog.cpp" line="392"/>
         <source>All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Wszystkie pliki (</translation>
     </message>
     <message>
         <location filename="capture_file_dialog.cpp" line="398"/>
@@ -1396,83 +1392,83 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
         <translation>Pozostaw puste by użyć pliku tymczasowego.</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>enabled</source>
         <translation>włączony</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>disabled</source>
         <translation>wyłączony</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="258"/>
+        <location filename="capture_interfaces_dialog.cpp" line="260"/>
         <source>Specify a Capture File</source>
         <translation>Wybierz plik przechwytywania</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Addresses</source>
         <translation>Adresy</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="468"/>
+        <location filename="capture_interfaces_dialog.cpp" line="470"/>
         <source>no addresses</source>
         <translation>brak adresu</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="519"/>
+        <location filename="capture_interfaces_dialog.cpp" line="521"/>
         <source>default</source>
         <translation>domyślny</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="509"/>
-        <location filename="capture_interfaces_dialog.cpp" line="510"/>
+        <location filename="capture_interfaces_dialog.cpp" line="511"/>
         <location filename="capture_interfaces_dialog.cpp" line="512"/>
-        <location filename="capture_interfaces_dialog.cpp" line="515"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="514"/>
+        <location filename="capture_interfaces_dialog.cpp" line="517"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="683"/>
-        <location filename="capture_interfaces_dialog.cpp" line="691"/>
-        <location filename="capture_interfaces_dialog.cpp" line="702"/>
-        <location filename="capture_interfaces_dialog.cpp" line="706"/>
-        <location filename="capture_interfaces_dialog.cpp" line="719"/>
-        <location filename="capture_interfaces_dialog.cpp" line="727"/>
+        <location filename="capture_interfaces_dialog.cpp" line="685"/>
+        <location filename="capture_interfaces_dialog.cpp" line="693"/>
+        <location filename="capture_interfaces_dialog.cpp" line="704"/>
+        <location filename="capture_interfaces_dialog.cpp" line="708"/>
+        <location filename="capture_interfaces_dialog.cpp" line="721"/>
+        <location filename="capture_interfaces_dialog.cpp" line="729"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="684"/>
-        <location filename="capture_interfaces_dialog.cpp" line="692"/>
-        <location filename="capture_interfaces_dialog.cpp" line="720"/>
-        <location filename="capture_interfaces_dialog.cpp" line="728"/>
+        <location filename="capture_interfaces_dialog.cpp" line="686"/>
+        <location filename="capture_interfaces_dialog.cpp" line="694"/>
+        <location filename="capture_interfaces_dialog.cpp" line="722"/>
+        <location filename="capture_interfaces_dialog.cpp" line="730"/>
         <source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
         <translation>Wiele plików: Żądane wielkość pliku jest zbyt duża! Wielkość pliku nie może być większa niż 2 GiB.</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="703"/>
+        <location filename="capture_interfaces_dialog.cpp" line="705"/>
         <source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
         <translation>Wiele plików: Nie wprowadzono nazwy pliku! Musisz wprowadzić nazwę pliku jeśli zamierzasz używać wielu plików.</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="707"/>
+        <location filename="capture_interfaces_dialog.cpp" line="709"/>
         <source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
  if you want to use multiple files.</source>
         <translation>Wiele plików: Nie ustalono limitu! Musisz ustalić limit wielkości pliku lub czas przechwytywania 
@@ -2454,13 +2450,9 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
 <context>
     <name>ExtcapArgumentFileSelection</name>
     <message>
-        <source>Any File (*.*)</source>
-        <translation type="vanished">Wszystkie pliki (*.*)</translation>
-    </message>
-    <message>
         <location filename="extcap_argument_file.cpp" line="112"/>
         <source>All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Wszystkie pliki (</translation>
     </message>
     <message>
         <location filename="extcap_argument_file.cpp" line="121"/>
@@ -4368,16 +4360,16 @@ dla plików filtrów: %2.</translation>
 <context>
     <name>InterfaceTreeDelegate</name>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1021"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1053"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1102"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1122"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1023"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1055"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1104"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1124"/>
         <source>enabled</source>
         <translation>włączony</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1022"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1054"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1024"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1056"/>
         <source>disabled</source>
         <translation>wyłączony</translation>
     </message>
@@ -6590,32 +6582,32 @@ text-decoration: underline;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="226"/>
+        <location filename="main_welcome.cpp" line="224"/>
         <source>You are running Wireshark </source>
         <translation>Wireshark uruchomiony  </translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="228"/>
+        <location filename="main_welcome.cpp" line="226"/>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="231"/>
+        <location filename="main_welcome.cpp" line="229"/>
         <source> You receive automatic updates.</source>
         <translation> Automatyczne aktualizacje są włączone.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="233"/>
+        <location filename="main_welcome.cpp" line="231"/>
         <source> You have disabled automatic updates.</source>
         <translation>Automatyczne aktualizacje są wyłączone.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="374"/>
+        <location filename="main_welcome.cpp" line="372"/>
         <source>not found</source>
         <translation>nie znaleziono</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="453"/>
+        <location filename="main_welcome.cpp" line="451"/>
         <source>Copy file path</source>
         <translation>Kopiuj ścieżkę</translation>
     </message>
@@ -9352,36 +9344,32 @@ text-decoration: underline;
         <translation>Wyczyść Menu</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1575"/>
+        <location filename="main_window_slots.cpp" line="1576"/>
         <source>Please wait while Wireshark is initializing</source>
         <translation>Proszę czekać, trwa uruchamianie Wiresharka</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1656"/>
+        <location filename="main_window_slots.cpp" line="1657"/>
         <source> before closing the file</source>
         <translation>przed zapisaniem pliku</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1733"/>
+        <location filename="main_window_slots.cpp" line="1734"/>
         <source>Export Selected Packet Bytes</source>
         <translation>Eksportuj zaznaczony bajty pakietu</translation>
     </message>
     <message>
-        <source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
-        <translation type="vanished">Surowe dane (*.bin *.dat *.raw);;Dowolny plik (*.*)</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1799"/>
+        <location filename="main_window_slots.cpp" line="1800"/>
         <source>No Keys</source>
         <translation>Brak kluczy</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1800"/>
+        <location filename="main_window_slots.cpp" line="1801"/>
         <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="1806"/>
+        <location filename="main_window_slots.cpp" line="1807"/>
         <source>Export SSL Session Keys (%Ln key(s))</source>
         <oldsource>Export SSL Session Keys (%1 key%2</oldsource>
         <translation>
@@ -9391,73 +9379,69 @@ text-decoration: underline;
         </translation>
     </message>
     <message>
-        <source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
-        <translation type="vanished">Klucze sesji SSL (*.keys *.txt);; Dowolny plik (*.*)</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1735"/>
+        <location filename="main_window_slots.cpp" line="1736"/>
         <source>Raw data (*.bin *.dat *.raw);;All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Surowe dane (*.bin *.dat *.raw);;Dowolny plik (</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1810"/>
+        <location filename="main_window_slots.cpp" line="1811"/>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>Klucze sesji SSL (*.keys *.txt);; Dowolny plik (</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1948"/>
+        <location filename="main_window_slots.cpp" line="1949"/>
         <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="2357"/>
-        <location filename="main_window_slots.cpp" line="3431"/>
+        <location filename="main_window_slots.cpp" line="2358"/>
+        <location filename="main_window_slots.cpp" line="3432"/>
         <source>Unable to build conversation filter.</source>
         <translation>Nie można stworzyć filtru konwersacji.</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2494"/>
-        <location filename="main_window_slots.cpp" line="2507"/>
+        <location filename="main_window_slots.cpp" line="2495"/>
+        <location filename="main_window_slots.cpp" line="2508"/>
         <source> before reloading the file</source>
         <translation>przed przeładowaniem pliku</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2541"/>
+        <location filename="main_window_slots.cpp" line="2542"/>
         <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="3438"/>
+        <location filename="main_window_slots.cpp" line="3439"/>
         <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="3447"/>
+        <location filename="main_window_slots.cpp" line="3448"/>
         <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="3524"/>
+        <location filename="main_window_slots.cpp" line="3525"/>
         <source>No Interface Selected</source>
         <translation>Nie wybrano interfejsu</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3531"/>
+        <location filename="main_window_slots.cpp" line="3532"/>
         <source> before starting a new capture</source>
         <translation>przed wystartowaniem nowego przechwytywania</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3549"/>
+        <location filename="main_window_slots.cpp" line="3550"/>
         <source> before restarting the capture</source>
         <translation>przed restartem przechwytywania</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3732"/>
+        <location filename="main_window_slots.cpp" line="3733"/>
         <source>Wiki Page for %1</source>
         <translation>Strona Wiki dla %1</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3733"/>
+        <location filename="main_window_slots.cpp" line="3734"/>
         <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>
@@ -10482,22 +10466,22 @@ text-decoration: underline;
 <context>
     <name>ProtoTree</name>
     <message>
-        <location filename="proto_tree.cpp" line="156"/>
+        <location filename="proto_tree.cpp" line="158"/>
         <source>Packet details</source>
         <translation>Szczegóły pakietu</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="203"/>
+        <location filename="proto_tree.cpp" line="205"/>
         <source>Colorize with Filter</source>
         <translation>Koloruj z filtrem</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="387"/>
+        <location filename="proto_tree.cpp" line="430"/>
         <source>, 1 byte</source>
         <translation>, 1 bajt</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="389"/>
+        <location filename="proto_tree.cpp" line="432"/>
         <source>, %1 bytes</source>
         <translation>, %1 bajtów</translation>
     </message>
@@ -11200,12 +11184,12 @@ text-decoration: underline;
         <translation>Priorytet</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="436"/>
+        <location filename="main_welcome.cpp" line="434"/>
         <source>Show in Finder</source>
         <translation>Otwórz w wyszukiwajce</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="438"/>
+        <location filename="main_welcome.cpp" line="436"/>
         <source>Show in Folder</source>
         <translation>Otwórz w folderze</translation>
     </message>
@@ -14049,7 +14033,7 @@ text-decoration: underline;
     <message>
         <location filename="show_packet_bytes_dialog.cpp" line="77"/>
         <source>ASCII &amp; Control</source>
-        <translation type="unfinished"></translation>
+        <translation>ASCII i znaki kontrolne</translation>
     </message>
     <message>
         <location filename="show_packet_bytes_dialog.cpp" line="78"/>
diff --git a/ui/qt/wireshark_zh_CN.qm b/ui/qt/wireshark_zh_CN.qm
index 06841845a1..327b44835b 100644
--- a/ui/qt/wireshark_zh_CN.qm
+++ b/ui/qt/wireshark_zh_CN.qm
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 02ac252d4a..924a54e02c 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -563,13 +563,9 @@
         <translation>可以保存的文件格式中，没有支持注释的格式。您是否要丢弃注释并以您选择的格式保存？</translation>
     </message>
     <message>
-        <source>All Files (*.*)</source>
-        <translation type="vanished">所有文件 (*.*)</translation>
-    </message>
-    <message>
         <location filename="capture_file_dialog.cpp" line="392"/>
         <source>All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>所有文件 (</translation>
     </message>
     <message>
         <location filename="capture_file_dialog.cpp" line="398"/>
@@ -1397,83 +1393,83 @@ PLEASE NOTE: One option MUST be selected.</source>
         <translation>留空使用临时文件</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>enabled</source>
         <translation>启用</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="239"/>
-        <location filename="capture_interfaces_dialog.cpp" line="520"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="241"/>
+        <location filename="capture_interfaces_dialog.cpp" line="522"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>disabled</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="258"/>
+        <location filename="capture_interfaces_dialog.cpp" line="260"/>
         <source>Specify a Capture File</source>
         <translation>指定捕获文件</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>%1: %2</source>
         <translation>%1: %2</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Addresses</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="458"/>
+        <location filename="capture_interfaces_dialog.cpp" line="460"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="468"/>
+        <location filename="capture_interfaces_dialog.cpp" line="470"/>
         <source>no addresses</source>
         <translation>无地址</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="519"/>
+        <location filename="capture_interfaces_dialog.cpp" line="521"/>
         <source>default</source>
         <translation>默认</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="509"/>
-        <location filename="capture_interfaces_dialog.cpp" line="510"/>
+        <location filename="capture_interfaces_dialog.cpp" line="511"/>
         <location filename="capture_interfaces_dialog.cpp" line="512"/>
-        <location filename="capture_interfaces_dialog.cpp" line="515"/>
-        <location filename="capture_interfaces_dialog.cpp" line="526"/>
+        <location filename="capture_interfaces_dialog.cpp" line="514"/>
+        <location filename="capture_interfaces_dialog.cpp" line="517"/>
+        <location filename="capture_interfaces_dialog.cpp" line="528"/>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="683"/>
-        <location filename="capture_interfaces_dialog.cpp" line="691"/>
-        <location filename="capture_interfaces_dialog.cpp" line="702"/>
-        <location filename="capture_interfaces_dialog.cpp" line="706"/>
-        <location filename="capture_interfaces_dialog.cpp" line="719"/>
-        <location filename="capture_interfaces_dialog.cpp" line="727"/>
+        <location filename="capture_interfaces_dialog.cpp" line="685"/>
+        <location filename="capture_interfaces_dialog.cpp" line="693"/>
+        <location filename="capture_interfaces_dialog.cpp" line="704"/>
+        <location filename="capture_interfaces_dialog.cpp" line="708"/>
+        <location filename="capture_interfaces_dialog.cpp" line="721"/>
+        <location filename="capture_interfaces_dialog.cpp" line="729"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="684"/>
-        <location filename="capture_interfaces_dialog.cpp" line="692"/>
-        <location filename="capture_interfaces_dialog.cpp" line="720"/>
-        <location filename="capture_interfaces_dialog.cpp" line="728"/>
+        <location filename="capture_interfaces_dialog.cpp" line="686"/>
+        <location filename="capture_interfaces_dialog.cpp" line="694"/>
+        <location filename="capture_interfaces_dialog.cpp" line="722"/>
+        <location filename="capture_interfaces_dialog.cpp" line="730"/>
         <source>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</source>
         <translation>多文件：请求的文件尺寸太大！文件尺寸不能超过2GiB。</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="703"/>
+        <location filename="capture_interfaces_dialog.cpp" line="705"/>
         <source>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</source>
         <translation>多个文件：没有给出捕获文件名！如果您想使用多个文件，必须指定一个文件名。</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="707"/>
+        <location filename="capture_interfaces_dialog.cpp" line="709"/>
         <source>Multiple files: No file limit given! You must specify a file size or duration at which is switched to the next capture file
  if you want to use multiple files.</source>
         <translation>多个文件：未给出文件大小限制！如果您想使用多个文件，必须指定切换到下一个捕获文件的文件大小或者时长。</translation>
@@ -2454,13 +2450,9 @@ PLEASE NOTE: One option MUST be selected.</source>
 <context>
     <name>ExtcapArgumentFileSelection</name>
     <message>
-        <source>Any File (*.*)</source>
-        <translation type="vanished">任意文件 (*.*)</translation>
-    </message>
-    <message>
         <location filename="extcap_argument_file.cpp" line="112"/>
         <source>All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>所有文件 (</translation>
     </message>
     <message>
         <location filename="extcap_argument_file.cpp" line="121"/>
@@ -4361,16 +4353,16 @@ for filter files: %2.</source>
 <context>
     <name>InterfaceTreeDelegate</name>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1021"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1053"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1102"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1122"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1023"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1055"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1104"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1124"/>
         <source>enabled</source>
         <translation>启用</translation>
     </message>
     <message>
-        <location filename="capture_interfaces_dialog.cpp" line="1022"/>
-        <location filename="capture_interfaces_dialog.cpp" line="1054"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1024"/>
+        <location filename="capture_interfaces_dialog.cpp" line="1056"/>
         <source>disabled</source>
         <translation>关闭</translation>
     </message>
@@ -6579,32 +6571,32 @@ text-decoration: underline;
 &lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="226"/>
+        <location filename="main_welcome.cpp" line="224"/>
         <source>You are running Wireshark </source>
         <translation>正在运行 Wireshark</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="228"/>
+        <location filename="main_welcome.cpp" line="226"/>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="231"/>
+        <location filename="main_welcome.cpp" line="229"/>
         <source> You receive automatic updates.</source>
         <translation>接受自动更新。</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="233"/>
+        <location filename="main_welcome.cpp" line="231"/>
         <source> You have disabled automatic updates.</source>
         <translation>禁止自动更新。</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="374"/>
+        <location filename="main_welcome.cpp" line="372"/>
         <source>not found</source>
         <translation>未找到</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="453"/>
+        <location filename="main_welcome.cpp" line="451"/>
         <source>Copy file path</source>
         <translation>复制文件路径</translation>
     </message>
@@ -9341,36 +9333,32 @@ text-decoration: underline;
         <translation>清除菜单</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1575"/>
+        <location filename="main_window_slots.cpp" line="1576"/>
         <source>Please wait while Wireshark is initializing</source>
         <translation>Wireshark 正在初始化，请稍候</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1656"/>
+        <location filename="main_window_slots.cpp" line="1657"/>
         <source> before closing the file</source>
         <translation>关闭文件前</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1733"/>
+        <location filename="main_window_slots.cpp" line="1734"/>
         <source>Export Selected Packet Bytes</source>
         <translation>导出选择分组字节流</translation>
     </message>
     <message>
-        <source>Raw data (*.bin *.dat *.raw);;Any File (*.*)</source>
-        <translation type="vanished">原始数据 (*.bin *.dat *.raw);;任意文件 (*.*)</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1799"/>
+        <location filename="main_window_slots.cpp" line="1800"/>
         <source>No Keys</source>
         <translation>无密钥</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1800"/>
+        <location filename="main_window_slots.cpp" line="1801"/>
         <source>There are no SSL Session Keys to save.</source>
         <translation>没有可以保存的 SSL 会话密钥。</translation>
     </message>
     <message numerus="yes">
-        <location filename="main_window_slots.cpp" line="1806"/>
+        <location filename="main_window_slots.cpp" line="1807"/>
         <source>Export SSL Session Keys (%Ln key(s))</source>
         <oldsource>Export SSL Session Keys (%1 key%2</oldsource>
         <translation>
@@ -9378,73 +9366,69 @@ text-decoration: underline;
         </translation>
     </message>
     <message>
-        <source>SSL Session Keys (*.keys *.txt);;Any File (*.*)</source>
-        <translation type="vanished">SSL 会话密钥 (*.keys *.txt);;任意文件 (*.*)</translation>
-    </message>
-    <message>
-        <location filename="main_window_slots.cpp" line="1735"/>
+        <location filename="main_window_slots.cpp" line="1736"/>
         <source>Raw data (*.bin *.dat *.raw);;All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>原始数据 (*.bin *.dat *.raw);;所有文件 (</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1810"/>
+        <location filename="main_window_slots.cpp" line="1811"/>
         <source>SSL Session Keys (*.keys *.txt);;All Files (</source>
-        <translation type="unfinished"></translation>
+        <translation>SSL 会话密钥 (*.keys *.txt);;所有文件 (</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="1948"/>
+        <location filename="main_window_slots.cpp" line="1949"/>
         <source>Couldn&apos;t copy text. Try another item.</source>
         <translation>无法复制文本。请尝试其他对象。</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2357"/>
-        <location filename="main_window_slots.cpp" line="3431"/>
+        <location filename="main_window_slots.cpp" line="2358"/>
+        <location filename="main_window_slots.cpp" line="3432"/>
         <source>Unable to build conversation filter.</source>
         <translation>无法建立对话过滤器。</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2494"/>
-        <location filename="main_window_slots.cpp" line="2507"/>
+        <location filename="main_window_slots.cpp" line="2495"/>
+        <location filename="main_window_slots.cpp" line="2508"/>
         <source> before reloading the file</source>
         <translation>重新载入文件前</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="2541"/>
+        <location filename="main_window_slots.cpp" line="2542"/>
         <source>No filter available. Try another </source>
         <translation>无过滤器可用。请尝试其他 </translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3438"/>
+        <location filename="main_window_slots.cpp" line="3439"/>
         <source>Error compiling filter for this conversation.</source>
         <translation>为此对话编译过滤器时出错。</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3447"/>
+        <location filename="main_window_slots.cpp" line="3448"/>
         <source>No previous/next packet in conversation.</source>
         <translation>此对话中没有上一个/下一个分组。</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3524"/>
+        <location filename="main_window_slots.cpp" line="3525"/>
         <source>No Interface Selected</source>
         <translation>未选中接口</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3531"/>
+        <location filename="main_window_slots.cpp" line="3532"/>
         <source> before starting a new capture</source>
         <translation>在开始新捕获前</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3549"/>
+        <location filename="main_window_slots.cpp" line="3550"/>
         <source> before restarting the capture</source>
         <translation>重新开始捕获前</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3732"/>
+        <location filename="main_window_slots.cpp" line="3733"/>
         <source>Wiki Page for %1</source>
         <translation>%1 的 Wiki 页面</translation>
     </message>
     <message>
-        <location filename="main_window_slots.cpp" line="3733"/>
+        <location filename="main_window_slots.cpp" line="3734"/>
         <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>
@@ -10469,22 +10453,22 @@ text-decoration: underline;
 <context>
     <name>ProtoTree</name>
     <message>
-        <location filename="proto_tree.cpp" line="156"/>
+        <location filename="proto_tree.cpp" line="158"/>
         <source>Packet details</source>
         <translation>分组详情</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="203"/>
+        <location filename="proto_tree.cpp" line="205"/>
         <source>Colorize with Filter</source>
         <translation>用过滤器着色</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="387"/>
+        <location filename="proto_tree.cpp" line="430"/>
         <source>, 1 byte</source>
         <translation>, 1 字节</translation>
     </message>
     <message>
-        <location filename="proto_tree.cpp" line="389"/>
+        <location filename="proto_tree.cpp" line="432"/>
         <source>, %1 bytes</source>
         <translation>, %1 字节</translation>
     </message>
@@ -11187,12 +11171,12 @@ text-decoration: underline;
         <translation>优先级</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="436"/>
+        <location filename="main_welcome.cpp" line="434"/>
         <source>Show in Finder</source>
         <translation>在 Finder 中显示</translation>
     </message>
     <message>
-        <location filename="main_welcome.cpp" line="438"/>
+        <location filename="main_welcome.cpp" line="436"/>
         <source>Show in Folder</source>
         <translation>在 Finder 中显示</translation>
     </message>
@@ -14030,7 +14014,7 @@ text-decoration: underline;
     <message>
         <location filename="show_packet_bytes_dialog.cpp" line="77"/>
         <source>ASCII &amp; Control</source>
-        <translation type="unfinished"></translation>
+        <translation>ASCII与控制符</translation>
     </message>
     <message>
         <location filename="show_packet_bytes_dialog.cpp" line="78"/>
author	Gerald Combs <gerald@wireshark.org>	2016-03-13 08:08:50 -0700
committer	Gerald Combs <gerald@wireshark.org>	2016-03-13 15:08:59 +0000
commit	30563e6c3a87357adf62f175c579d5da11e7e5ea (patch)
tree	0ef43a957cb021c4155b0d2d22c0c716f7990620
parent	6f220a343e476fb1df1f98c719b0fedf5c4f8c7f (diff)