summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-04-12 08:07:18 -0700
committerGerald Combs <gerald@wireshark.org>2015-04-12 15:07:24 +0000
commit5b80ccb434c64f514103e114ec9f9d18d2ad86c7 (patch)
treefe3ae31a8fad971a57999625446cc1ff8c5d03e1
parent5f933e85604cc9981954cb821736e0d68d0c4c12 (diff)
downloadwireshark-5b80ccb434c64f514103e114ec9f9d18d2ad86c7.tar.gz
[Automatic update for 2015-04-12]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ide45514d6fd320962b642ed7c86bca959f2c58f7 Reviewed-on: https://code.wireshark.org/review/8029 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat
-rw-r--r--epan/enterprise-numbers190
-rw-r--r--epan/sminmpec.c48
-rw-r--r--manuf48
-rw-r--r--services6
-rw-r--r--ui/qt/wireshark_de.ts66
-rw-r--r--ui/qt/wireshark_en.ts66
-rw-r--r--ui/qt/wireshark_fr.ts66
-rw-r--r--ui/qt/wireshark_it.ts66
-rw-r--r--ui/qt/wireshark_ja_JP.qmbin151297 -> 151600 bytes
-rw-r--r--ui/qt/wireshark_ja_JP.ts72
-rw-r--r--ui/qt/wireshark_pl.ts66
-rw-r--r--ui/qt/wireshark_zh_CN.ts66
12 files changed, 518 insertions, 242 deletions
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index a544471165..e21b5c158b 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2015-04-04)
+(last updated 2015-04-12)
SMI Network Management Private Enterprise Codes:
@@ -5514,9 +5514,9 @@ Decimal
Marc De Loore
marcd&mdl.be
1375
- Firma PAF
+ Frobbit AB (formerly "Firma PAF")
Patrik Fältström
- info&paf.se
+ info&frobbit.se
1376
Nashoba Networks Inc
Rich Curran
@@ -89344,9 +89344,9 @@ Limited
Simon Holmgaard
Simon.Holmgaard&emaus.cndo.dk
22446
- SOFTWIN SRL
- Mircea MITU
- mmitu&bitdefender.com
+ Bitdefender SRL (formerly "SOFTWIN SRL")
+ Andrei Rusu
+ tech-admin&bitdefender.com
22447
B.Braun Melsungen AG
Joern Lubadel
@@ -135332,8 +135332,8 @@ Decentralization / Helenic Public Administra
info&linuxbox.cz
33938
Ordina
- Michiel Helder
- michiel.helder&ordina.nl
+ Alwin Warringa
+ alwin.warringa&ordina.nl
33939
Bolt Court Consulting
Jamie Hosker
@@ -164513,8 +164513,8 @@ Decentralization / Helenic Public Administra
francesco.zerra&gmail.com
41233
HubSpot, Inc.
- Josh Russell
- jrussell&hubspot.com
+ Jason Webber
+ domain-groups&hubspot.com
41234
RNelson Consulting
Robert Nelson
@@ -172388,9 +172388,9 @@ Decentralization / Helenic Public Administra
Holger Rasch
info&bytemine.net
43202
- Digital Networks UK Ltd
+ Zeta Storage Systems Ltd (formerly 'Digital Networks UK Ltd')
Ed Taylor
- edward.taylor&dnuk.com
+ edward.taylor&zeta.systems
43203
TSS COMPANY
Frantisek Takacs
@@ -180032,7 +180032,7 @@ Decentralization / Helenic Public Administra
Christian Wilhelmi
christian.wilhelmi&chriwi.net
45113
- optimans
+ OPTIMANS
Christopher Niznik
support&optimans.com
45114
@@ -181521,8 +181521,8 @@ Decentralization / Helenic Public Administra
marco.mascitto&siamasystems.com
45485
SCUBI
- Justin Jensen
- justin.jensen&capgemini-gs.com
+ Gopal Padinjaruveetil
+ gopal.padinjaruveetil&capgemini.com
45486
ACSS Communications Pty Ltd
Alex Lodge
@@ -182083,6 +182083,166 @@ Decentralization / Helenic Public Administra
hahnefeld.net
Andreas Hahnefeld
info&hahnefeld.net
+45626
+ Sapientia Systems
+ John Liebenau
+ johnliebenau&gmail.com
+45627
+ X NET
+ Igor Malyshkin
+ imalyshkin&xnet.kz
+45628
+ HANFORD (DOE)
+ Michael Epler
+ mepler&rl.gov
+45629
+ Ritron
+ Bruce Ahlemeyer
+ bahlemeyer&ritron.com
+45630
+ Regional Medical Oncology Center
+ Tracie Whitley
+ tracie.whitley&regionaloncology.com
+45631
+ Perimind Corporation
+ Patrick Pyette
+ ppyette&perimind.com
+45632
+ br0.fr
+ Johan Fleury
+ johan.fleury&br0.fr
+45633
+ The Hershey Company
+ Kyle Smith
+ kasmith&hersheys.com
+45634
+ XeeMetric Inc.
+ Konstantin Korf
+ konstantin.korf&xeemetric.com
+45635
+ Cornerstone Health Enablement Strategic Solutions, LLC
+ Ian Atchison
+ infosec&chessmso.com
+45636
+ Robit SAS
+ Maurizio Bovo
+ info&robit.com
+45637
+ Dicks Garage
+ Richard Beck
+ dfb83&dicksgarage.com
+45638
+ AVOLITES LTD
+ ADAM PROFFITT
+ adam&avolites.com
+45639
+ Chen-Hung Chen
+ Todd Chen
+ luvboa&gmail.com
+45640
+ Fujitsu Taiwan Ltd.
+ Todd Chen
+ todd.chen&tw.fujitsu.com
+45641
+ SOARNEX Technology Corporation
+ Ethan Wang
+ ethan.wang&soarnex.com
+45642
+ SITRINICS CAMS, JSC
+ Alexey Zharkov
+ azharkov&sitronics-cams.com
+45643
+ MARETON d.o.o.
+ Matija Markovic
+ mareton&mareton.hr
+45644
+ Tom Maher
+ Tom Maher
+ tom_maher&outlook.com
+45645
+ thinkCSC, Inc
+ Jacob Delgado
+ jacob&thinkcsc.com
+45646
+ UK Shared Business Services Ltd
+ Colin McDerment
+ colin.mcderment&uksbs.co.uk
+45647
+ Grant Thornton UK LLP
+ Adam Stevens
+ adam.stevens&uk.gt.com
+45648
+ Bridgeway Software, Inc.
+ Swarupa Kota
+ swarupa.kota&bridge-way.com
+45649
+ Sousou Industries
+ Cochise Ruhulessin
+ cochise.ruhulessin&sousouindustries.com
+45650
+ Fibersystem AB
+ Anders Fallheden
+ Anders.Fallheden&fibersystem.se
+45651
+ Layer3 TV, Inc.
+ Nobuo Matsushita
+ nobuo&layer3tv.com
+45652
+ New Jersey State Government (Office of Information Technology)
+ Ricardo J Oliveira
+ OIT-DNSadmin&oit.nj.gov
+45653
+ Compression Services
+ Harlan Lane
+ bt.alerts.domainnames&exterran.com
+45654
+ LogicVein, Inc.
+ Leo Bayer
+ leo&lvi.co.jp
+45655
+ CHUNG-HSIN ELECTRIC & MACHINERY MFG. CORP.
+ Alice Li
+ c0000&chem.com.tw
+45656
+ Vector-V, Law Firm
+ Akim Korolev
+ 0255838&gmail.com
+45657
+ Syncbak
+ Timothy Kriz
+ tim.kriz&syncbak.com
+45658
+ P3 GmbH & Co KG
+ Markus Kalmbach
+ helpdesk&p3-group.com
+45659
+ LPO OUI Dev Teams
+ Tristan Le Toullec
+ tristan.letoullec&univ-brest.fr
+45660
+ Pentandra Research Solutions, Inc.
+ Chris Chapman
+ netadmin&pentandra.com
+45661
+ Instec Inc.
+ LH Ji
+ lh.ji&instec.com
+45662
+ Intelligence Ambiante
+ Frédéric Menut
+ frederic.menut&laposte.net
+45663
+ Hochschule Merseburg
+ Dirk Hube
+ netadmin&hs-merseburg.de
+45664
+ Guangzhou Hugen Electronic Technology Co .Ltd
+ wujinming
+ 304252844&qq.com
+45665
+ Biroteh Ltd
+ Mr. Uldis Jaudzems
+ info&biroteh.lv
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 9b58be9713..3694877823 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -1395,7 +1395,7 @@ const value_string sminmpec_values[] = {
{ 1372, "LSI Logic" },
{ 1373, "interWAVE Communications, Inc." },
{ 1374, "mdl-Consult" },
- { 1375, "Firma PAF" },
+ { 1375, "Frobbit AB (formerly \"Firma PAF\")" },
{ 1376, "Nashoba Networks Inc" },
{ 1377, "Comedia Information AB" },
{ 1378, "Harvey Mudd College" },
@@ -22466,7 +22466,7 @@ const value_string sminmpec_values[] = {
{ 22443, "EMETEC" },
{ 22444, "GASCARD Partners, L.P." },
{ 22445, "Simon Holmgaard-IT" },
- { 22446, "SOFTWIN SRL" },
+ { 22446, "Bitdefender SRL (formerly \"SOFTWIN SRL\")" },
{ 22447, "B.Braun Melsungen AG" },
{ 22448, "Cluster-Worxx.net" },
{ 22449, "SOPA" },
@@ -43222,7 +43222,7 @@ const value_string sminmpec_values[] = {
{ 43199, "Aitch-Pea Limited" },
{ 43200, "CLAAS KGaA mbH " },
{ 43201, "bytemine GmbH" },
- { 43202, "Digital Networks UK Ltd" },
+ { 43202, "Zeta Storage Systems Ltd (formerly 'Digital Networks UK Ltd')" },
{ 43203, "TSS COMPANY" },
{ 43204, "Hard 'n Software Consulting GmbH" },
{ 43205, "Aloxa.eu" },
@@ -45133,7 +45133,7 @@ const value_string sminmpec_values[] = {
{ 45110, "IzumoBASE, Inc." },
{ 45111, "Elbrus-RW" },
{ 45112, "Christian Wilhelmi" },
- { 45113, "optimans" },
+ { 45113, "OPTIMANS" },
{ 45114, "PALS Elektronik" },
{ 45115, "Ajenti Solutions" },
{ 45116, "LoJack Corp." },
@@ -45646,6 +45646,46 @@ const value_string sminmpec_values[] = {
{ 45623, "Hughey & Phillips, LLC" },
{ 45624, "Brain Sense" },
{ 45625, "hahnefeld.net" },
+ { 45626, "Sapientia Systems" },
+ { 45627, "X NET" },
+ { 45628, "HANFORD (DOE)" },
+ { 45629, "Ritron" },
+ { 45630, "Regional Medical Oncology Center" },
+ { 45631, "Perimind Corporation" },
+ { 45632, "br0.fr" },
+ { 45633, "The Hershey Company" },
+ { 45634, "XeeMetric Inc." },
+ { 45635, "Cornerstone Health Enablement Strategic Solutions, LLC" },
+ { 45636, "Robit SAS" },
+ { 45637, "Dicks Garage" },
+ { 45638, "AVOLITES LTD" },
+ { 45639, "Chen-Hung Chen" },
+ { 45640, "Fujitsu Taiwan Ltd." },
+ { 45641, "SOARNEX Technology Corporation" },
+ { 45642, "SITRINICS CAMS, JSC" },
+ { 45643, "MARETON d.o.o." },
+ { 45644, "Tom Maher" },
+ { 45645, "thinkCSC, Inc" },
+ { 45646, "UK Shared Business Services Ltd" },
+ { 45647, "Grant Thornton UK LLP" },
+ { 45648, "Bridgeway Software, Inc." },
+ { 45649, "Sousou Industries" },
+ { 45650, "Fibersystem AB" },
+ { 45651, "Layer3 TV, Inc." },
+ { 45652, "New Jersey State Government (Office of Information Technology)" },
+ { 45653, "Compression Services" },
+ { 45654, "LogicVein, Inc." },
+ { 45655, "CHUNG-HSIN ELECTRIC & MACHINERY MFG. CORP." },
+ { 45656, "Vector-V, Law Firm" },
+ { 45657, "Syncbak" },
+ { 45658, "P3 GmbH & Co KG" },
+ { 45659, "LPO OUI Dev Teams" },
+ { 45660, "Pentandra Research Solutions, Inc." },
+ { 45661, "Instec Inc." },
+ { 45662, "Intelligence Ambiante" },
+ { 45663, "Hochschule Merseburg" },
+ { 45664, "Guangzhou Hugen Electronic Technology Co .Ltd" },
+ { 45665, "Biroteh Ltd" },
{ 0, NULL}
};
diff --git a/manuf b/manuf
index b9e91d8876..341559a0b2 100644
--- a/manuf
+++ b/manuf
@@ -9327,7 +9327,7 @@
00:23:95 ArrisGro # ARRIS Group, Inc.
00:23:96 AndesTec # ANDES TECHNOLOGY CORPORATION
00:23:97 WestellT # Westell Technologies Inc.
-00:23:98 SkyContr # Sky Control
+00:23:98 VutlanSr # Vutlan sro
00:23:99 VdDivisi # VD Division, Samsung Electronics Co.
00:23:9A Easydata # EasyData Hardware GmbH
00:23:9B ElsterSo # Elster Solutions, LLC
@@ -16087,7 +16087,7 @@
00:A0:C2 RA # R.A. SYSTEMS CO., LTD.
00:A0:C3 Unicompu # UNICOMPUTER GMBH
00:A0:C4 CristieE # CRISTIE ELECTRONICS LTD.
-00:A0:C5 ZyxelCom # ZYXEL COMMUNICATION
+00:A0:C5 ZyxelCom # ZyXEL Communications Corporation
00:A0:C6 Qualcomm # QUALCOMM INCORPORATED
00:A0:C7 TadiranT # TADIRAN TELECOMMUNICATIONS
00:A0:C8 Adtran # ADTRAN INC.
@@ -17491,6 +17491,7 @@
0C:8C:8F KamoTech # Kamo Technology Limited
0C:8C:DC SuuntoOy # Suunto Oy
0C:8D:98 TopEight # TOP EIGHT IND CORP
+0C:91:60 HuiZhouG # Hui Zhou Gaoshengda Technology Co.,LTD
0C:92:4E RiceLake # Rice Lake Weighing Systems
0C:93:01 PtPrasim # PT. Prasimax Inovasi Teknologi
0C:93:FB BnsSolut # BNS Solutions
@@ -17538,6 +17539,7 @@
0C:E0:E4 Plantron # Plantronics, Inc
0C:E5:D3 DhElectr # DH electronics GmbH
0C:E7:09 FoxCrypt # Fox Crypto B.V.
+0C:E7:25 Microsof # Microsoft Corporation
0C:E8:2F Bonfigli # Bonfiglioli Vectron GmbH
0C:E9:36 ElimosSr # ELIMOS srl
0C:EE:E6 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
@@ -17629,7 +17631,7 @@
10:78:CE HanvitSi # Hanvit SI, Inc.
10:78:D2 Elitegro # ELITEGROUP COMPUTER SYSTEM CO., LTD.
10:7A:86 U&UEngin # U&U ENGINEERING INC.
-10:7B:EF ZyxelCom # ZyXEL Communications Corp
+10:7B:EF ZyxelCom # ZyXEL Communications Corporation
10:83:D2 Microsev # Microseven Systems, LLC
10:88:0F DarumaTe # Daruma Telecomunicações e Informática S.A.
10:88:CE Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd.
@@ -18521,6 +18523,7 @@
2E:2E:2E LaaLocal # LAA (Locally Administered Address) for Meditech Systems
30:05:5C BrotherI # Brother industries, LTD.
30:0B:9C DeltaMob # Delta Mobile Systems, Inc.
+30:0C:23 Zte # zte corporation
30:0D:2A Zhejiang # Zhejiang Wellcom Technology Co.,Ltd.
30:0E:D5 HonHaiPr # Hon Hai Precision Ind.Co.Ltd
30:0E:E3 Aquantia # Aquantia Corporation
@@ -18680,6 +18683,7 @@
34:80:B3 Xiaomi # XIAOMI INC
34:81:37 UnicardS # UNICARD SA
34:81:C4 Avm # AVM GmbH
+34:81:F4 SstTaiwa # SST Taiwan Ltd.
34:82:DE KayoTech # Kayo Technology, Inc.
34:83:02 Iforcom # iFORCOM Co., Ltd
34:84:46 Ericsson # Ericsson AB
@@ -19648,6 +19652,7 @@
44:5F:7A ShihlinE # Shihlin Electric & Engineering Corp.
44:61:32 Ecobee # ecobee inc
44:61:9C Fonsyste # FONsystem co. ltd.
+44:65:6A MegaVide # Mega Video Electronic(HK) Industry Co., Ltd
44:66:6E Ip-Line
44:67:55 OrbitIrr # Orbit Irrigation
44:68:AB Juin # JUIN COMPANY, LIMITED
@@ -19898,7 +19903,7 @@
4C:98:EF Zeo
4C:9E:80 KyokkoEl # KYOKKO ELECTRIC Co., Ltd.
4C:9E:E4 HanyangN # Hanyang Navicom Co.,Ltd.
-4C:9E:FF ZyxelCom # ZyXEL Communications Corp
+4C:9E:FF ZyxelCom # ZyXEL Communications Corporation
4C:A5:15 BaikalEl # Baikal Electronics JSC
4C:A5:6D SamsungE # Samsung Electronics Co.,Ltd
4C:A7:4B AlcatelL # Alcatel Lucent
@@ -19949,6 +19954,7 @@
50:11:EB Silverne # SilverNet Ltd
50:14:B5 RichfitI # Richfit Information Technology Co., Ltd
50:17:FF Cisco
+50:1A:A5 GnNetcom # GN Netcom A/S
50:1A:C5 Microsof # Microsoft
50:1C:BF Cisco
50:20:6B EmersonC # Emerson Climate Technologies Transportation Solutions
@@ -20394,7 +20400,7 @@
5C:F2:07 SpecoTec # Speco Technologies
5C:F3:70 Cc&CTech # CC&C Technologies, Inc
5C:F3:FC Ibm # IBM Corp
-5C:F4:AB ZyxelCom # ZyXEL Communications Corp
+5C:F4:AB ZyxelCom # ZyXEL Communications Corporation
5C:F5:0D Institut # Institute of microelectronic applications
5C:F5:DA Apple
5C:F6:DC SamsungE # Samsung Electronics Co.,LTD
@@ -21028,6 +21034,7 @@
70:B3:D5:02:90:00/36 MarimoEl # Marimo electronics Co.,Ltd.
70:B3:D5:03:00:00/36 TresentT # Tresent Technologies
70:B3:D5:03:B0:00/36 Ssl-Elec # SSL - Electrical Aerospace Ground Equipment Section
+70:B3:D5:03:F0:00/36 Elesar # Elesar Limited
70:B3:D5:04:40:00/36 DonElect # Don Electronics Ltd
70:B3:D5:05:20:00/36 SudoPrem # Sudo Premium Engineering
70:B3:D5:05:80:00/36 TelinkSe # Telink Semiconductor CO, Limtied, Taiwan
@@ -21136,6 +21143,7 @@
70:B3:D5:33:C0:00/36 Videri # Videri Inc.
70:B3:D5:34:10:00/36 VtronPty # Vtron Pty Ltd
70:B3:D5:34:20:00/36 Solectri # Solectrix
+70:B3:D5:34:30:00/36 Elektro- # Elektro-System s.c.
70:B3:D5:34:40:00/36 IhiInspe # IHI Inspection & Instrumentation Co., Ltd.
70:B3:D5:34:60:00/36 Ultamati # Ultamation Limited
70:B3:D5:34:70:00/36 OasSwede # OAS Sweden AB
@@ -21156,6 +21164,7 @@
70:B3:D5:3C:20:00/36 Cellular # Cellular Specialties, Inc.
70:B3:D5:3C:E0:00/36 Aditec # Aditec GmbH
70:B3:D5:3D:20:00/36 Imagine # Imagine Inc.
+70:B3:D5:3D:70:00/36 RemoteSe # Remote Sensing Solutions, Inc.
70:B3:D5:3D:90:00/36 AplexTec # Aplex Technology Inc.
70:B3:D5:3D:A0:00/36 LoopLabs # Loop Labs, Inc.
70:B3:D5:3D:B0:00/36 KstTechn # KST technology
@@ -21169,6 +21178,7 @@
70:B3:D5:3E:F0:00/36 VtronPty # Vtron Pty Ltd
70:B3:D5:3F:10:00/36 OlympusN # Olympus NDT Canada
70:B3:D5:3F:90:00/36 HerrickT # Herrick Tech Labs
+70:B3:D5:3F:F0:00/36 HydraCon # Hydra Controls
70:B3:D5:40:A0:00/36 MonroeEl # Monroe Electronics, Inc.
70:B3:D5:41:20:00/36 TattileS # TATTILE SRL
70:B3:D5:41:70:00/36 FigmentD # Figment Design Laboratories
@@ -21194,6 +21204,7 @@
70:B3:D5:4A:A0:00/36 TwowayCo # Twoway Communications, Inc.
70:B3:D5:4A:D0:00/36 Gaci
70:B3:D5:4B:10:00/36 LaceLlc # LACE LLC.
+70:B3:D5:4B:A0:00/36 Sinftech # Sinftech LLC
70:B3:D5:4B:B0:00/36 Plazma-T
70:B3:D5:4C:10:00/36 QuercusT # QUERCUS TECHNOLOGIES, S. L.
70:B3:D5:4C:80:00/36 Hosokawa # Hosokawa Micron Powder Systems
@@ -21228,6 +21239,7 @@
70:B3:D5:58:F0:00/36 Lsl # LSL systems
70:B3:D5:5A:20:00/36 WallnerA # Wallner Automation GmbH
70:B3:D5:5A:80:00/36 Farmobil # Farmobile
+70:B3:D5:5A:90:00/36 BunkaShu # Bunka Shutter Co., Ltd.
70:B3:D5:5A:A0:00/36 ChugokuE # Chugoku Electric Manufacturing Co.,Inc
70:B3:D5:5B:00:00/36 QxpertsI # Qxperts Italia S.r.l.
70:B3:D5:5B:50:00/36 LehighEl # Lehigh Electric Products Co
@@ -21255,6 +21267,7 @@
70:B3:D5:65:C0:00/36 AplexTec # Aplex Technology Inc.
70:B3:D5:65:D0:00/36 GegaElec # GEGA ELECTRONIQUE
70:B3:D5:66:00:00/36 SmartSer # Smart Service Technologies CO., LTD
+70:B3:D5:66:40:00/36 SankyoIn # Sankyo Intec co.,ltd
70:B3:D5:66:50:00/36 Certusus # CertUsus GmbH
70:B3:D5:67:90:00/36 Emac # EMAC, Inc.
70:B3:D5:68:20:00/36 Rosslare # Rosslare Enterprises Limited
@@ -21285,6 +21298,7 @@
70:B3:D5:71:E0:00/36 MotecPty # Motec Pty Ltd
70:B3:D5:72:90:00/36 Emac # EMAC, Inc.
70:B3:D5:72:D0:00/36 KronMedi # Kron Medidores
+70:B3:D5:73:00:00/36 Videogen # Videogenix
70:B3:D5:73:10:00/36 Phoniro # Phoniro Systems AB
70:B3:D5:73:20:00/36 Tofwerk # TOFWERK AG
70:B3:D5:73:E0:00/36 TridentR # Trident RFID Pty Ltd
@@ -21303,6 +21317,7 @@
70:B3:D5:79:B0:00/36 Soniclea # Soniclean Pty Ltd
70:B3:D5:79:E0:00/36 Cw2 # CW2. Gmbh & Co. KG
70:B3:D5:7A:70:00/36 Symbicon # Symbicon Ltd
+70:B3:D5:7A:80:00/36 Dieentwi # dieEntwickler Elektronik GmbH
70:B3:D5:7A:90:00/36 Adidas # adidas AG
70:B3:D5:7A:D0:00/36 Insitu # Insitu Inc
70:B3:D5:7A:E0:00/36 ExiFlowM # Exi Flow Measurement Ltd
@@ -21373,6 +21388,7 @@
70:B3:D5:9D:B0:00/36 CasMedic # CAS Medical Systems, Inc
70:B3:D5:9E:70:00/36 XiamenMa # Xiamen Maxincom Technologies Co., Ltd.
70:B3:D5:9F:10:00/36 Rfel # RFEL Ltd
+70:B3:D5:9F:20:00/36 AcordeTe # Acorde Technologies
70:B3:D5:9F:40:00/36 TbandSrl # Tband srl
70:B3:D5:9F:50:00/36 VickersE # Vickers Electronics Ltd
70:B3:D5:A0:00:00/36 AtxNetwo # ATX NETWORKS LTD
@@ -21503,6 +21519,7 @@
70:B3:D5:CF:F0:00/36 DtechLab # DTECH Labs, Inc.
70:B3:D5:D0:C0:00/36 ConnorWi # Connor Winfield LTD
70:B3:D5:D0:D0:00/36 Logiwast # Logiwaste AB
+70:B3:D5:D0:E0:00/36 BeijingA # Beijing Aumiwalker technology CO.,LTD
70:B3:D5:D1:E0:00/36 HoustonR # Houston Radar LLC
70:B3:D5:D1:F0:00/36 Embsec # Embsec AB
70:B3:D5:D2:D0:00/36 EvoluteP # Evolute Systems Private Limited
@@ -21603,6 +21620,7 @@
70:B3:D5:F6:30:00/36 ArsProdu # Ars Products
70:B3:D5:F6:80:00/36 AlZajelM # AL ZAJEL MODERN TELECOMM
70:B3:D5:F7:20:00/36 HanshinE # Hanshin Electronics
+70:B3:D5:F7:30:00/36 AslHoldi # ASL Holdings
70:B3:D5:F7:80:00/36 ManvishE # Manvish eTech Pvt. Ltd.
70:B3:D5:F7:E0:00/36 AlphaEle # Alpha Elettronica s.r.l.
70:B3:D5:F8:C0:00/36 European # EUROPEAN ADVANCED TECHNOLOGIES
@@ -21914,6 +21932,7 @@
78:E8:B6 Zte # zte corporation
78:E9:80 Rainus # RainUs Co.,Ltd
78:EB:14 Shenzhen # SHENZHEN FAST TECHNOLOGIES CO.,LTD
+78:EB:39 Institut # Instituto Nacional de Tecnología Industrial
78:EC:22 Shanghai # Shanghai Qihui Telecom Technology Co., LTD
78:EC:74 Kyland-U # Kyland-USA
78:EF:4C Unetconv # Unetconvergence Co., Ltd.
@@ -22004,6 +22023,7 @@
7C:97:63 Openmati # Openmatics s.r.o.
7C:9A:9B VseValen # VSE valencia smart energy
7C:A1:5D GnResoun # GN ReSound A/S
+7C:A2:3E HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
7C:A2:9B DSignt # D.SignT GmbH & Co. KG
7C:A6:1D MhlLlc # MHL, LLC
7C:AC:B2 BoschSof # Bosch Software Innovations GmbH
@@ -22012,6 +22032,7 @@
7C:B1:77 Satelco # Satelco AG
7C:B2:1B CiscoSpv # Cisco SPVTG
7C:B2:32 HuiZhouG # Hui Zhou Gaoshengda Technology Co.,LTD
+7C:B2:5C AcaciaCo # Acacia Communications
7C:B5:42 AcesTech # ACES Technology
7C:B7:33 AskeyCom # ASKEY COMPUTER CORP
7C:B7:7B Paradigm # Paradigm Electronics Inc
@@ -22353,6 +22374,7 @@
88:5A:92 Cisco
88:5B:DD Aerohive # Aerohive Networks Inc.
88:5C:47 AlcatelL # Alcatel Lucent
+88:5D:90 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information.
88:61:5A SianoMob # Siano Mobile Silicon Ltd.
88:63:DF Apple
88:68:5C Shenzhen # Shenzhen ChuangDao & Perpetual Eternal Technology Co.,Ltd
@@ -22847,6 +22869,7 @@
98:6B:3D ArrisGro # ARRIS Group, Inc.
98:6C:F5 Zte # zte corporation
98:6D:C8 ToshibaM # TOSHIBA MITSUBISHI-ELECTRIC INDUSTRIAL SYSTEMS CORPORATION
+98:70:E8 Innatech # INNATECH SDN BHD
98:73:C4 SageElec # Sage Electronic Engineering LLC
98:76:B6 Adafruit
98:77:70 PepDigit # Pep Digital Technology (Guangzhou) Co., Ltd
@@ -23540,6 +23563,7 @@ B0:34:95 Apple
B0:35:8D Nokia # Nokia Corporation
B0:38:29 Siliconw # Siliconware Precision Industries Co., Ltd.
B0:38:50 NanjingC # Nanjing CAS-ZDC IOT SYSTEM CO.,LTD
+B0:41:1D IttimTec # ITTIM Technologies
B0:43:5D Nuleds # NuLEDs, Inc.
B0:45:15 MiraFitn # mira fitness,LLC.
B0:45:19 TctMobil # TCT mobile ltd
@@ -23596,7 +23620,7 @@ B0:AA:36 Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.
B0:AA:77 Cisco
B0:AC:FA Fujitsu # Fujitsu Limited
B0:AD:AA Avaya # Avaya, Inc
-B0:B2:DC ZyxelCom # Zyxel Communications Corporation
+B0:B2:DC ZyxelCom # ZyXEL Communications Corporation
B0:B3:2B SlicanSp # Slican Sp. z o.o.
B0:B4:48 TexasIns # Texas Instruments
B0:B8:D5 NanjingN # Nanjing Nengrui Auto Equipment CO.,Ltd
@@ -24280,6 +24304,7 @@ C8:35:B8 Ericsson # Ericsson, EAB/RWI/K
C8:3A:35 TendaTec # Tenda Technology Co., Ltd.
C8:3B:45 Jri-Maxa # JRI-Maxant
C8:3D:97 Nokia # Nokia Corporation
+C8:3D:FC PioneerD # Pioneer DJ Coroporation
C8:3E:99 TexasIns # Texas Instruments
C8:3E:A7 Kunbus # KUNBUS GmbH
C8:3F:B4 ArrisGro # ARRIS Group, Inc.
@@ -24293,7 +24318,7 @@ C8:56:63 SunflexE # Sunflex Europe GmbH
C8:60:00 AsustekC # ASUSTek COMPUTER INC.
C8:64:C7 Zte # zte corporation
C8:6C:1E Display # Display Systems Ltd
-C8:6C:87 ZyxelCom # Zyxel Communications Corp
+C8:6C:87 ZyxelCom # ZyXEL Communications Corporation
C8:6C:B6 Optcom # Optcom Co., Ltd.
C8:6F:1D Apple
C8:72:48 AplicomO # Aplicom Oy
@@ -24950,6 +24975,7 @@ DC:9B:9C Apple
DC:9C:52 Sapphire # Sapphire Technology Limited.
DC:9F:A4 Nokia # Nokia Corporation
DC:9F:DB Ubiquiti # Ubiquiti Networks, Inc.
+DC:A3:AC Rbcloudt # RBcloudtech
DC:A5:F4 Cisco
DC:A6:BD BeijingL # Beijing Lanbo Technology Co., Ltd.
DC:A7:D9 Compress # Compressor Controls Corp
@@ -25025,6 +25051,7 @@ E0:3E:44 Broadcom # Broadcom Corporation
E0:3E:4A Cavanagh # Cavanagh Group International
E0:3E:7D Data-Com # data-complex GmbH
E0:3F:49 AsustekC # ASUSTek COMPUTER INC.
+E0:41:36 Mitrasta # MitraStar Technology Corp.
E0:46:9A Netgear
E0:4B:45 Hi-PElec # Hi-P Electronics Pte Ltd
E0:55:97 Emergent # Emergent Vision Technologies Inc.
@@ -25420,6 +25447,7 @@ EC:9B:5B Nokia # Nokia Corporation
EC:9E:CD ArtesynE # Artesyn Embedded Technologies
EC:A2:9B KemppiOy # Kemppi Oy
EC:A8:6B Elitegro # ELITEGROUP COMPUTER SYSTEMS CO., LTD.
+EC:A9:FA Guangdon # GUANGDONG GENIUS TECHNOLOGY CO.,LTD.
EC:B1:06 AcuroNet # Acuro Networks, Inc
EC:B1:D7 HewlettP # Hewlett Packard
EC:B5:41 ShinanoE # SHINANO E and E Co.Ltd.
@@ -25528,6 +25556,7 @@ F0:92:1C HewlettP # Hewlett Packard
F0:93:3A Nxtconec # NxtConect
F0:93:C5 GarlandT # Garland Technology
F0:99:BF Apple
+F0:9A:51 Shanghai # Shanghai Viroyal Electronic Technology Company Limited
F0:9C:BB Raonthin # RaonThink Inc.
F0:9C:E9 Aerohive # Aerohive Networks Inc
F0:9E:63 Cisco
@@ -25539,6 +25568,7 @@ F0:AC:A4 Hbc-Radi # HBC-radiomatic
F0:AD:4E Globalsc # Globalscale Technologies, Inc.
F0:AE:51 Xi3 # Xi3 Corp
F0:B0:52 RuckusWi # Ruckus Wireless
+F0:B4:29 XiaomiEl # XIAOMI Electronics,CO.,LTD
F0:B4:79 Apple
F0:B6:EB PoslabTe # Poslab Technology Co., Ltd.
F0:BC:C8 MaxidPty # MaxID (Pty) Ltd
@@ -25666,6 +25696,7 @@ F4:B6:E5 Terrasem # TerraSem Co.,Ltd
F4:B7:2A TimeInte # TIME INTERCONNECT LTD
F4:B7:E2 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd.
F4:B8:5E TexasIns # Texas INstruments
+F4:B8:A7 Zte # zte corporation
F4:BD:7C ChengduJ # Chengdu jinshi communication Co., LTD
F4:C4:47 CoagentI # Coagent International Enterprise Limited
F4:C6:D7 Blackned # blackned GmbH
@@ -25687,6 +25718,7 @@ F4:E3:FB HuaweiTe # Huawei Technologies Co., Ltd
F4:E6:D7 SolarPow # Solar Power Technologies, Inc.
F4:E9:D4 Qlogic # QLogic Corporation
F4:EA:67 Cisco # CISCO SYSTEMS, INC.
+F4:EB:38 Sagem
F4:EC:38 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD.
F4:EE:14 Shenzhen # SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.
F4:F1:5A Apple
@@ -25793,6 +25825,7 @@ F8:B2:F3 Guangzho # GUANGZHOU BOSMA TECHNOLOGY CO.,LTD
F8:B5:99 Guangzho # Guangzhou CHNAVS Digital Technology Co.,Ltd
F8:BC:12 Dell # Dell Inc
F8:BC:41 Rosslare # Rosslare Enterprises Limited
+F8:BF:09 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD
F8:C0:01 JuniperN # Juniper Networks
F8:C0:91 Highgate # Highgates Technology
F8:C2:88 Cisco
@@ -25932,6 +25965,7 @@ FC:D4:F2 CocaCola # The Coca Cola Company
FC:D4:F6 MessanaA # Messana Air.Ray Conditioning s.r.l.
FC:D5:D9 Shenzhen # Shenzhen SDMC Technology Co., Ltd.
FC:D6:BD RobertBo # Robert Bosch GmbH
+FC:D7:33 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD
FC:D8:17 BeijingH # Beijing Hesun Technologies Co.Ltd.
FC:DB:96 Enervall # ENERVALLEY CO., LTD
FC:DB:B3 MurataMa # Murata Manufacturing Co., Ltd.
diff --git a/services b/services
index a355bff8d2..27983dd1c3 100644
--- a/services
+++ b/services
@@ -9365,8 +9365,8 @@ afesc-mc 6628/udp # AFE Stock Channel M/C [K_K_Ho] [K_K_Ho] 2004-04
mxodbc-connect 6632/tcp # eGenix mxODBC Connect [Marc_Andre_Lemburg] [Marc_Andre_Lemburg] 2009-11-13 Unauthorized Use Known on port 6632
cisco-vpath-tun 6633/udp # Cisco vPath Services Overlay [Cisco2] [Surendra_Kumar] 2012-06-11
mpls-pm 6634/udp # MPLS Performance Measurement out-of-band response [Cisco_Systems_2] [Sagar_Soni] 2014-02-20
-mpls-udp 6635/udp # Encapsulate MPLS packets in UDP tunnels. [IESG] [IETF_Chair] 2015-02-10 [RFC-ietf-mpls-in-udp-11]
-mpls-udp-dtls 6636/udp # Encapsulate MPLS packets in UDP tunnels with DTLS. [IESG] [IETF_Chair] 2015-02-10 [RFC-ietf-mpls-in-udp-11]
+mpls-udp 6635/udp # Encapsulate MPLS packets in UDP tunnels. [IESG] [IETF_Chair] 2015-02-10 [RFC7510]
+mpls-udp-dtls 6636/udp # Encapsulate MPLS packets in UDP tunnels with DTLS. [IESG] [IETF_Chair] 2015-02-10 [RFC7510]
ovsdb 6640/tcp # Open vSwitch Database protocol [Bruce_Davie_2] [Bruce_Davie_2] 2013-07-31 [RFC7047]
openflow 6653/tcp # OpenFlow [Open_Networking_Foundation] [Puneet_Agarwal] 2013-07-18
openflow 6653/udp # OpenFlow [Open_Networking_Foundation] [Puneet_Agarwal] 2013-07-18
@@ -10572,7 +10572,7 @@ MOS-soap 10543/tcp # MOS SOAP Default Port [Eric_Thorniley] [Eric_Thornil
MOS-soap 10543/udp # MOS SOAP Default Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17
MOS-soap-opt 10544/tcp # MOS SOAP Optional Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17
MOS-soap-opt 10544/udp # MOS SOAP Optional Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17
-printopia 10631/tcp # Port to allow for administration and control of "Printopia" application software, which provides printing services to mobile users [Ecamm_Network_LLC] [Chris_Kent] 2011-10-24
+printopia 10631/tcp # Printopia Serve [Decisive_Tactics_Inc] [Chris_Kent] 2011-10-24 2015-04-09
gap 10800/tcp # Gestor de Acaparamiento para Pocket PCs [Juan_Carlos_Olivares] [Juan_Carlos_Olivares] 2006-03
gap 10800/udp # Gestor de Acaparamiento para Pocket PCs [Juan_Carlos_Olivares] [Juan_Carlos_Olivares] 2006-03
lpdg 10805/tcp # LUCIA Pareja Data Group [Alvaro_P_Dominguez] [Alvaro_P_Dominguez] 2006-02
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 48dc3d5f1b..a4982138a3 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -4288,9 +4288,15 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
</message>
<message>
<location filename="main_status_bar.cpp" line="352"/>
+ <location filename="main_status_bar.cpp" line="372"/>
<source>No Packets</source>
<translation>Keine Pakete</translation>
</message>
+ <message>
+ <location filename="main_status_bar.cpp" line="368"/>
+ <source>Packets: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWelcome</name>
@@ -6416,133 +6422,133 @@ text-decoration: underline;
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="648"/>
+ <location filename="main_window.cpp" line="650"/>
<source>Save packets before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="649"/>
+ <location filename="main_window.cpp" line="651"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="655"/>
+ <location filename="main_window.cpp" line="657"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="657"/>
+ <location filename="main_window.cpp" line="659"/>
<source>Changes must be saved before the files can be merged.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="716"/>
+ <location filename="main_window.cpp" line="718"/>
<location filename="main_window_slots.cpp" line="175"/>
<source>Invalid Display Filter</source>
<translation>Ungültiger Anzeigefilter</translation>
</message>
<message>
- <location filename="main_window.cpp" line="717"/>
+ <location filename="main_window.cpp" line="719"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="805"/>
+ <location filename="main_window.cpp" line="807"/>
<source> before importing a new capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1117"/>
+ <location filename="main_window.cpp" line="1119"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1118"/>
+ <location filename="main_window.cpp" line="1120"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Pakete können nicht in die aktuelle Mitschnittdatei exportiert werden.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1205"/>
- <location filename="main_window.cpp" line="1230"/>
+ <location filename="main_window.cpp" line="1207"/>
+ <location filename="main_window.cpp" line="1232"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1268"/>
+ <location filename="main_window.cpp" line="1270"/>
<source>You have unsaved packets</source>
<translation>Sie haben nicht gespeicherte Pakete</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1269"/>
+ <location filename="main_window.cpp" line="1271"/>
<source>They will be lost if you don&apos;t save them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1272"/>
- <location filename="main_window.cpp" line="1285"/>
+ <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1287"/>
<source>Do you want to stop the capture and save the captured packets</source>
<translation>Soll der Mitschnitt gestoppt werden und die aufgezeichneten Pakete gespeichert werden</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1276"/>
<source>Do you want to save the captured packets</source>
<translation>Sollen die aufgezeichneten Pakete gespeichert werden</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1276"/>
- <location filename="main_window.cpp" line="1286"/>
+ <location filename="main_window.cpp" line="1278"/>
+ <location filename="main_window.cpp" line="1288"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1288"/>
+ <location filename="main_window.cpp" line="1290"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>Die aufgezeichneten Pakete gehen verloren wenn sie nicht gespeichert werden.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1291"/>
+ <location filename="main_window.cpp" line="1293"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1297"/>
+ <location filename="main_window.cpp" line="1299"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Änderungen gehen verloren, wenn sie nicht gesichert werden.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1309"/>
+ <location filename="main_window.cpp" line="1311"/>
<source>Stop and Save</source>
<translation>Stoppen und speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1317"/>
+ <location filename="main_window.cpp" line="1319"/>
<source>Stop and Quit without Saving</source>
<translation>Stoppen und beenden ohne zu speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1320"/>
+ <location filename="main_window.cpp" line="1322"/>
<source>Quit without Saving</source>
<translation>Ohne speichern beenden</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1325"/>
+ <location filename="main_window.cpp" line="1327"/>
<source>Stop and Continue without Saving</source>
<translation>Stoppen und ohne zu speichern weitermachen</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1328"/>
+ <location filename="main_window.cpp" line="1330"/>
<source>Continue &amp;without Saving</source>
<translation>Weitermachen &amp;ohne zu speichern</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1597"/>
+ <location filename="main_window.cpp" line="1599"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Dateiname kann nicht auf UTF-8 angewendet werden)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1609"/>
- <location filename="main_window.cpp" line="1615"/>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1611"/>
+ <location filename="main_window.cpp" line="1617"/>
+ <location filename="main_window.cpp" line="1632"/>
<source>The Wireshark Network Analyzer</source>
<translation>Die Wireshark Netzwerk Analysesoftware</translation>
</message>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 68aefc3a17..558121e196 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -4259,9 +4259,15 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="main_status_bar.cpp" line="352"/>
+ <location filename="main_status_bar.cpp" line="372"/>
<source>No Packets</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="main_status_bar.cpp" line="368"/>
+ <source>Packets: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWelcome</name>
@@ -6357,133 +6363,133 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="648"/>
+ <location filename="main_window.cpp" line="650"/>
<source>Save packets before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="649"/>
+ <location filename="main_window.cpp" line="651"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="655"/>
+ <location filename="main_window.cpp" line="657"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="657"/>
+ <location filename="main_window.cpp" line="659"/>
<source>Changes must be saved before the files can be merged.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="716"/>
+ <location filename="main_window.cpp" line="718"/>
<location filename="main_window_slots.cpp" line="175"/>
<source>Invalid Display Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="717"/>
+ <location filename="main_window.cpp" line="719"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="805"/>
+ <location filename="main_window.cpp" line="807"/>
<source> before importing a new capture</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1117"/>
+ <location filename="main_window.cpp" line="1119"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1118"/>
+ <location filename="main_window.cpp" line="1120"/>
<source>You cannot export packets to the current capture file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1205"/>
- <location filename="main_window.cpp" line="1230"/>
+ <location filename="main_window.cpp" line="1207"/>
+ <location filename="main_window.cpp" line="1232"/>
<source>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1268"/>
+ <location filename="main_window.cpp" line="1270"/>
<source>You have unsaved packets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1269"/>
+ <location filename="main_window.cpp" line="1271"/>
<source>They will be lost if you don&apos;t save them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1272"/>
- <location filename="main_window.cpp" line="1285"/>
+ <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1287"/>
<source>Do you want to stop the capture and save the captured packets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1276"/>
<source>Do you want to save the captured packets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1276"/>
- <location filename="main_window.cpp" line="1286"/>
+ <location filename="main_window.cpp" line="1278"/>
+ <location filename="main_window.cpp" line="1288"/>
<source>?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1288"/>
+ <location filename="main_window.cpp" line="1290"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1291"/>
+ <location filename="main_window.cpp" line="1293"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1297"/>
+ <location filename="main_window.cpp" line="1299"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1309"/>
+ <location filename="main_window.cpp" line="1311"/>
<source>Stop and Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1317"/>
+ <location filename="main_window.cpp" line="1319"/>
<source>Stop and Quit without Saving</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1320"/>
+ <location filename="main_window.cpp" line="1322"/>
<source>Quit without Saving</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1325"/>
+ <location filename="main_window.cpp" line="1327"/>
<source>Stop and Continue without Saving</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1328"/>
+ <location filename="main_window.cpp" line="1330"/>
<source>Continue &amp;without Saving</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1597"/>
+ <location filename="main_window.cpp" line="1599"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1609"/>
- <location filename="main_window.cpp" line="1615"/>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1611"/>
+ <location filename="main_window.cpp" line="1617"/>
+ <location filename="main_window.cpp" line="1632"/>
<source>The Wireshark Network Analyzer</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index a68ab77630..c5f8dafef0 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -4259,9 +4259,15 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="main_status_bar.cpp" line="352"/>
+ <location filename="main_status_bar.cpp" line="372"/>
<source>No Packets</source>
<translation>Pas de paquets</translation>
</message>
+ <message>
+ <location filename="main_status_bar.cpp" line="368"/>
+ <source>Packets: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWelcome</name>
@@ -6357,134 +6363,134 @@ a:hover {
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="648"/>
+ <location filename="main_window.cpp" line="650"/>
<source>Save packets before merging?</source>
<translation>Sauvegarder les paquets avant la fusion?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="649"/>
+ <location filename="main_window.cpp" line="651"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>une capture temporaire ne peut pas etre fusionner.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="655"/>
+ <location filename="main_window.cpp" line="657"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>Sauvegarder les changements dans &quot;%1&quot; avant la fusion?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="657"/>
+ <location filename="main_window.cpp" line="659"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Les changements doivent etre sauvegarder avant la fusion de fichier.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="716"/>
+ <location filename="main_window.cpp" line="718"/>
<location filename="main_window_slots.cpp" line="175"/>
<source>Invalid Display Filter</source>
<translation>Filtre d&apos;affichage invalide</translation>
</message>
<message>
- <location filename="main_window.cpp" line="717"/>
+ <location filename="main_window.cpp" line="719"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation>Le filtre %1 n&apos;est pas un filtre d&apos;affichage valide (%2).</translation>
</message>
<message>
- <location filename="main_window.cpp" line="805"/>
+ <location filename="main_window.cpp" line="807"/>
<source> before importing a new capture</source>
<translation> avant l&apos;import d&apos;une nouvelle capture</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1117"/>
+ <location filename="main_window.cpp" line="1119"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>Impossible d&apos;exporter dans &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1118"/>
+ <location filename="main_window.cpp" line="1120"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Vous ne pouvez pas exporter les paquets de la capture en cours.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1205"/>
- <location filename="main_window.cpp" line="1230"/>
+ <location filename="main_window.cpp" line="1207"/>
+ <location filename="main_window.cpp" line="1232"/>
<source>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="main_window.cpp" line="1268"/>
+ <location filename="main_window.cpp" line="1270"/>
<source>You have unsaved packets</source>
<translation>Vous avez des paquets non sauvegardés</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1269"/>
+ <location filename="main_window.cpp" line="1271"/>
<source>They will be lost if you don&apos;t save them.</source>
<translation>Ils seront perdues si vous ne les enregistrez pas.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1272"/>
- <location filename="main_window.cpp" line="1285"/>
+ <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1287"/>
<source>Do you want to stop the capture and save the captured packets</source>
<translation>
Voulez-vous arrêter la capture et enregistrer les paquets capturés</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1276"/>
<source>Do you want to save the captured packets</source>
<translation>Voulez-vous enregistrer les paquets capturés</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1276"/>
- <location filename="main_window.cpp" line="1286"/>
+ <location filename="main_window.cpp" line="1278"/>
+ <location filename="main_window.cpp" line="1288"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1288"/>
+ <location filename="main_window.cpp" line="1290"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>Votre capture de paquet sera perdu si vous ne les enregistrez pas.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1291"/>
+ <location filename="main_window.cpp" line="1293"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>Voulez-vous enregistrer les modifications que vous avez apportées au fichier de capture &quot;%1&quot;%2?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1297"/>
+ <location filename="main_window.cpp" line="1299"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Vos changements seront perdus si vous ne les enregistrez pas.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1309"/>
+ <location filename="main_window.cpp" line="1311"/>
<source>Stop and Save</source>
<translation>Arreter et Sauvegarder</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1317"/>
+ <location filename="main_window.cpp" line="1319"/>
<source>Stop and Quit without Saving</source>
<translation>Arreter et Quitter sans Sauvegarder</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1320"/>
+ <location filename="main_window.cpp" line="1322"/>
<source>Quit without Saving</source>
<translation>Quitter sans Sauvegarder</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1325"/>
+ <location filename="main_window.cpp" line="1327"/>
<source>Stop and Continue without Saving</source>
<translation>Arreter et Continuer sans Sauvegarder</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1328"/>
+ <location filename="main_window.cpp" line="1330"/>
<source>Continue &amp;without Saving</source>
<translation>Continuer sans &amp;Sauvegarder</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1597"/>
+ <location filename="main_window.cpp" line="1599"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Nom du fichier ne peut pas être mappé à l&apos;UTF-8)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1609"/>
- <location filename="main_window.cpp" line="1615"/>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1611"/>
+ <location filename="main_window.cpp" line="1617"/>
+ <location filename="main_window.cpp" line="1632"/>
<source>The Wireshark Network Analyzer</source>
<translation>L&apos;analyseur de réseau Wireshark</translation>
</message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 339c071795..c9012fa8a4 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -4306,9 +4306,15 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
</message>
<message>
<location filename="main_status_bar.cpp" line="352"/>
+ <location filename="main_status_bar.cpp" line="372"/>
<source>No Packets</source>
<translation>Nessun pacchetto</translation>
</message>
+ <message>
+ <location filename="main_status_bar.cpp" line="368"/>
+ <source>Packets: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWelcome</name>
@@ -6434,133 +6440,133 @@ a:hover {
<translation>pannelloVuoto</translation>
</message>
<message>
- <location filename="main_window.cpp" line="648"/>
+ <location filename="main_window.cpp" line="650"/>
<source>Save packets before merging?</source>
<translation>Salvare i pacchetti prima di unire?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="649"/>
+ <location filename="main_window.cpp" line="651"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>Un file di cattura temporaneo non può essere unito.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="655"/>
+ <location filename="main_window.cpp" line="657"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>Salvare le modifiche a &quot;%1&quot; prima di unire?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="657"/>
+ <location filename="main_window.cpp" line="659"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Le modifiche devono essere salvate prima di unire.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="716"/>
+ <location filename="main_window.cpp" line="718"/>
<location filename="main_window_slots.cpp" line="175"/>
<source>Invalid Display Filter</source>
<translation>Filtro di visualizzazione non valido</translation>
</message>
<message>
- <location filename="main_window.cpp" line="717"/>
+ <location filename="main_window.cpp" line="719"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation>L&apos;espressione %1 non è un filtro di visualizzazione valido (%2).</translation>
</message>
<message>
- <location filename="main_window.cpp" line="805"/>
+ <location filename="main_window.cpp" line="807"/>
<source> before importing a new capture</source>
<translation>prima di importare una nuova cattura</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1117"/>
+ <location filename="main_window.cpp" line="1119"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>Impossibile esportare su &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1118"/>
+ <location filename="main_window.cpp" line="1120"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Non puoi esportare pacchetti sul file di cattura attuale.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1205"/>
- <location filename="main_window.cpp" line="1230"/>
+ <location filename="main_window.cpp" line="1207"/>
+ <location filename="main_window.cpp" line="1232"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1268"/>
+ <location filename="main_window.cpp" line="1270"/>
<source>You have unsaved packets</source>
<translation>Hai pacchetti non salvati</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1269"/>
+ <location filename="main_window.cpp" line="1271"/>
<source>They will be lost if you don&apos;t save them.</source>
<translation>Saranno persi se non li salvi.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1272"/>
- <location filename="main_window.cpp" line="1285"/>
+ <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1287"/>
<source>Do you want to stop the capture and save the captured packets</source>
<translation>Vuoi interrompere la cattura e salvare i pacchetti catturati</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1276"/>
<source>Do you want to save the captured packets</source>
<translation>Vuoi salvare i pacchetti catturati</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1276"/>
- <location filename="main_window.cpp" line="1286"/>
+ <location filename="main_window.cpp" line="1278"/>
+ <location filename="main_window.cpp" line="1288"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1288"/>
+ <location filename="main_window.cpp" line="1290"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>I pacchetti catturati saranno persi se non li salvi.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1291"/>
+ <location filename="main_window.cpp" line="1293"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>Vuoi salvare le modifiche che hai apportato al file di cattura &quot;%1&quot;%2?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1297"/>
+ <location filename="main_window.cpp" line="1299"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Le modifiche saranno perse se non le salvi.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1309"/>
+ <location filename="main_window.cpp" line="1311"/>
<source>Stop and Save</source>
<translation>Ferma e salva</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1317"/>
+ <location filename="main_window.cpp" line="1319"/>
<source>Stop and Quit without Saving</source>
<translation>Ferma ed esci senza salvare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1320"/>
+ <location filename="main_window.cpp" line="1322"/>
<source>Quit without Saving</source>
<translation>Esci senza salvare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1325"/>
+ <location filename="main_window.cpp" line="1327"/>
<source>Stop and Continue without Saving</source>
<translation>Ferma e continua senza salvare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1328"/>
+ <location filename="main_window.cpp" line="1330"/>
<source>Continue &amp;without Saving</source>
<translation>Continua &amp;senza salvare</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1597"/>
+ <location filename="main_window.cpp" line="1599"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Il nome del file non può essere associato in UTF-8)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1609"/>
- <location filename="main_window.cpp" line="1615"/>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1611"/>
+ <location filename="main_window.cpp" line="1617"/>
+ <location filename="main_window.cpp" line="1632"/>
<source>The Wireshark Network Analyzer</source>
<translation>Wireshark l&apos;analizzatore di rete</translation>
</message>
diff --git a/ui/qt/wireshark_ja_JP.qm b/ui/qt/wireshark_ja_JP.qm
index 5a869b6253..3cd626a076 100644
--- a/ui/qt/wireshark_ja_JP.qm
+++ b/ui/qt/wireshark_ja_JP.qm
Binary files differ
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 2705d75c0f..79576610a9 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1836,17 +1836,17 @@ PLEASE NOTE: One option MUST be selected.</source>
<message>
<location filename="follow_stream_dialog.cpp" line="1209"/>
<source>Follow TCP Stream (%1)</source>
- <translation type="unfinished"></translation>
+ <translation>TCPストリームを追跡 (%1)</translation>
</message>
<message>
<location filename="follow_stream_dialog.cpp" line="1216"/>
<source>Follow UDP Stream (%1)</source>
- <translation type="unfinished"></translation>
+ <translation>UDPストリームを追跡 (%1)</translation>
</message>
<message>
<location filename="follow_stream_dialog.cpp" line="1223"/>
<source>Follow SSL Stream (%1)</source>
- <translation type="unfinished"></translation>
+ <translation>SSLストリームを追跡 (%1)</translation>
</message>
<message>
<location filename="follow_stream_dialog.cpp" line="1245"/>
@@ -4296,9 +4296,15 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="main_status_bar.cpp" line="352"/>
+ <location filename="main_status_bar.cpp" line="372"/>
<source>No Packets</source>
<translation>パケットなし</translation>
</message>
+ <message>
+ <location filename="main_status_bar.cpp" line="368"/>
+ <source>Packets: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWelcome</name>
@@ -6394,133 +6400,133 @@ a:hover {
<translation>空のペイン</translation>
</message>
<message>
- <location filename="main_window.cpp" line="648"/>
+ <location filename="main_window.cpp" line="650"/>
<source>Save packets before merging?</source>
<translation>結合する前にパケットを保存しますか？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="649"/>
+ <location filename="main_window.cpp" line="651"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>一時的なキャプチャファイルは結合することができません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="655"/>
+ <location filename="main_window.cpp" line="657"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>結合する前に変更を保存しますか？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="657"/>
+ <location filename="main_window.cpp" line="659"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>ファイルを結合する前に変更を保存する必要があります</translation>
</message>
<message>
- <location filename="main_window.cpp" line="716"/>
+ <location filename="main_window.cpp" line="718"/>
<location filename="main_window_slots.cpp" line="175"/>
<source>Invalid Display Filter</source>
<translation>無効な表示フィルタ</translation>
</message>
<message>
- <location filename="main_window.cpp" line="717"/>
+ <location filename="main_window.cpp" line="719"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation>%1 フィルターの書式は有効な表示フィルタではありません (%2)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="805"/>
+ <location filename="main_window.cpp" line="807"/>
<source> before importing a new capture</source>
<translation>新しいキャプチャファイルのインポートする前</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1117"/>
+ <location filename="main_window.cpp" line="1119"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>&quot;%1&quot; エクスポートすることができません。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1118"/>
+ <location filename="main_window.cpp" line="1120"/>
<source>You cannot export packets to the current capture file.</source>
<translation>現在のキャプチャファイルへパケットをエクスポートすることはできません。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1205"/>
- <location filename="main_window.cpp" line="1230"/>
+ <location filename="main_window.cpp" line="1207"/>
+ <location filename="main_window.cpp" line="1232"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1268"/>
+ <location filename="main_window.cpp" line="1270"/>
<source>You have unsaved packets</source>
<translation>保存していないパケットがあります。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1269"/>
+ <location filename="main_window.cpp" line="1271"/>
<source>They will be lost if you don&apos;t save them.</source>
<translation>保存しない場合、これらは失われます。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1272"/>
- <location filename="main_window.cpp" line="1285"/>
+ <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1287"/>
<source>Do you want to stop the capture and save the captured packets</source>
<translation>キャプチャは停止してキャプチャされたパケットを保存しますか</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1276"/>
<source>Do you want to save the captured packets</source>
<translation>キャプチャされたパケットを保存したいですか</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1276"/>
- <location filename="main_window.cpp" line="1286"/>
+ <location filename="main_window.cpp" line="1278"/>
+ <location filename="main_window.cpp" line="1288"/>
<source>?</source>
<translation>？</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1288"/>
+ <location filename="main_window.cpp" line="1290"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>保存しない場合キャプチャしたパケットは失われます</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1291"/>
+ <location filename="main_window.cpp" line="1293"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>キャプチャスタイルに行った変更を保存しますか</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1297"/>
+ <location filename="main_window.cpp" line="1299"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>保存しない場合変更は失われます</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1309"/>
+ <location filename="main_window.cpp" line="1311"/>
<source>Stop and Save</source>
<translation>停止して保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1317"/>
+ <location filename="main_window.cpp" line="1319"/>
<source>Stop and Quit without Saving</source>
<translation>停止して保存しないで終了</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1320"/>
+ <location filename="main_window.cpp" line="1322"/>
<source>Quit without Saving</source>
<translation>保存しないで終了</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1325"/>
+ <location filename="main_window.cpp" line="1327"/>
<source>Stop and Continue without Saving</source>
<translation>停止して保存しないで続ける</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1328"/>
+ <location filename="main_window.cpp" line="1330"/>
<source>Continue &amp;without Saving</source>
<translation>保存しないで続ける</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1597"/>
+ <location filename="main_window.cpp" line="1599"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>ファイル名をUTF-8形式に割り当てできません</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1609"/>
- <location filename="main_window.cpp" line="1615"/>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1611"/>
+ <location filename="main_window.cpp" line="1617"/>
+ <location filename="main_window.cpp" line="1632"/>
<source>The Wireshark Network Analyzer</source>
<translation>The Wireshark Network Analyzer ワイヤーシャーク ネットワークアナライザ</translation>
</message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index cb0c82e9b8..97be2d696b 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -4313,9 +4313,15 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać
</message>
<message>
<location filename="main_status_bar.cpp" line="352"/>
+ <location filename="main_status_bar.cpp" line="372"/>
<source>No Packets</source>
<translation>Brak pakietów</translation>
</message>
+ <message>
+ <location filename="main_status_bar.cpp" line="368"/>
+ <source>Packets: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWelcome</name>
@@ -6441,133 +6447,133 @@ text-decoration: underline;
<translation>pusteOkienko</translation>
</message>
<message>
- <location filename="main_window.cpp" line="648"/>
+ <location filename="main_window.cpp" line="650"/>
<source>Save packets before merging?</source>
<translation>Zapisać pakiety przed scaleniem?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="649"/>
+ <location filename="main_window.cpp" line="651"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>Tymczasowy plik przechwytywania nie może zostać scalony.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="655"/>
+ <location filename="main_window.cpp" line="657"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>Zapisać zmiany w &quot;%1&quot; przed scaleniem?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="657"/>
+ <location filename="main_window.cpp" line="659"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>Zmiany muszą być zapisane przed próbą scalenia plików.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="716"/>
+ <location filename="main_window.cpp" line="718"/>
<location filename="main_window_slots.cpp" line="175"/>
<source>Invalid Display Filter</source>
<translation>Niepoprawny filtr</translation>
</message>
<message>
- <location filename="main_window.cpp" line="717"/>
+ <location filename="main_window.cpp" line="719"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation>Postać filtru %1 nie jest poprawna. (%2).</translation>
</message>
<message>
- <location filename="main_window.cpp" line="805"/>
+ <location filename="main_window.cpp" line="807"/>
<source> before importing a new capture</source>
<translation>przed zaimportowaniem nowego pliku przechwytywania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1117"/>
+ <location filename="main_window.cpp" line="1119"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>Nie można wyeksportować do &quot;%1&quot;.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1118"/>
+ <location filename="main_window.cpp" line="1120"/>
<source>You cannot export packets to the current capture file.</source>
<translation>Nie można wyeksportować pakietów do aktualnego pliku.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1205"/>
- <location filename="main_window.cpp" line="1230"/>
+ <location filename="main_window.cpp" line="1207"/>
+ <location filename="main_window.cpp" line="1232"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1268"/>
+ <location filename="main_window.cpp" line="1270"/>
<source>You have unsaved packets</source>
<translation>Masz niezapisane pakiety</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1269"/>
+ <location filename="main_window.cpp" line="1271"/>
<source>They will be lost if you don&apos;t save them.</source>
<translation>Będą utracone jeśli ich nie zapiszesz.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1272"/>
- <location filename="main_window.cpp" line="1285"/>
+ <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1287"/>
<source>Do you want to stop the capture and save the captured packets</source>
<translation>Czy chcesz zatrzymać przechwytywanie i zapisać przechwycone pakiety</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1276"/>
<source>Do you want to save the captured packets</source>
<translation>Czy chcesz zapisać przechwycone pakiety</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1276"/>
- <location filename="main_window.cpp" line="1286"/>
+ <location filename="main_window.cpp" line="1278"/>
+ <location filename="main_window.cpp" line="1288"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1288"/>
+ <location filename="main_window.cpp" line="1290"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>Twoje przechwycone pakiety zostaną utracone jeśli nie zapiszesz ich.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1291"/>
+ <location filename="main_window.cpp" line="1293"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>Czy chcesz zapisać zmiany, które zrobiłeś do pliku przechytywania &quot;%1&quot;%2?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1297"/>
+ <location filename="main_window.cpp" line="1299"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>Twoje zmiany zostaną utracone jeśli nie zapiszesz ich.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1309"/>
+ <location filename="main_window.cpp" line="1311"/>
<source>Stop and Save</source>
<translation>Zatrzymaj i zapisz</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1317"/>
+ <location filename="main_window.cpp" line="1319"/>
<source>Stop and Quit without Saving</source>
<translation>Zatrzymaj i zamknij bez zapisywania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1320"/>
+ <location filename="main_window.cpp" line="1322"/>
<source>Quit without Saving</source>
<translation>Wyjdź bez zapisywania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1325"/>
+ <location filename="main_window.cpp" line="1327"/>
<source>Stop and Continue without Saving</source>
<translation>Zatrzymaj i Kontynuuj bez zapisywania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1328"/>
+ <location filename="main_window.cpp" line="1330"/>
<source>Continue &amp;without Saving</source>
<translation>Kontynuuj bez zapisywania</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1597"/>
+ <location filename="main_window.cpp" line="1599"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>(Nazwa pliku nie może być przekonwertowana do formatu UTF-8)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1609"/>
- <location filename="main_window.cpp" line="1615"/>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1611"/>
+ <location filename="main_window.cpp" line="1617"/>
+ <location filename="main_window.cpp" line="1632"/>
<source>The Wireshark Network Analyzer</source>
<translation>Analizator Wireshark</translation>
</message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index cfe5656855..dd9cd91529 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -4297,9 +4297,15 @@ PLEASE NOTE: One option MUST be selected.</source>
</message>
<message>
<location filename="main_status_bar.cpp" line="352"/>
+ <location filename="main_status_bar.cpp" line="372"/>
<source>No Packets</source>
<translation>无分组</translation>
</message>
+ <message>
+ <location filename="main_status_bar.cpp" line="368"/>
+ <source>Packets: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWelcome</name>
@@ -6425,133 +6431,133 @@ text-decoration: underline;
<translation>空窗格</translation>
</message>
<message>
- <location filename="main_window.cpp" line="648"/>
+ <location filename="main_window.cpp" line="650"/>
<source>Save packets before merging?</source>
<translation>是否在合并之前保存分组?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="649"/>
+ <location filename="main_window.cpp" line="651"/>
<source>A temporary capture file can&apos;t be merged.</source>
<translation>无法合并临时捕获文件。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="655"/>
+ <location filename="main_window.cpp" line="657"/>
<source>Save changes in &quot;%1&quot; before merging?</source>
<translation>是否在合并前保存对“%1”的改动?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="657"/>
+ <location filename="main_window.cpp" line="659"/>
<source>Changes must be saved before the files can be merged.</source>
<translation>文件在合并之前,其改动必须先保存。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="716"/>
+ <location filename="main_window.cpp" line="718"/>
<location filename="main_window_slots.cpp" line="175"/>
<source>Invalid Display Filter</source>
<translation>无效显示筛选器</translation>
</message>
<message>
- <location filename="main_window.cpp" line="717"/>
+ <location filename="main_window.cpp" line="719"/>
<source>The filter expression %1 isn&apos;t a valid display filter. (%2).</source>
<translation>筛选器表达式 %1 不是有效的显示筛选器 (%2)。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="805"/>
+ <location filename="main_window.cpp" line="807"/>
<source> before importing a new capture</source>
<translation> 导入新捕获前</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1117"/>
+ <location filename="main_window.cpp" line="1119"/>
<source>Unable to export to &quot;%1&quot;.</source>
<translation>无法导出“%1”。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1118"/>
+ <location filename="main_window.cpp" line="1120"/>
<source>You cannot export packets to the current capture file.</source>
<translation>您不能将分组导出到当前捕获文件。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1205"/>
- <location filename="main_window.cpp" line="1230"/>
+ <location filename="main_window.cpp" line="1207"/>
+ <location filename="main_window.cpp" line="1232"/>
<source>.</source>
<translation>.</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1268"/>
+ <location filename="main_window.cpp" line="1270"/>
<source>You have unsaved packets</source>
<translation>您有未保存的分组</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1269"/>
+ <location filename="main_window.cpp" line="1271"/>
<source>They will be lost if you don&apos;t save them.</source>
<translation>若不保存,这些分组将会丢失。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1272"/>
- <location filename="main_window.cpp" line="1285"/>
+ <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1287"/>
<source>Do you want to stop the capture and save the captured packets</source>
<translation>是否希望停止捕获,并保存已捕获的分组</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1274"/>
+ <location filename="main_window.cpp" line="1276"/>
<source>Do you want to save the captured packets</source>
<translation>是否希望保存已捕获的分组</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1276"/>
- <location filename="main_window.cpp" line="1286"/>
+ <location filename="main_window.cpp" line="1278"/>
+ <location filename="main_window.cpp" line="1288"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1288"/>
+ <location filename="main_window.cpp" line="1290"/>
<source>Your captured packets will be lost if you don&apos;t save them.</source>
<translation>若不保存,您已经捕获的分组将会丢失。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1291"/>
+ <location filename="main_window.cpp" line="1293"/>
<source>Do you want to save the changes you&apos;ve made to the capture file &quot;%1&quot;%2?</source>
<translation>是否希望保存对捕获文件“%1”%2 的更改?</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1297"/>
+ <location filename="main_window.cpp" line="1299"/>
<source>Your changes will be lost if you don&apos;t save them.</source>
<translation>若不保存,您的更改将会丢失。</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1309"/>
+ <location filename="main_window.cpp" line="1311"/>
<source>Stop and Save</source>
<translation>停止并保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1317"/>
+ <location filename="main_window.cpp" line="1319"/>
<source>Stop and Quit without Saving</source>
<translation>停止,并且不保存直接退出</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1320"/>
+ <location filename="main_window.cpp" line="1322"/>
<source>Quit without Saving</source>
<translation>不保存,直接退出</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1325"/>
+ <location filename="main_window.cpp" line="1327"/>
<source>Stop and Continue without Saving</source>
<translation>停止并继续,而不必保存</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1328"/>
+ <location filename="main_window.cpp" line="1330"/>
<source>Continue &amp;without Saving</source>
<translation>不保存继续(&amp;w)</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1597"/>
+ <location filename="main_window.cpp" line="1599"/>
<source>(File name can&apos;t be mapped to UTF-8)</source>
<translation>文件名不能映射到UTF-8</translation>
</message>
<message>
- <location filename="main_window.cpp" line="1609"/>
- <location filename="main_window.cpp" line="1615"/>
- <location filename="main_window.cpp" line="1630"/>
+ <location filename="main_window.cpp" line="1611"/>
+ <location filename="main_window.cpp" line="1617"/>
+ <location filename="main_window.cpp" line="1632"/>
<source>The Wireshark Network Analyzer</source>
<translation>The Wireshark Network Analyzer</translation>
</message>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-15 15:12:49 +0000