summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS6
-rw-r--r--epan/enterprise-numbers176
-rw-r--r--epan/sminmpec.c45
-rw-r--r--services1
-rw-r--r--ui/qt/wireshark_de.ts32
-rw-r--r--ui/qt/wireshark_en.ts4
-rw-r--r--ui/qt/wireshark_fr.ts32
-rw-r--r--ui/qt/wireshark_it.ts32
-rw-r--r--ui/qt/wireshark_ja_JP.ts29
-rw-r--r--ui/qt/wireshark_pl.ts35
-rw-r--r--ui/qt/wireshark_zh_CN.ts29
11 files changed, 357 insertions, 64 deletions
diff --git a/AUTHORS b/AUTHORS
index 2e7966d124..3b9fee203f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3699,6 +3699,10 @@ Kim Kempf <kim.kempf[AT]apcon.com> {
802.1BR E-Tag dissector
}
+S. Shapira <sswsdev[AT]gmail.com> {
+ UMTS FP heuristic dissectors
+}
+
and by:
Georgi Guninski <guninski[AT]guninski.com>
@@ -4291,7 +4295,6 @@ Russel Howe <russel[AT]appliedinvention.com>
Rustam Safargalin <rustam.safargalin[AT]sifox.ru>
Ryan Mullen <rmmullen[AT]gmail.com>
Rémy Léone <remy.leone[AT]gmail.com>
-S. Shapira <sswsdev[AT]gmail.com>
Samiran Saha <ssahasamiran[AT]gmail.com>
Sandeep Dahiya <sdahiya[AT]gmail.com>
Sander Steffann <sander[AT]steffann.nl>
@@ -4379,6 +4382,7 @@ cff339 <cff339[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
sfd <stephen.donnelly[AT]endace.com>
+Éric Piel <piel[AT]delmic.com>
Øyvind Rønningstad <ronningstad[AT]gmail.com>
Дмитрий Цветцих <dmitrycvet[AT]gmail.com>
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 4684b2d549..3ee4cacae0 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2017-03-12)
+(last updated 2017-03-16)
SMI Network Management Private Enterprise Codes:
@@ -7098,9 +7098,9 @@ Decimal
Keith R. Schomburg
krs&bbt.com
1771
- Myricom, Inc.
- Bob Felderman
- feldy&myri.com
+ Myricom
+ Chris Lee
+ clee&myri.com
1772
DecisionOne
Doug Green
@@ -48262,9 +48262,9 @@ Decimal
Toyoji Mano
mano.toyoji&canon-its.co.jp
12177
- Henkel KGaA
- Roland Stahl
- roland.stahl&henkel.com
+ Henkel AG & Co. KGaA
+ Simon Kubanski
+ simon.kubanski&henkel.com
12178
3va.net
A van Drie
@@ -103174,9 +103174,9 @@ de Bruxelles, asbl
Glenn Puchtel
gpuchtel&bluefrogsolutions.com
25901
- Linterra
+ Vaquero (formerly 'Linterra')
Michael Owens
- linterra&linterra.com
+ mikeowens&gmail.com
25902
M&V Werbeagentur GmbH
Achim Vogel
@@ -197882,7 +197882,7 @@ Decentralization / Helenic Public Administra
49575
El-Abbadi School
Jacob El-Abbadi
- jacob.elabbadi8&gmail.com
+ jacob.elabbadi&elabbadischool.com
49576
K.T.E.C.
Kai Ryu
@@ -197999,6 +197999,162 @@ Decentralization / Helenic Public Administra
KysinTech
Xun HAN
hx&kysintech.com
+49605
+ MONISTOR
+ Taras & Iegor Nabok
+ egorn2007&yandex.ru
+49606
+ First American Bank
+ Jeff Noga
+ jnoga&firstambank.com
+49607
+ Learning Equality
+ Jamie Alexandre
+ jamie&learningequality.org
+49608
+ Kofola Ceskoslovensko a.s.
+ Roman Birtek
+ ms.admins&kofola.cz
+49609
+ Picomass Limited
+ Martin Hayes
+ Martin.Hayes&picomass.com
+49610
+ d.velop AG
+ Thomas Henrichsmann
+ thomas.henrichsmann&d-velop.de
+49611
+ molch
+ Thomas Felder
+ tf&molch.at
+49612
+ Orange Espagne, S.A.U.
+ Roberto Martín
+ roberto.martin&orange.com
+49613
+ Fremont Bank
+ Chris Lane
+ christopher.lane&fremontbank.com
+49614
+ Caritas der Dioezese St. Poelten
+ Stefan Teklits
+ edv&stpoelten.caritas.at
+49615
+ Metro Vancouver Regional District
+ Alfred Ho
+ alfred.ho&mvrd.ca
+49616
+ Bienestar
+ Juan José Zamora Mejía
+ jjzamoram&gmail.com
+49617
+ Controlid Industria e Comercio de Hardware e Servicos de Tecnologia Ltda
+ Albert Nissimoff
+ iana&controlid.com.br
+49618
+ Cubic Controls
+ Simon Churcher
+ simon&cubiccontrols.com
+49619
+ SOJO University
+ Akira Tagami
+ tagami&cc.sojo-u.ac.jp
+49620
+ ePatientFinder
+ Rob Moore
+ rmoore&epatientfinder.com
+49621
+ Synetica Limited
+ David Norman
+ info&synetica.net
+49622
+ ASRock Rack Incorporation
+ Jeff Chan
+ jeff9_chan&asrockrack.com
+49623
+ Bragafvl
+ Wyatt Miler
+ wmiler1&gmail.com
+49624
+ Loews Corporation
+ Wing Chiu
+ IT-TechSvcs&loews.com
+49625
+ China Telecom
+ shi meng
+ shimeng&chinatelecom.cn
+49626
+ CITIC GUOAN BROADCOM NETWORK CO.,LTD
+ Liuzhenfeng
+ liuzhenfeng&citicguoanbn.com
+49627
+ Guangzhou Ziyuan Information Technology Co.,Ltd.
+ chenxianhong
+ chenxh&zyserv.com.cn
+49628
+ Penumbra
+ Lucas Gallagher
+ lgallagher&my.wctc.edu
+49629
+ AlphaTesters
+ Praneet Rai
+ administrator&alphatesters.com
+49630
+ Instituto Superior de Derecho y Economia, S.A.
+ Alfonso Pueyo
+ alfonso.pueyo&isdemasters.com
+49631
+ Arcad Software
+ Raphael Manchon
+ rmanchon&arcadsoftware.com
+49632
+ BeeZeeLinx
+ Renan Le Padellec
+ rlepadellec.bzl&gmail.com
+49633
+ CESBIO
+ ROBERT
+ yann.robert&obs-mip.fr
+49634
+ TIMWE Group HQ – TOTAL TIM Servicos de Telecomunicacoes e Afins, Unipessoal Lda
+ Rui Alexandre Ferreira
+ rui.ferreira&timwe.com
+49635
+ Schwan-STABILO Cosmetics GmbH & Co. KG
+ Robert Hans
+ robert.hans&schwancosmetics.com
+49636
+ SUNY-ESF
+ Help Desk
+ helpdesk&esf.edu
+49637
+ Kostiantyn Osypenko
+ Kostiantyn Osypenko
+ k.osypenko&gmail.com
+49638
+ Kekesed Asmasta
+ Mealkuwat D. Hayashi
+ mealkuwat&publik.kekesed.id
+49639
+ Stampa Sistem
+ Sasa Antic
+ sasa.antic&stampa.rs
+49640
+ AIRTAG
+ Cyril Porteret
+ iana-pen&airtag.com
+49641
+ VPS Holdings Ltd
+ Group IT
+ itadmin&vpsgroup.com
+49642
+ Innotech Controls
+ Simon Hoer
+ simon&innotech.com.au
+49643
+ Grand Rapids Public Schools
+ Ruth Michels
+ michelsr&grps.org
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 6962f502bf..ca3426b0f9 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -1791,7 +1791,7 @@ const value_string sminmpec_values[] = {
{ 1768, "Patton Electronics Company" },
{ 1769, "Digital Fairway Corporation" },
{ 1770, "BroadBand Technologies, Inc." },
- { 1771, "Myricom, Inc." },
+ { 1771, "Myricom" },
{ 1772, "DecisionOne" },
{ 1773, "Tandberg Television" },
{ 1774, "AUDITEC SA" },
@@ -12197,7 +12197,7 @@ const value_string sminmpec_values[] = {
{ 12174, "Consolidated Freightways" },
{ 12175, "Frontier Internet, Inc." },
{ 12176, "Canon IT Solutions Inc. (formerly 'Sumitomo Metal System Solutions Co.,Ltd')" },
- { 12177, "Henkel KGaA" },
+ { 12177, "Henkel AG & Co. KGaA" },
{ 12178, "3va.net" },
{ 12179, "Alacris Inc." },
{ 12180, "ALI Technologies Inc" },
@@ -25921,7 +25921,7 @@ const value_string sminmpec_values[] = {
{ 25898, "25th-floor - de Pretis & Helmberger KEG" },
{ 25899, "Kantonsschule Zug" },
{ 25900, "Blue Frog Solutions Inc." },
- { 25901, "Linterra" },
+ { 25901, "Vaquero (formerly 'Linterra')" },
{ 25902, "M&V Werbeagentur GmbH" },
{ 25903, "Palm Beach County" },
{ 25904, "Fresh Agencja Reklamowa Sp. z o.o." },
@@ -49625,6 +49625,45 @@ const value_string sminmpec_values[] = {
{ 49602, "CertificaEdu" },
{ 49603, "LINKTEK Co., LTD." },
{ 49604, "KysinTech" },
+ { 49605, "MONISTOR" },
+ { 49606, "First American Bank" },
+ { 49607, "Learning Equality" },
+ { 49608, "Kofola Ceskoslovensko a.s." },
+ { 49609, "Picomass Limited" },
+ { 49610, "d.velop AG" },
+ { 49611, "molch" },
+ { 49612, "Orange Espagne, S.A.U." },
+ { 49613, "Fremont Bank" },
+ { 49614, "Caritas der Dioezese St. Poelten" },
+ { 49615, "Metro Vancouver Regional District" },
+ { 49616, "Bienestar" },
+ { 49617, "Controlid Industria e Comercio de Hardware e Servicos de Tecnologia Ltda" },
+ { 49618, "Cubic Controls" },
+ { 49619, "SOJO University" },
+ { 49620, "ePatientFinder" },
+ { 49621, "Synetica Limited" },
+ { 49622, "ASRock Rack Incorporation" },
+ { 49623, "Bragafvl" },
+ { 49624, "Loews Corporation" },
+ { 49625, "China Telecom" },
+ { 49626, "CITIC GUOAN BROADCOM NETWORK CO.,LTD" },
+ { 49627, "Guangzhou Ziyuan Information Technology Co.,Ltd." },
+ { 49628, "Penumbra" },
+ { 49629, "AlphaTesters" },
+ { 49630, "Instituto Superior de Derecho y Economia, S.A." },
+ { 49631, "Arcad Software" },
+ { 49632, "BeeZeeLinx" },
+ { 49633, "CESBIO" },
+ { 49634, "TIMWE Group HQ \0342\0200\0223 TOTAL TIM Servicos de Telecomunicacoes e Afins, Unipessoal Lda" },
+ { 49635, "Schwan-STABILO Cosmetics GmbH & Co. KG" },
+ { 49636, "SUNY-ESF" },
+ { 49637, "Kostiantyn Osypenko" },
+ { 49638, "Kekesed Asmasta" },
+ { 49639, "Stampa Sistem" },
+ { 49640, "AIRTAG" },
+ { 49641, "VPS Holdings Ltd" },
+ { 49642, "Innotech Controls" },
+ { 49643, "Grand Rapids Public Schools" },
{ 0, NULL}
};
diff --git a/services b/services
index 28ff71236c..927bd74625 100644
--- a/services
+++ b/services
@@ -11070,6 +11070,7 @@ athand-mmp 20999/udp # AT Hand MMP [Stepan_Riha] [Stepan_Riha]
irtrans 21000/tcp # IRTrans Control [Marcus_Mueller] [Marcus_Mueller] 2004-11
irtrans 21000/udp # IRTrans Control [Marcus_Mueller] [Marcus_Mueller] 2004-11
notezilla-lan 21010/tcp # Notezilla.Lan Server [Conceptworld_Corporation] [Gautam_Jain] 2013-08-20
+aigairserver 21221/tcp # Services for Air Server [AIG_S.L.] [Edelmiro_Gonzalez_Martinez] 2017-03-16
rdm-tfs 21553/tcp # Raima RDM TFS [Paul_Johnson] [Paul_Johnson] 2011-05-02
dfserver 21554/tcp # MineScape Design File Server [Michael_Purser] [Michael_Purser] 2006-06
dfserver 21554/udp # MineScape Design File Server [Michael_Purser] [Michael_Purser] 2006-06
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 109e807717..e23f604f99 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -880,15 +880,31 @@
<source>Automatically detect file type</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="787"/>
- <source>%1, error after %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, error after %Ln packet(s)</source>
+ <oldsource>%1, error after %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="794"/>
- <source>%1, timed out at %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, timed out at %Ln packet(s)</source>
+ <oldsource>%1, timed out at %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="capture_file_dialog.cpp" line="797"/>
+ <source>%1, %Ln packet(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>Packets:</source>
@@ -4820,7 +4836,7 @@ für die Filterdateien kann nicht erstellt werden:
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.cpp" line="148"/>
+ <location filename="interface_frame.cpp" line="150"/>
<source>Show hidden interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4828,7 +4844,7 @@ für die Filterdateien kann nicht erstellt werden:
<context>
<name>InterfaceSortFilterModel</name>
<message>
- <location filename="interface_sort_filter_model.cpp" line="377"/>
+ <location filename="interface_sort_filter_model.cpp" line="380"/>
<source>No interfaces to be displayed. %1 interfaces filtered.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index a75db2de2b..d74d92a58b 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -4707,7 +4707,7 @@ for filter files: %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.cpp" line="148"/>
+ <location filename="interface_frame.cpp" line="150"/>
<source>Show hidden interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4715,7 +4715,7 @@ for filter files: %2.</source>
<context>
<name>InterfaceSortFilterModel</name>
<message>
- <location filename="interface_sort_filter_model.cpp" line="377"/>
+ <location filename="interface_sort_filter_model.cpp" line="380"/>
<source>No interfaces to be displayed. %1 interfaces filtered.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 841cbc8f11..c13f50ba00 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -880,15 +880,31 @@
<source>Automatically detect file type</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="787"/>
- <source>%1, error after %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, error after %Ln packet(s)</source>
+ <oldsource>%1, error after %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="794"/>
- <source>%1, timed out at %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, timed out at %Ln packet(s)</source>
+ <oldsource>%1, timed out at %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="capture_file_dialog.cpp" line="797"/>
+ <source>%1, %Ln packet(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>Packets:</source>
@@ -4823,7 +4839,7 @@ pour fichiers de filtre : %2.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.cpp" line="148"/>
+ <location filename="interface_frame.cpp" line="150"/>
<source>Show hidden interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4831,7 +4847,7 @@ pour fichiers de filtre : %2.</translation>
<context>
<name>InterfaceSortFilterModel</name>
<message>
- <location filename="interface_sort_filter_model.cpp" line="377"/>
+ <location filename="interface_sort_filter_model.cpp" line="380"/>
<source>No interfaces to be displayed. %1 interfaces filtered.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 56d689157f..c594cfbd32 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -880,15 +880,31 @@
<source>Automatically detect file type</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="787"/>
- <source>%1, error after %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, error after %Ln packet(s)</source>
+ <oldsource>%1, error after %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="794"/>
- <source>%1, timed out at %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, timed out at %Ln packet(s)</source>
+ <oldsource>%1, timed out at %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="capture_file_dialog.cpp" line="797"/>
+ <source>%1, %Ln packet(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>Packets:</source>
@@ -4818,7 +4834,7 @@ per i file di filtro: %2.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.cpp" line="148"/>
+ <location filename="interface_frame.cpp" line="150"/>
<source>Show hidden interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4826,7 +4842,7 @@ per i file di filtro: %2.</translation>
<context>
<name>InterfaceSortFilterModel</name>
<message>
- <location filename="interface_sort_filter_model.cpp" line="377"/>
+ <location filename="interface_sort_filter_model.cpp" line="380"/>
<source>No interfaces to be displayed. %1 interfaces filtered.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index abe4f177b1..0c0c37e24b 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -880,15 +880,28 @@
<source>Automatically detect file type</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="787"/>
- <source>%1, error after %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, error after %Ln packet(s)</source>
+ <oldsource>%1, error after %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="794"/>
- <source>%1, timed out at %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, timed out at %Ln packet(s)</source>
+ <oldsource>%1, timed out at %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="capture_file_dialog.cpp" line="797"/>
+ <source>%1, %Ln packet(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>Packets:</source>
@@ -4803,7 +4816,7 @@ for filter files: %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.cpp" line="148"/>
+ <location filename="interface_frame.cpp" line="150"/>
<source>Show hidden interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4811,7 +4824,7 @@ for filter files: %2.</source>
<context>
<name>InterfaceSortFilterModel</name>
<message>
- <location filename="interface_sort_filter_model.cpp" line="377"/>
+ <location filename="interface_sort_filter_model.cpp" line="380"/>
<source>No interfaces to be displayed. %1 interfaces filtered.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 3d87fc4e84..24566676b0 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -880,15 +880,34 @@
<source>Automatically detect file type</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="787"/>
- <source>%1, error after %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, error after %Ln packet(s)</source>
+ <oldsource>%1, error after %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="794"/>
- <source>%1, timed out at %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, timed out at %Ln packet(s)</source>
+ <oldsource>%1, timed out at %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="capture_file_dialog.cpp" line="797"/>
+ <source>%1, %Ln packet(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>Packets:</source>
@@ -4817,7 +4836,7 @@ dla plików filtrów: %2.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.cpp" line="148"/>
+ <location filename="interface_frame.cpp" line="150"/>
<source>Show hidden interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4825,7 +4844,7 @@ dla plików filtrów: %2.</translation>
<context>
<name>InterfaceSortFilterModel</name>
<message>
- <location filename="interface_sort_filter_model.cpp" line="377"/>
+ <location filename="interface_sort_filter_model.cpp" line="380"/>
<source>No interfaces to be displayed. %1 interfaces filtered.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index c9d13e9da4..4b1b4760c1 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -880,15 +880,28 @@
<source>Automatically detect file type</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="787"/>
- <source>%1, error after %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, error after %Ln packet(s)</source>
+ <oldsource>%1, error after %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="capture_file_dialog.cpp" line="794"/>
- <source>%1, timed out at %2 packets</source>
- <translation type="unfinished"></translation>
+ <source>%1, timed out at %Ln packet(s)</source>
+ <oldsource>%1, timed out at %2 packets</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="capture_file_dialog.cpp" line="797"/>
+ <source>%1, %Ln packet(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>Packets:</source>
@@ -4810,7 +4823,7 @@ for filter files: %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="interface_frame.cpp" line="148"/>
+ <location filename="interface_frame.cpp" line="150"/>
<source>Show hidden interfaces</source>
<translation type="unfinished"></translation>
</message>
@@ -4818,7 +4831,7 @@ for filter files: %2.</source>
<context>
<name>InterfaceSortFilterModel</name>
<message>
- <location filename="interface_sort_filter_model.cpp" line="377"/>
+ <location filename="interface_sort_filter_model.cpp" line="380"/>
<source>No interfaces to be displayed. %1 interfaces filtered.</source>
<translation type="unfinished"></translation>
</message>