aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-08-04 08:19:03 +0000
committerGerald Combs <gerald@wireshark.org>2019-08-04 08:19:06 +0000
commit072fecbbd4ca06edec73c668f28119fc8af8b6ff (patch)
treed528744555ca0243567bdbf271f06f93b1dfc498
parent4c9a01213373a29873fe327553bf282e167cf5d3 (diff)
[Automatic update for 2019-08-04]
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I8c95eb29066ec1501740545cfd78e5be577a9e7a Reviewed-on: https://code.wireshark.org/review/34177 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r--AUTHORS3
-rw-r--r--NEWS2
-rw-r--r--enterprises.tsv42
-rw-r--r--manuf65
-rw-r--r--profiles/No Reassembly/preferences3
-rw-r--r--services1
-rw-r--r--ui/qt/wireshark_de.ts291
-rw-r--r--ui/qt/wireshark_en.ts178
-rw-r--r--ui/qt/wireshark_fr.ts219
-rw-r--r--ui/qt/wireshark_it.ts291
-rw-r--r--ui/qt/wireshark_ja_JP.ts215
-rw-r--r--ui/qt/wireshark_pl.ts222
-rw-r--r--ui/qt/wireshark_ru.ts224
-rw-r--r--ui/qt/wireshark_sv.ts222
-rw-r--r--ui/qt/wireshark_uk.ts219
-rw-r--r--ui/qt/wireshark_zh_CN.ts218
16 files changed, 1924 insertions, 491 deletions
diff --git a/AUTHORS b/AUTHORS
index d8033ddf2f..87cc72c972 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4393,6 +4393,7 @@ Matej Košík <5764c029b688c1c0d24a2e97cd764f[AT]gmail.com>
Matej Tkac <matej.tkac.mt[AT]gmail.com>
Mathias Kurth <mathias.kurth[AT]commsolid.com>
Matt Lawrence <bugzilla.wireshark[AT]erisa.co.uk>
+Matt Porter <mporter[AT]konsulko.com>
Matthias Lang <matthias[AT]corelatus.com>
Matthieu Coudron <matthieu.coudron[AT]lip6.fr>
Max Dmitrichenko <dmitrmax[AT]gmail.com>
@@ -4458,6 +4459,7 @@ Nora Sandler <nsandler[AT]securityinnovation.com>
Olaf Bergmann <bergmann[AT]tzi.org>
Olaf Flaschel <olaf.flaschel[AT]vestifi.de>
Olga Kornievskaia <kolga[AT]netapp.com>
+Oliver <cellotape[AT]gmail.com>
Oliver Downard <oliver.downard[AT]couchbase.com>
Oliver Smith <osmith[AT]sysmocom.de>
Olivier Verriest <verri[AT]x25.pm>
@@ -4536,6 +4538,7 @@ Roman Leonhartsberger <ro.leonhartsberger[AT]gmail.com>
Roman Volkov <volkoff_roman[AT]ukr.net>
Ronen Boazi <ronen.boazi[AT]intel.com>
Ross Jacobs <rossbjacobs[AT]gmail.com>
+Roy Chateau <chateau.royw[AT]gmail.com>
Rudra Rugge <rrugge[AT]juniper.net>
Rui ZHANG <rzhang[AT]grandstream.cn>
Russel Howe <russel[AT]appliedinvention.com>
diff --git a/NEWS b/NEWS
index 85c44caea2..d2b16d5b62 100644
--- a/NEWS
+++ b/NEWS
@@ -118,7 +118,7 @@ Wireshark 3.1.1 Release Notes
A complete FAQ is available on the Wireshark web site[10].
- Last updated 2019-07-28 08:08:28 UTC
+ Last updated 2019-08-04 08:09:12 UTC
References
diff --git a/enterprises.tsv b/enterprises.tsv
index 5452cef21f..edb471bef9 100644
--- a/enterprises.tsv
+++ b/enterprises.tsv
@@ -5,7 +5,7 @@
# The format used here is: <NUMERICAL_ID><SPACE><NAME>
# Where SPACE can be any sequence of spaces and tabs.
#
-# (last updated 2019-07-27)
+# (last updated 2019-08-04)
0 Reserved
1 NxNetworks
@@ -10675,7 +10675,7 @@
10701 Telefonica DataCorp, S.A.
10702 Solvare
10703 ATnet
-10704 Barracuda Networks AG # formerly 'phion Information Technologies'
+10704 Barracuda Networks AG (previous was 'phion Information Technologies')
10705 VOGT electronic AG
10706 Accelerated Encryption Processing Ltd
10707 Adhersis
@@ -53959,7 +53959,6 @@
54149 Computer Pros
54150 IDTrust
54151 Microsystem S.A.
-54152 SSC-ICT
54153 SecureMFA
54154 Mediaworks Hungary zrt.
54155 Top Dog PC Services, LLC
@@ -54144,3 +54143,40 @@
54334 Central National Gottesman
54335 Infrascale, Inc
54336 rowspace
+54337 OpenPOWER Foundation
+54338 Certsys Tecnologia da Informação LTDA
+54339 Yunnan Tobacco Company
+54340 Next Stride AG
+54341 Enabled Energy
+54342 Copperhead Limited
+54343 Malco Theatres, Inc.
+54344 PoisonCloud
+54345 Allo Communications LLC
+54346 Penombre.eu
+54347 Kamunet, Prime Minister's Office of the Turkish Republic of Northern Cyprus
+54348 Traffic ITS GmbH
+54349 Adolf Nissen Elektrobau GmbH + Co. KG
+54350 NPO Baum JSC
+54351 SLT-Technologies GmbH & Co. KG
+54352 Contiki-NG
+54353 Joseph Orraca-Tetteh, MD
+54354 The Home Depot Mexico
+54355 Badge Inc.
+54356 Shandong Huachentel Information Technology Co., Ltd.
+54357 Cancon Information Industry Co.,Ltd
+54358 TESCOM corp.
+54359 Hillsboro School District
+54360 PPMnet AG
+54361 UB Merchants
+54362 Barry J. Burns
+54363 BijKluit
+54364 Graviton Org
+54365 LinchpinLabs Australia
+54366 Maincare Solutions
+54367 HUNAN SCROWN ELECTRONIC INFORMATION TECH.CO.,LTD
+54368 THE 52ND RESEARCH INSTITUDE OF CETC
+54369 Dragon Systems Software Limited (DssW)
+54370 Stichting Patyna
+54371 Compactive, s.r.o.
+54372 Codegic Pvt Ltd
+54373 Brehm Präzisionstechnik GmbH & Co. KG
diff --git a/manuf b/manuf
index eb8795c7c4..2379e9959f 100644
--- a/manuf
+++ b/manuf
@@ -45,23 +45,23 @@
# http://standards-oui.ieee.org/cid/cid.csv:
# Content-Length: 7621
-# Last-Modified: Sun, 28 Jul 2019 08:00:31 GMT
+# Last-Modified: Sun, 04 Aug 2019 08:00:39 GMT
# http://standards-oui.ieee.org/iab/iab.csv:
# Content-Length: 381248
-# Last-Modified: Sun, 28 Jul 2019 08:01:39 GMT
+# Last-Modified: Sun, 04 Aug 2019 08:01:46 GMT
# http://standards-oui.ieee.org/oui/oui.csv:
-# Content-Length: 2391952
-# Last-Modified: Sun, 28 Jul 2019 08:04:06 GMT
+# Content-Length: 2394678
+# Last-Modified: Sun, 04 Aug 2019 08:04:12 GMT
# http://standards-oui.ieee.org/oui28/mam.csv:
-# Content-Length: 286888
-# Last-Modified: Sun, 28 Jul 2019 08:02:07 GMT
+# Content-Length: 287727
+# Last-Modified: Sun, 04 Aug 2019 08:02:14 GMT
# http://standards-oui.ieee.org/oui36/oui36.csv:
-# Content-Length: 298555
-# Last-Modified: Sun, 28 Jul 2019 08:03:33 GMT
+# Content-Length: 299818
+# Last-Modified: Sun, 04 Aug 2019 08:03:44 GMT
00:00:00 00:00:00 Officially Xerox, but 0:0:0:0:0:0 is more common
00:00:01 Xerox Xerox Corporation
@@ -17472,6 +17472,12 @@
04:CF:25 Manycolo Manycolors, Inc.
04:CF:8C XiaomiEl XIAOMI Electronics,CO.,LTD
04:D1:3A XiaomiCo Xiaomi Communications Co Ltd
+04:D1:6E IeeeRegi IEEE Registration Authority
+04:D1:6E:20:00:00/28 SDISPA s.d.i. s.p.a.
+04:D1:6E:80:00:00/28 ChengduI Chengdu Interlink Science And Technology Co.,Ltd
+04:D1:6E:90:00:00/28 FuzhouZh Fuzhou Zhuoyi Electronic Co.,Ltd
+04:D1:6E:A0:00:00/28 MetraEle Metra Electronics
+04:D1:6E:D0:00:00/28 ElotecFi Elotec Fischer Elektronik GmbH
04:D3:B0 IntelCor Intel Corporate
04:D3:CF Apple Apple, Inc.
04:D4:37 Znv
@@ -18725,9 +18731,11 @@
18:53:E0 HanyangD Hanyang Digitech Co.Ltd
18:55:0F CiscoSpv Cisco SPVTG
18:55:E3 Apple Apple, Inc.
+18:56:44 HuaweiTe Huawei Technologies Co.,Ltd
18:56:80 IntelCor Intel Corporate
18:59:33 CiscoSpv Cisco SPVTG
18:59:36 XiaomiCo Xiaomi Communications Co Ltd
+18:5A:58 Dell Dell Inc.
18:5A:E8 Zenotech Zenotech.Co.,Ltd
18:5D:9A Bobjgear BobjGear LLC
18:5E:0F IntelCor Intel Corporate
@@ -20535,6 +20543,7 @@
30:E3:D6 SpotifyU Spotify USA Inc.
30:E4:8E Vodafone Vodafone UK
30:E4:DB Cisco Cisco Systems, Inc
+30:E9:8E HuaweiTe Huawei Technologies Co.,Ltd
30:EA:26 SycadaBv Sycada BV
30:EB:1F SkylabM& Skylab M&C Technology Co.,Ltd
30:EB:25 IntekDig Intek Digital
@@ -22825,6 +22834,8 @@
4C:6B:E8 Apple Apple, Inc.
4C:6E:6E ComnectT Comnect Technology CO.,LTD
4C:6F:9C Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
+4C:71:0C Cisco Cisco Systems, Inc
+4C:71:0D Cisco Cisco Systems, Inc
4C:72:B9 Pegatron Pegatron Corporation
4C:73:67 GeniusBy Genius Bytes Software Solutions GmbH
4C:73:A5 Kove
@@ -23292,6 +23303,7 @@
54:10:EC Microchi Microchip Technology Inc.
54:11:2F SulzerPu Sulzer Pump Solutions Finland Oy
54:11:5F AtamoPty Atamo Pty Ltd
+54:13:10 HuaweiTe Huawei Technologies Co.,Ltd
54:13:79 HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
54:14:73 Wingtech Wingtech Group (HongKong)Limited
54:14:FD Orbbec3D Orbbec 3D Technology International
@@ -23424,17 +23436,20 @@
54:A3:FA BqtSolut BQT Solutions (Australia)Pty Ltd
54:A4:93 IeeeRegi IEEE Registration Authority
54:A4:93:00:00:00/28 Intellig Intelligent Surveillance Corp
+54:A4:93:10:00:00/28 Shenzhen ShenZhen Smart&Aspiration Co.,LTD
54:A4:93:20:00:00/28 Genua genua GmbH
54:A4:93:30:00:00/28 I-MoonTe I-Moon Technology Co., Limited
54:A4:93:40:00:00/28 Shenzhen Shenzhen C & D Electronics Co., Ltd.
54:A4:93:50:00:00/28 Ausounds Ausounds Intelligence, Llc
54:A4:93:60:00:00/28 HanntoTe Hannto Technology Co., Ltd
54:A4:93:70:00:00/28 RedHydro RED Hydrogen LLC
+54:A4:93:80:00:00/28 ChengduE Chengdu EVECCA Technology Co.,Ltd.
54:A4:93:90:00:00/28 DoEasyIn Do Easy International Limited
54:A4:93:A0:00:00/28 WondersT Wonders Technology Co., Ltd.
54:A4:93:B0:00:00/28 Advice
54:A4:93:C0:00:00/28 BjCotyte Bj Cotytech Technology Co.,Ltd
54:A4:93:D0:00:00/28 AssemTec Assem Technology Co.,Ltd.
+54:A4:93:E0:00:00/28 Nederman Nederman Holding AB
54:A5:1B HuaweiTe Huawei Technologies Co.,Ltd
54:A5:4B NscCommu NSC Communications Siberia Ltd
54:A6:19 Alcatel- Alcatel-Lucent Shanghai Bell Co., Ltd
@@ -23864,6 +23879,7 @@
5C:AD:CF Apple Apple, Inc.
5C:AF:06 LgElectr LG Electronics (Mobile Communications)
5C:B0:66 ArrisGro ARRIS Group, Inc.
+5C:B1:3E Sagemcom Sagemcom Broadband SAS
5C:B1:5F Oceanblu Oceanblue Cloud Technology Limited
5C:B3:95 HuaweiTe Huawei Technologies Co.,Ltd
5C:B3:F6 Human Human, Incorporated
@@ -23912,6 +23928,7 @@
5C:E2:F4 AcsipTec AcSiP Technology Corp.
5C:E3:0E ArrisGro ARRIS Group, Inc.
5C:E3:B6 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
+5C:E5:0C BeijingX Beijing Xiaomi Mobile Software Co., Ltd
5C:E7:BF NewSingu New Singularity International Technical Development Co.,Ltd
5C:E8:83 HuaweiTe Huawei Technologies Co.,Ltd
5C:E8:B7 OraimoTe Oraimo Technology Limited
@@ -25321,6 +25338,7 @@
70:B3:D5:10:F0:00/36 Neqis
70:B3:D5:11:10:00/36 Leonardo Leonardo Sistemi Integrati S.r.l.
70:B3:D5:11:20:00/36 DitestFa DiTEST Fahrzeugdiagnose GmbH
+70:B3:D5:11:30:00/36 IreaSyst iREA System Industry
70:B3:D5:11:40:00/36 ProjectH Project H Pty Ltd
70:B3:D5:11:50:00/36 Welltec Welltec Corp.
70:B3:D5:11:90:00/36 Private
@@ -25454,6 +25472,7 @@
70:B3:D5:1B:D0:00/36 Shenzhen Shenzhen Siera Technology Ltd
70:B3:D5:1B:E0:00/36 PotterEl Potter Electric Signal Co. LLC
70:B3:D5:1C:00:00/36 WHLeary W. H. Leary Co., Inc.
+70:B3:D5:1C:20:00/36 CensisUi CENSIS, Uiversity of Glasgow
70:B3:D5:1C:40:00/36 SmegSPA Smeg S.p.A.
70:B3:D5:1C:50:00/36 Elsag
70:B3:D5:1C:70:00/36 HoshinEl Hoshin Electronics Co., Ltd.
@@ -25785,6 +25804,7 @@
70:B3:D5:36:30:00/36 ContecDt Contec DTx
70:B3:D5:36:40:00/36 Adamczew ADAMCZEWSKI elektronische Messtechnik GmbH
70:B3:D5:36:50:00/36 Circuitm CircuitMeter Inc.
+70:B3:D5:36:60:00/36 Solarlyt Solarlytics, Inc.
70:B3:D5:36:70:00/36 LivingWa Living Water
70:B3:D5:36:80:00/36 WhiteMat White Matter LLC
70:B3:D5:36:A0:00/36 BectonDi Becton Dickinson
@@ -25923,6 +25943,7 @@
70:B3:D5:41:80:00/36 DevSyste DEV Systemtechnik GmbH& Co KG
70:B3:D5:41:A0:00/36 HyosungP HYOSUNG Power & Industrial Systems
70:B3:D5:41:B0:00/36 SysTecEl SYS TEC electronic GmbH
+70:B3:D5:41:D0:00/36 AzmoonKe Azmoon Keifiat
70:B3:D5:41:E0:00/36 RedlerCo Redler Computers
70:B3:D5:41:F0:00/36 OrionSRL Orion S.r.l.
70:B3:D5:42:00:00/36 Ecoinet
@@ -26173,6 +26194,8 @@
70:B3:D5:56:30:00/36 Zhejiang Zhejiang Hao Teng Electronic Technology Co., Ltd.
70:B3:D5:56:40:00/36 Christma christmann informationstechnik + medien GmbH & Co. KG
70:B3:D5:56:60:00/36 DataInfo Data Informs LLC
+70:B3:D5:56:80:00/36 SmallDat Small Data Garden Oy
+70:B3:D5:56:90:00/36 NuanceHe Nuance Hearing Ltd.
70:B3:D5:56:A0:00/36 HarvardT Harvard Technology Ltd
70:B3:D5:56:B0:00/36 SEI S.E.I. Co.,Ltd.
70:B3:D5:56:C0:00/36 Telensa Telensa Ltd
@@ -26634,6 +26657,7 @@
70:B3:D5:7B:A0:00/36 Decentla Decentlab GmbH
70:B3:D5:7B:B0:00/36 Aloxy
70:B3:D5:7B:C0:00/36 FirstRf FIRST RF Corporation
+70:B3:D5:7B:E0:00/36 Phytron Phytron GmbH
70:B3:D5:7B:F0:00/36 StoneThr Stone Three
70:B3:D5:7C:00:00/36 Torgovyy Torgovyy Dom Tehnologiy Llc
70:B3:D5:7C:10:00/36 DataScie Data Sciences International
@@ -26809,6 +26833,7 @@
70:B3:D5:89:70:00/36 EfgCzSpo EFG CZ spol. s r.o.
70:B3:D5:89:A0:00/36 AlgodueE Algodue Elettronica Srl
70:B3:D5:89:B0:00/36 Controlw ControlWorks, Inc.
+70:B3:D5:89:C0:00/36 IhiRotat IHI Rotating Machinery Engineering Co.,Ltd.
70:B3:D5:8A:00:00/36 DmRadioc Dm Radiocom
70:B3:D5:8A:20:00/36 WinnersD Winners Digital Corporation
70:B3:D5:8A:40:00/36 PhytonMi Phyton, Inc. Microsystems and Development Tools
@@ -27601,6 +27626,7 @@
70:B3:D5:C9:60:00/36 UniDimen Uni Dimenxi Sdn Bhd
70:B3:D5:C9:70:00/36 Csinfote Csinfotel
70:B3:D5:C9:B0:00/36 TietoSwe Tieto Sweden AB
+70:B3:D5:C9:C0:00/36 Connecte Connected Response
70:B3:D5:C9:D0:00/36 ApgCashD APG Cash Drawer, LLC
70:B3:D5:C9:E0:00/36 FukudaSa Fukuda Sangyo Co., Ltd.
70:B3:D5:C9:F0:00/36 Triax Triax A/S
@@ -27700,6 +27726,7 @@
70:B3:D5:D2:40:00/36 Microtro Microtronics Engineering GmbH
70:B3:D5:D2:50:00/36 Engenesi ENGenesis
70:B3:D5:D2:60:00/36 Mi MI Inc.
+70:B3:D5:D2:70:00/36 LightFie Light field Lab
70:B3:D5:D2:80:00/36 ToshibaE Toshiba Electron Tubes & Devices Co., Ltd.
70:B3:D5:D2:90:00/36 Sportzca Sportzcast
70:B3:D5:D2:B0:00/36 Streampl StreamPlay Oy Ltd
@@ -27844,6 +27871,7 @@
70:B3:D5:DD:F0:00/36 Aerovisi AeroVision Avionics, Inc.
70:B3:D5:DE:00:00/36 Ecozy eCozy GmbH
70:B3:D5:DE:20:00/36 AcdElekr ACD Elekronik GmbH
+70:B3:D5:DE:30:00/36 EtlElekt ETL Elektrotechnik Lauter GmbH
70:B3:D5:DE:40:00/36 MaviliEl Mavili Elektronik Tic. Ve San. A.S.
70:B3:D5:DE:50:00/36 Asml
70:B3:D5:DE:60:00/36 MbConnec MB connect line GmbH Fernwartungssysteme
@@ -27961,6 +27989,7 @@
70:B3:D5:E7:C0:00/36 AplexTec Aplex Technology Inc.
70:B3:D5:E7:D0:00/36 NanjingD Nanjing Dandick Science&technology development co., LTD
70:B3:D5:E7:E0:00/36 GroupeCi Groupe Citypassenger Inc
+70:B3:D5:E8:00:00/36 Changzho Changzhou Rapid Information Technology Co,Ltd
70:B3:D5:E8:10:00/36 Slat
70:B3:D5:E8:20:00/36 RfTrack RF Track
70:B3:D5:E8:40:00/36 EntecEle ENTEC Electric & Electronic Co., LTD.
@@ -28020,6 +28049,7 @@
70:B3:D5:EC:80:00/36 VikoElek Viko Elektrik-Elektronik A.Ş.
70:B3:D5:EC:A0:00/36 Transtro Transtronic AB
70:B3:D5:EC:B0:00/36 Re-Contr Re spa - Controlli Industriali - IT01782300154
+70:B3:D5:EC:C0:00/36 Digifocu Digifocus Technology Inc.
70:B3:D5:EC:D0:00/36 Sbs-Fein SBS-Feintechnik GmbH & Co. KG
70:B3:D5:EC:E0:00/36 Comm-Con COMM-connect A/S
70:B3:D5:EC:F0:00/36 Ipitek
@@ -30336,6 +30366,7 @@
8C:E2:DA CircleMe Circle Media Inc
8C:E3:8E ToshibaM Toshiba Memory Corporation
8C:E5:C0 SamsungE Samsung Electronics Co.,Ltd
+8C:E5:EF HuaweiTe Huawei Technologies Co.,Ltd
8C:E7:48 Private
8C:E7:8C DkNetwor DK Networks
8C:E7:B3 Sonardyn Sonardyne International Ltd
@@ -31235,6 +31266,7 @@
9C:69:B4:C0:00:00/28 Guangdon Guangdong Hanwei intergration Co.,Ltd
9C:69:B4:D0:00:00/28 "Intelle "Intellect module" LLC
9C:69:B4:E0:00:00/28 NingboSh Ningbo Shen Link Communication Technology Co., Ltd
+9C:69:D1 HuaweiTe Huawei Technologies Co.,Ltd
9C:6A:BE QeesAps QEES ApS.
9C:6C:15 Microsof Microsoft Corporation
9C:6F:52 Zte zte corporation
@@ -31643,6 +31675,7 @@ A0:DC:04 Becker-A Becker-Antriebe GmbH
A0:DD:97 Polarlin PolarLink Technologies, Ltd
A0:DD:E5 Sharp SHARP Corporation
A0:DE:05 Jsc"Irbi JSC "Irbis-T"
+A0:DF:15 HuaweiTe Huawei Technologies Co.,Ltd
A0:E0:AF Cisco Cisco Systems, Inc
A0:E2:01 AvtraceC AVTrace Ltd.(China)
A0:E2:5A AmicusSk Amicus SK, s.r.o.
@@ -31921,6 +31954,7 @@ A4:C7:DE Cambridg Cambridge Industries(Group) Co.,Ltd.
A4:C9:39 Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
A4:CA:A0 HuaweiTe Huawei Technologies Co.,Ltd
A4:CC:32 Inficomm Inficomm Co., Ltd
+A4:CD:23 Shenzhen Shenzhenshi Xinzhongxin Co., Ltd
A4:CF:12 Espressi Espressif Inc.
A4:D0:94 ErwinPet Erwin Peters Systemtechnik GmbH
A4:D1:8C Apple Apple, Inc.
@@ -32365,6 +32399,7 @@ AC:88:FD Apple Apple, Inc.
AC:89:95 Azurewav AzureWave Technology Inc.
AC:8A:CD RogerDWe ROGER D.Wensker, G.Wensker sp.j.
AC:8D:14 Smartrov Smartrove Inc
+AC:8D:34 HuaweiTe Huawei Technologies Co.,Ltd
AC:8F:F8 Nokia
AC:92:32 HuaweiTe Huawei Technologies Co.,Ltd
AC:93:2F Nokia Nokia Corporation
@@ -33023,6 +33058,7 @@ B8:37:65 Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
B8:38:61 Cisco Cisco Systems, Inc
B8:38:CA KyokkoTs Kyokko Tsushin System CO.,LTD
B8:3A:08 TendaTec Tenda Technology Co.,Ltd.Dongguan branch
+B8:3A:5A ArubaAHe Aruba, a Hewlett Packard Enterprise Company
B8:3A:7B Worldpla Worldplay (Canada) Inc.
B8:3A:9D AlarmCom Alarm.com
B8:3D:4E Shenzhen Shenzhen Cultraview Digital Technology Co.,Ltd Shanghai Branch
@@ -33514,6 +33550,7 @@ C0:2B:FC InesAppl iNES. applied informatics GmbH
C0:2C:7A Shenzhen Shenzhen Horn Audio Co.,Ltd.
C0:2D:EE Cuff
C0:2E:25 Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
+C0:2E:26 Private
C0:2F:F1 VoltaNet Volta Networks
C0:33:5E Microsof Microsoft
C0:34:B4 Gigaston Gigastone Corporation
@@ -33753,6 +33790,7 @@ C4:36:6C LgInnote LG Innotek
C4:36:DA Rustelet Rusteletech Ltd.
C4:38:D3 Tagatec Tagatec Co.,Ltd
C4:39:3A SmcNetwo SMC Networks Inc
+C4:3A:35 Fn-LinkT Fn-Link Technology Limited
C4:3A:9F Siconix Siconix Inc.
C4:3A:BE SonyMobi Sony Mobile Communications Inc
C4:3C:3C CybelecS Cybelec Sa
@@ -33761,6 +33799,7 @@ C4:40:44 Racktop RackTop Systems Inc.
C4:41:1E BelkinIn Belkin International Inc.
C4:42:02 SamsungE Samsung Electronics Co.,Ltd
C4:43:8F LgElectr LG Electronics (Mobile Communications)
+C4:44:7D HuaweiTe Huawei Technologies Co.,Ltd
C4:44:A0 Cisco Cisco Systems, Inc
C4:45:67 SambonPr SAMBON PRECISON and ELECTRONICS
C4:45:EC Shanghai Shanghai Yali Electron Co.,LTD
@@ -33871,6 +33910,7 @@ C4:AA:A1 SummitDe SUMMIT DEVELOPMENT, spol.s r.o.
C4:AB:B2 VivoMobi vivo Mobile Communication Co., Ltd.
C4:AC:59 MurataMa Murata Manufacturing Co., Ltd.
C4:AD:21 Mediaedg MEDIAEDGE Corporation
+C4:AD:34 Routerbo Routerboard.com
C4:AD:F1 Gopeace GOPEACE Inc.
C4:AE:12 SamsungE Samsung Electronics Co.,Ltd
C4:B3:01 Apple Apple, Inc.
@@ -34340,6 +34380,7 @@ CC:65:AD ArrisGro ARRIS Group, Inc.
CC:66:0A Apple Apple, Inc.
CC:66:B2 Nokia
CC:69:B0 GlobalTr Global Traffic Technologies, LLC
+CC:6A:10 Chamberl The Chamberlain Group, Inc
CC:6B:98 MinetecW Minetec Wireless Technologies
CC:6B:F1 SoundMas Sound Masking Inc.
CC:6D:A0 Roku Roku, Inc.
@@ -34556,6 +34597,7 @@ D0:37:61 TexasIns Texas Instruments
D0:39:72 TexasIns Texas Instruments
D0:39:B3 ArrisGro ARRIS Group, Inc.
D0:39:EA Netapp
+D0:3D:52 Vaion Vaion Limited
D0:3D:C3 Aq AQ Corporation
D0:3E:5C HuaweiTe Huawei Technologies Co.,Ltd
D0:41:C9 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
@@ -35687,7 +35729,7 @@ E0:A6:70 Nokia Nokia Corporation
E0:A7:00 Verkada Verkada Inc
E0:A8:B8 LeShiZhi Le Shi Zhi Xin Electronic Technology (Tianjin) Limited
E0:AA:96 SamsungE Samsung Electronics Co.,Ltd
-E0:AA:B0 GeneralV General Vision Electronics Co. Ltd.
+E0:AA:B0 SuntaiiE Suntaii Enterprise Co., Ltd.
E0:AA:DB NanjingP Nanjing PANENG Technology Development Co.,Ltd
E0:AB:FE OrbNetwo Orb Networks, Inc.
E0:AC:CB Apple Apple, Inc.
@@ -35962,6 +36004,7 @@ E4:A7:C5 HuaweiTe Huawei Technologies Co.,Ltd
E4:A7:FD CellcoPa Cellco Partnership
E4:A8:B6 HuaweiTe Huawei Technologies Co.,Ltd
E4:AA:5D Cisco Cisco Systems, Inc
+E4:AA:EA LiteonTe Liteon Technology Corporation
E4:AB:46 UabSelte UAB Selteka
E4:AB:89 Mitrasta MitraStar Technology Corp.
E4:AD:7D SclEleme SCL Elements
@@ -35974,6 +36017,7 @@ E4:B9:7A Dell Dell Inc.
E4:BA:D9 360Fly 360 Fly Inc.
E4:BD:4B Zte zte corporation
E4:BE:ED NetcoreT Netcore Technology Inc.
+E4:C0:CC ChinaMob China Mobile Group Device Co.,Ltd.
E4:C1:46 Objetivo Objetivos y Servicios de Valor A
E4:C1:F1 Shenzhen SHENZHEN SPOTMAU INFORMATION TECHNOLIGY CO., Ltd
E4:C2:D1 HuaweiTe Huawei Technologies Co.,Ltd
@@ -36528,6 +36572,7 @@ F0:3D:03 TecnoMob Tecno Mobile Limited
F0:3D:29 Actility
F0:3E:90 RuckusWi Ruckus Wireless
F0:3E:BF GogoroTa Gogoro Taiwan Limited
+F0:3F:95 HuaweiTe Huawei Technologies Co.,Ltd
F0:3F:F8 RLDrake R L Drake
F0:40:7B Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
F0:41:C8 IeeeRegi IEEE Registration Authority
@@ -36708,6 +36753,7 @@ F0:ED:1E BilkonBi Bilkon Bilgisayar Kontrollu Cih. Im.Ltd.
F0:EE:10 SamsungE Samsung Electronics Co.,Ltd
F0:EE:58 PaceTele PACE Telematics GmbH
F0:EE:BB Vipar VIPAR GmbH
+F0:EF:86 Google Google, Inc.
F0:EF:D2 TfPaymen Tf Payment Service Co., Ltd
F0:F0:02 HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
F0:F0:8F NextekSo Nextek Solutions Pte Ltd
@@ -36936,6 +36982,7 @@ F4:E1:42 DeltaEle Delta Elektronika BV
F4:E2:04 Traqueur
F4:E3:FB HuaweiTe Huawei Technologies Co.,Ltd
F4:E4:AD Zte zte corporation
+F4:E5:F2 HuaweiTe Huawei Technologies Co.,Ltd
F4:E6:D7 SolarPow Solar Power Technologies, Inc.
F4:E9:26 TianjinZ Tianjin Zanpu Technology Inc.
F4:E9:D4 Qlogic QLogic Corporation
diff --git a/profiles/No Reassembly/preferences b/profiles/No Reassembly/preferences
index b21e04a972..48417ebeaa 100644
--- a/profiles/No Reassembly/preferences
+++ b/profiles/No Reassembly/preferences
@@ -44,7 +44,6 @@ ged125.desegment_body: FALSE
giop.desegment_giop_messages: FALSE
giop.reassemble: FALSE
git.desegment: FALSE
-gryphon.desegment: FALSE
gsm_sms.reassemble: FALSE
gsm_sms.reassemble_with_lower_layers_info: FALSE
gss-api.gssapi_reassembly: FALSE
@@ -93,7 +92,6 @@ rtse.reassemble: FALSE
idmp.desegment_idmp_messages: FALSE
idmp.reassemble: FALSE
p_mul.reassemble: FALSE
-pn_rt.desegment: FALSE
pop.desegment_data: FALSE
ppi.reassemble: FALSE
pvfs.desegment: FALSE
@@ -146,7 +144,6 @@ tls.desegment_ssl_records: FALSE
tls.desegment_ssl_application_data: FALSE
tns.desegment_tns_messages: FALSE
tpkt.desegment: FALSE
-transum.reassembly: FALSE
ucp.desegment_ucp_messages: FALSE
ulp.desegment_ulp_messages: FALSE
uma.desegment_ucp_messages: FALSE
diff --git a/services b/services
index 584f28644d..0459af12b6 100644
--- a/services
+++ b/services
@@ -5849,6 +5849,7 @@ athand-mmp 20999/tcp/udp # At Hand MMP
irtrans 21000/tcp/udp # IRTrans Control
notezilla-lan 21010/tcp # Notezilla.Lan Server
trinket-agent 21212/tcp # Distributed artificial intelligence
+cohesity-agent 21213/tcp # Cohesity backup agents
aigairserver 21221/tcp # Services for Air Server
rdm-tfs 21553/tcp # Raima RDM TFS
dfserver 21554/tcp/udp # MineScape Design File Server
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index b844399246..57550b5799 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1771,7 +1771,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<name>CopyFromProfileMenu</name>
<message>
<source>System default</source>
- <translation type="unfinished"></translation>
+ <translation>Standard</translation>
</message>
</context>
<context>
@@ -2488,8 +2488,9 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Die Hifle für Extcap-Schnittstelle %1 kann nicht gefunden werden. Angegebene Datei: %2</translation>
</message>
<message>
- <source>Save parameter on capture start</source>
- <translation>Parameter beim Starten des Mitschnitts speichern</translation>
+ <source>Save parameter(s) on capture start</source>
+ <oldsource>Save parameter on capture start</oldsource>
+ <translation type="unfinished">Parameter beim Starten des Mitschnitts speichern</translation>
</message>
</context>
<context>
@@ -4259,6 +4260,10 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<source>External capture interfaces disabled.</source>
<translation>Externe Mitschnittschnittstellen deaktiviert.</translation>
</message>
+ <message>
+ <source>Start capture</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InterfaceSortFilterModel</name>
@@ -5690,8 +5695,24 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Importieren</translation>
</message>
<message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Export</source>
- <translation type="unfinished">Exportieren</translation>
+ <translation>Exportieren</translation>
+ </message>
+ <message>
+ <source>selected personal profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>New</source>
@@ -5737,13 +5758,17 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<oldsource>No expert info</oldsource>
<translation>Keine Experten-Informationen</translation>
</message>
- <message>
- <source>, 1 byte</source>
- <translation>, 1 Byte</translation>
+ <message numerus="yes">
+ <source>%Ln byte(s)</source>
+ <oldsource>, 1 byte</oldsource>
+ <translation type="unfinished">
+ <numerusform>, 1 Byte</numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>, %1 bytes</source>
- <translation>, %1 Bytes</translation>
+ <translation type="vanished">, %1 Bytes</translation>
</message>
<message>
<source>Byte %1</source>
@@ -8548,55 +8573,56 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<context>
<name>ProfileDialog</name>
<message>
- <source>Search for profile ...</source>
- <translation>Nach Profil suchen ...</translation>
+ <source>Search for profile …</source>
+ <oldsource>Search for profile ...</oldsource>
+ <translation type="unfinished">Nach Profil suchen ...</translation>
</message>
<message>
<source>Create a new profile using default settings.</source>
<translation>Ein neues Profil mit den Standardeinstellungen erstellen.</translation>
</message>
<message>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove this profile. System provided profiles cannot be removed. The default profile will be resetted upon deletion.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Remove this profile. System provided profiles cannot be removed.</source>
<oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource>
- <translation>Dieses Profil entfernen. Das Standardprofil und vorgegebene Profile können nicht entfernt werden.</translation>
+ <translation type="vanished">Dieses Profil entfernen. Das Standardprofil und vorgegebene Profile können nicht entfernt werden.</translation>
</message>
<message>
<source>Copy this profile.</source>
<translation>Dieses Profil kopieren.</translation>
</message>
<message>
- <source>Import</source>
- <translation type="vanished">Importieren</translation>
- </message>
- <message>
<source>Configuration Profiles</source>
<translation>Profile konfigurieren</translation>
</message>
<message>
<source>Import</source>
<comment>noun</comment>
- <translation type="unfinished">Importieren</translation>
+ <translation>Importieren</translation>
</message>
<message>
<source>Export</source>
<comment>noun</comment>
- <translation type="unfinished">Exportieren</translation>
+ <translation>Exportieren</translation>
</message>
<message>
<source>All Profiles</source>
- <translation>Alle Profile</translation>
+ <translation type="vanished">Alle Profile</translation>
</message>
<message>
<source>User-defined profiles</source>
- <translation>Benutzerdefinierte Profile</translation>
+ <translation type="vanished">Benutzerdefinierte Profile</translation>
</message>
<message>
<source>System profiles</source>
- <translation>Systemprofile</translation>
+ <translation type="vanished">Systemprofile</translation>
</message>
<message>
<source>An import of profiles is not allowed, while changes are pending.</source>
- <translation type="unfinished"></translation>
+ <translation>Solange Änderungen noch anstehen können Profile nicht importiert werden.</translation>
</message>
<message>
<source>New profile</source>
@@ -8608,85 +8634,123 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>Exporting profiles</source>
- <translation type="unfinished"></translation>
+ <translation>Profile exportieren</translation>
</message>
<message>
<source>No profiles found for export</source>
- <translation type="unfinished"></translation>
+ <translation>Keine Profile zum Exportieren gefunden</translation>
</message>
<message>
<source>Select zip file for export</source>
- <translation type="unfinished"></translation>
+ <translation>Zum Exportieren eine Zipdatei auswählen</translation>
</message>
<message numerus="yes">
<source>%Ln profile(s) have been exported</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation type="vanished">
+ <numerusform>%Ln Profil wurde exportiert</numerusform>
+ <numerusform>%Ln Profile wurden exportiert</numerusform>
</translation>
</message>
<message>
<source>An error has occured while exporting profiles</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Ein Fehler ist beim exportieren der Profile aufgetreten</translation>
</message>
<message>
<source>Select zip file for import</source>
<translation>Zum Importieren eine Zipdatei auswählen</translation>
</message>
+ <message>
+ <source>Select directory for import</source>
+ <translation>Zum Importieren ein Verzeichnis auswählen</translation>
+ </message>
+ <message>
+ <source>Zip File (*.zip)</source>
+ <translation>Zipdatei (*.zip)</translation>
+ </message>
+ <message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
- <source>%Ln profile(s) imported</source>
+ <source>%Ln selected personal profile(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished">Fehler</translation>
+ </message>
<message numerus="yes">
- <source>, %Ln profile(s) skipped</source>
+ <source>%Ln profile(s) exported</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
- <source>Select directory for import</source>
+ <source>An error has occurred while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Zip File (*.zip)</source>
- <translation>Zipdatei (*.zip)</translation>
- </message>
- <message>
<source>No profiles found for import in %1</source>
<translation>Keine Profile unter %1 zum Importieren gefunden</translation>
</message>
- <message>
- <source>, %1 profile(s) skipped</source>
- <translation type="vanished">, %1 Profil(e) übersprungen</translation>
+ <message numerus="yes">
+ <source>%Ln profile(s) imported</source>
+ <translation>
+ <numerusform>%Ln Profil importiert</numerusform>
+ <numerusform>%Ln Profile importiert</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>, %Ln profile(s) skipped</source>
+ <translation>
+ <numerusform>, %1 Profil übersprungen</numerusform>
+ <numerusform>, %1 Profile übersprungen</numerusform>
+ </translation>
</message>
<message>
<source>Importing profiles</source>
<translation>Profile importieren</translation>
</message>
- <message>
- <source>One profile has been imported</source>
- <translation type="vanished">Ein Profil wurde importiert</translation>
- </message>
- <message>
- <source>%1 profiles have been imported</source>
- <translation type="vanished">%1 Profile wurden importiert</translation>
- </message>
</context>
<context>
<name>ProfileModel</name>
<message>
<source>User</source>
- <translation>Benutzer</translation>
+ <translation type="vanished">Benutzer</translation>
</message>
<message>
<source>Resetting to default</source>
<translation>Auf Standard zurücksetzen</translation>
</message>
<message>
+ <source>Imported profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Created from default settings</source>
<translation>Erstellt aus den Standardeinstellungen</translation>
</message>
@@ -8696,52 +8760,44 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>system provided</source>
+ <translation>vom System vorgegeben</translation>
+ </message>
+ <message>
+ <source>renamed to</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>deleted</source>
- <translation type="unfinished"></translation>
+ <translation>gelöscht</translation>
</message>
<message>
<source>copy</source>
<comment>noun</comment>
- <translation type="unfinished">Kopieren</translation>
+ <translation>kopieren</translation>
</message>
<message>
<source>Exporting profiles while changes are pending is not allowed</source>
- <translation type="unfinished"></translation>
+ <translation>Solange Änderungen noch anstehen können Profile nicht exportiert werden.</translation>
</message>
<message>
<source>No profiles found to export</source>
+ <translation>Keine Profile zum Exportieren gefunden</translation>
+ </message>
+ <message>
+ <source>Can&apos;t delete profile directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A profile name cannot contain the following characters: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Ein Profilname darf keines der folgenden Zeichen enthalten: %1</translation>
</message>
<message>
<source>A profile name cannot contain the &apos;/&apos; character.</source>
- <translation type="unfinished"></translation>
+ <translation>Ein Profilname darf kein &apos;/&apos; Zeichen enthalten.</translation>
</message>
<message>
<source>A profile cannot start or end with a period (.)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Will be reset to default values</source>
- <translation type="vanished">Auf Ausgangswerte zurücksetzen</translation>
- </message>
- <message>
- <source>Created from %1</source>
- <translation type="vanished">Erstellt von %1</translation>
- </message>
- <message>
- <source>(system provided)</source>
- <translation type="vanished">(vom System vorgegeben)</translation>
- </message>
- <message>
- <source>(deleted)</source>
- <translation type="vanished">(gelöscht)</translation>
+ <translation>Ein Profil darf nicht mit einem Punkt (.) starten oder enden</translation>
</message>
<message>
<source>Default</source>
@@ -8749,7 +8805,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>System</source>
- <translation>System</translation>
+ <translation type="vanished">System</translation>
</message>
<message>
<source>Renamed from: </source>
@@ -8760,16 +8816,16 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Dies ist ein vorgegebenes Profil.</translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
- <translation type="vanished">Das Profil wird auf den Ausgangswert zurückgesetzt.</translation>
+ <source>Global</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
- <translation>Ein Profil mit diesem Namen existiert bereits.</translation>
+ <source>Personal</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
- <translation type="vanished">Ein Profil mit diesem Namen existiert bereits</translation>
+ <source>A profile already exists with this name.</source>
+ <translation>Ein Profil mit diesem Namen existiert bereits.</translation>
</message>
<message>
<source>Profile</source>
@@ -8779,21 +8835,20 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<source>Type</source>
<translation>Typ</translation>
</message>
+</context>
+<context>
+ <name>ProfileSortModel</name>
<message>
- <source>Path</source>
- <translation type="vanished">Pfad</translation>
- </message>
- <message>
- <source>copy</source>
- <translation type="vanished">Kopieren</translation>
+ <source>All profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not contain any of the following characters: %1</source>
- <translation type="vanished">Ein Profil darf keines der folgenden Zeichen enthalten: %1</translation>
+ <source>Personal profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not start or end with a period (.)</source>
- <translation type="vanished">Ein Profil darf nicht mit einem Punkt (.) beginnen oder enden</translation>
+ <source>Global profiles</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -8810,6 +8865,66 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Paketdetails</translation>
</message>
<message>
+ <source>Expand Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse Subtrees</source>
+ <translation type="unfinished">Teilbauch einklappen</translation>
+ </message>
+ <message>
+ <source>Expand All</source>
+ <translation type="unfinished">Alles aufklappen</translation>
+ </message>
+ <message>
+ <source>Collapse All</source>
+ <translation type="unfinished">Alles einklappen</translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation type="unfinished">Kopieren</translation>
+ </message>
+ <message>
+ <source>All Visible Items</source>
+ <translation type="unfinished">Alle sichtbaren Elemente</translation>
+ </message>
+ <message>
+ <source>All Visible Selected Tree Items</source>
+ <translation type="unfinished">Alle sichtbare ausgewählten Elemente</translation>
+ </message>
+ <message>
+ <source>Desription</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Name</source>
+ <translation type="unfinished">Feldname</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation type="unfinished">Wert</translation>
+ </message>
+ <message>
+ <source>As Filter</source>
+ <translation type="unfinished">Als Filter</translation>
+ </message>
+ <message>
+ <source>Wiki Protocol Page</source>
+ <translation type="unfinished">Wikiseite Protokolle (en)</translation>
+ </message>
+ <message>
+ <source>Filter Field Reference</source>
+ <translation type="unfinished">Referenz Filterfelder</translation>
+ </message>
+ <message>
+ <source>Wiki Page for %1</source>
+ <translation type="unfinished">Wikiseite für &amp;1</translation>
+ </message>
+ <message>
+ <source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
+ <translation type="unfinished">&lt;p&gt;Das Wireshark Wiki wird durch die Community gepflegt.&lt;/p&gt;&lt;p&gt;Die Seite, die aufgerufen werden soll, kann wundervoll, unvollständig, falsch oder gar nicht vorhanden sein.&lt;/p&gt;&lt;p&gt;Zum Wiki gehen?&lt;/p&gt;</translation>
+ </message>
+ <message>
<source>Colorize with Filter</source>
<translation>Mit Filter einfärben</translation>
</message>
@@ -12903,6 +13018,10 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Alle Anrufe auswählen</translation>
</message>
<message>
+ <source>Display time as time of day</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy as CSV</source>
<translation>Als CSV kopieren</translation>
</message>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index f56b797484..d62498b4f0 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -4225,6 +4225,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>External capture interfaces disabled.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Start capture</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InterfaceSortFilterModel</name>
@@ -5631,6 +5635,14 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
@@ -5725,6 +5737,14 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>selected personal profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Packets: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -8487,7 +8507,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileDialog</name>
<message>
- <source>Search for profile ...</source>
+ <source>Search for profile …</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8495,8 +8515,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Remove this profile. System provided profiles cannot be removed.</source>
- <oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove this profile. System provided profiles cannot be removed. The default profile will be resetted upon deletion.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8518,18 +8537,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>All Profiles</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>User-defined profiles</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>System profiles</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>An import of profiles is not allowed, while changes are pending.</source>
<translation type="unfinished"></translation>
</message>
@@ -8555,7 +8562,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message numerus="yes">
<source>… %Ln selected personal profile(s)</source>
- <translation>
+ <translation type="vanished">
<numerusform>… %Ln selected personal profile</numerusform>
<numerusform>… %Ln selected personal profiles</numerusform>
</translation>
@@ -8575,10 +8582,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</translation>
</message>
<message>
- <source>An error has occured while exporting profiles</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Select zip file for import</source>
<translation type="unfinished"></translation>
</message>
@@ -8591,6 +8594,38 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An error has occurred while exporting profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>No profiles found for import in %1</source>
<translation type="unfinished"></translation>
</message>
@@ -8614,7 +8649,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message numerus="yes">
<source>%Ln profile(s) selected</source>
- <translation type="unfinished">
+ <translation type="obsolete">
<numerusform>%Ln profile selected</numerusform>
<numerusform>%Ln profiles selected</numerusform>
</translation>
@@ -8623,11 +8658,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileModel</name>
<message>
- <source>User</source>
+ <source>Resetting to default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Resetting to default</source>
+ <source>Imported profile</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8643,6 +8678,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>renamed to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>deleted</source>
<translation type="unfinished"></translation>
</message>
@@ -8660,6 +8699,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can&apos;t delete profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -8676,15 +8719,19 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>System</source>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from: </source>
+ <source>This is a system provided profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>Global</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8701,6 +8748,21 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ProfileSortModel</name>
+ <message>
+ <source>All profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Global profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ProgressFrame</name>
<message>
<source>Frame</source>
@@ -8714,6 +8776,66 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Expand Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Expand All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All Visible Items</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All Visible Selected Tree Items</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Desription</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>As Filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Wiki Protocol Page</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Filter Field Reference</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Wiki Page for %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Colorize with Filter</source>
<translation type="unfinished"></translation>
</message>
@@ -12702,6 +12824,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Display time as time of day</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy as CSV</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 62ca817166..88a70463cd 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -2462,7 +2462,8 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save parameter on capture start</source>
+ <source>Save parameter(s) on capture start</source>
+ <oldsource>Save parameter on capture start</oldsource>
<translation type="unfinished"></translation>
</message>
</context>
@@ -4235,6 +4236,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>External capture interfaces disabled.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Start capture</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InterfaceSortFilterModel</name>
@@ -5666,10 +5671,26 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished">Importer</translation>
</message>
<message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Export</source>
<translation type="unfinished">Exporter</translation>
</message>
<message>
+ <source>selected personal profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Nouveau</translation>
@@ -5713,13 +5734,13 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<oldsource>No expert info</oldsource>
<translation>Pas d&apos;information expert</translation>
</message>
- <message>
- <source>, 1 byte</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>, %1 bytes</source>
- <translation type="unfinished"></translation>
+ <message numerus="yes">
+ <source>%Ln byte(s)</source>
+ <oldsource>, 1 byte</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>Byte %1</source>
@@ -8518,7 +8539,8 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<context>
<name>ProfileDialog</name>
<message>
- <source>Search for profile ...</source>
+ <source>Search for profile …</source>
+ <oldsource>Search for profile ...</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8526,8 +8548,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Crée un nouveau profil en utilisant les paramètres par défaut.</translation>
</message>
<message>
- <source>Remove this profile. System provided profiles cannot be removed.</source>
- <oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove this profile. System provided profiles cannot be removed. The default profile will be resetted upon deletion.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8549,82 +8570,105 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished">Exporter</translation>
</message>
<message>
- <source>All Profiles</source>
+ <source>An import of profiles is not allowed, while changes are pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>New profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>System profiles</source>
+ <source>Profile Error</source>
+ <translation>Erreur de Profil</translation>
+ </message>
+ <message>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending.</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>New profile</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>Erreur de Profil</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Exporting profiles</source>
+ <source>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for export</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for export</source>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <source>%Ln profile(s) have been exported</source>
+ <source>%Ln selected personal profile(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
- <source>An error has occured while exporting profiles</source>
+ <source>all personal profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>An import is pending to be saved. Additional imports are not allowed.</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>%Ln profile(s) imported</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished">Erreur</translation>
</message>
<message numerus="yes">
- <source>, %Ln profile(s) skipped</source>
+ <source>%Ln profile(s) exported</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
- <source>Select directory for import</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Zip File (*.zip)</source>
+ <source>An error has occurred while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No profiles found for import in %1</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>%Ln profile(s) imported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>, %Ln profile(s) skipped</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
<source>Importing profiles</source>
<translation type="unfinished"></translation>
@@ -8633,11 +8677,11 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<context>
<name>ProfileModel</name>
<message>
- <source>User</source>
+ <source>Resetting to default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Resetting to default</source>
+ <source>Imported profile</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8653,6 +8697,10 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
+ <source>renamed to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>deleted</source>
<translation type="unfinished"></translation>
</message>
@@ -8670,6 +8718,10 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can&apos;t delete profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -8686,15 +8738,19 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
- <source>System</source>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from: </source>
+ <source>This is a system provided profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>Global</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8711,6 +8767,21 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
</message>
</context>
<context>
+ <name>ProfileSortModel</name>
+ <message>
+ <source>All profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Global profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ProgressFrame</name>
<message>
<source>Frame</source>
@@ -8724,6 +8795,68 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Détail du paquet</translation>
</message>
<message>
+ <source>Expand Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Expand All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation type="unfinished">Copier</translation>
+ </message>
+ <message>
+ <source>All Visible Items</source>
+ <translation type="unfinished">Tous les Éléments Visibles</translation>
+ </message>
+ <message>
+ <source>All Visible Selected Tree Items</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Desription</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation type="unfinished">Valeur</translation>
+ </message>
+ <message>
+ <source>As Filter</source>
+ <translation type="unfinished">Comme un Filtre</translation>
+ </message>
+ <message>
+ <source>Wiki Protocol Page</source>
+ <translation type="unfinished">Page Wiki </translation>
+ </message>
+ <message>
+ <source>Filter Field Reference</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Wiki Page for %1</source>
+ <translation type="unfinished">Page Wiki pour %1</translation>
+ </message>
+ <message>
+ <source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
+ <translation type="unfinished">&lt;p&gt;Le Wiki Wireshark est maintenu par la communauté&lt;/p&gt;
+&lt;p&gt;La page que vous vous apprêtez à charger peut être magnifique, incomplète, fausse ou inexistante&lt;/p&gt;
+&lt;p&gt;Poursuivre vers le wiki?&lt;/p&gt;</translation>
+ </message>
+ <message>
<source>Colorize with Filter</source>
<translation>Colorier avec un Filtre</translation>
</message>
@@ -12789,6 +12922,10 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Sélectionner tous les appels</translation>
</message>
<message>
+ <source>Display time as time of day</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy as CSV</source>
<translation type="unfinished">Copier en tant que CSV</translation>
</message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index bfa49076d1..4915197131 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1771,7 +1771,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<name>CopyFromProfileMenu</name>
<message>
<source>System default</source>
- <translation type="unfinished"></translation>
+ <translation>Predefinito di sistema</translation>
</message>
</context>
<context>
@@ -2488,8 +2488,9 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>La guida per l&apos;interfaccia %1 non è disponibile. File specificato: %2</translation>
</message>
<message>
- <source>Save parameter on capture start</source>
- <translation>Salva parametro all&apos;avvio della cattura</translation>
+ <source>Save parameter(s) on capture start</source>
+ <oldsource>Save parameter on capture start</oldsource>
+ <translation type="unfinished">Salva parametro all&apos;avvio della cattura</translation>
</message>
</context>
<context>
@@ -4259,6 +4260,10 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<source>External capture interfaces disabled.</source>
<translation>Interfacce di cattura esterne disabilitate.</translation>
</message>
+ <message>
+ <source>Start capture</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InterfaceSortFilterModel</name>
@@ -5690,8 +5695,24 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Importa</translation>
</message>
<message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Export</source>
- <translation type="unfinished">Esporta</translation>
+ <translation>Esporta</translation>
+ </message>
+ <message>
+ <source>selected personal profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>New</source>
@@ -5737,13 +5758,17 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<oldsource>No expert info</oldsource>
<translation>Nessuna informazione per esperti</translation>
</message>
- <message>
- <source>, 1 byte</source>
- <translation>, 1 byte</translation>
+ <message numerus="yes">
+ <source>%Ln byte(s)</source>
+ <oldsource>, 1 byte</oldsource>
+ <translation type="unfinished">
+ <numerusform>, 1 byte</numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>, %1 bytes</source>
- <translation>, %1 byte</translation>
+ <translation type="vanished">, %1 byte</translation>
</message>
<message>
<source>Byte %1</source>
@@ -8548,55 +8573,56 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<context>
<name>ProfileDialog</name>
<message>
- <source>Search for profile ...</source>
- <translation>Cerca profilo...</translation>
+ <source>Search for profile …</source>
+ <oldsource>Search for profile ...</oldsource>
+ <translation type="unfinished">Cerca profilo...</translation>
</message>
<message>
<source>Create a new profile using default settings.</source>
<translation>Crea un nuovo profilo usando le impostazioni predefinite.</translation>
</message>
<message>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove this profile. System provided profiles cannot be removed. The default profile will be resetted upon deletion.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Remove this profile. System provided profiles cannot be removed.</source>
<oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource>
- <translation>Rimuovi questo profilo. I profili forniti dal sistema non possono essere rimossi.</translation>
+ <translation type="vanished">Rimuovi questo profilo. I profili forniti dal sistema non possono essere rimossi.</translation>
</message>
<message>
<source>Copy this profile.</source>
<translation>Copia questo profilo.</translation>
</message>
<message>
- <source>Import</source>
- <translation type="vanished">Importa</translation>
- </message>
- <message>
<source>Configuration Profiles</source>
<translation>Profili di configurazione</translation>
</message>
<message>
<source>Import</source>
<comment>noun</comment>
- <translation type="unfinished">Importa</translation>
+ <translation>Importa</translation>
</message>
<message>
<source>Export</source>
<comment>noun</comment>
- <translation type="unfinished">Esporta</translation>
+ <translation>Esporta</translation>
</message>
<message>
<source>All Profiles</source>
- <translation>Tutti i profili</translation>
+ <translation type="vanished">Tutti i profili</translation>
</message>
<message>
<source>User-defined profiles</source>
- <translation>Profili definiti dall&apos;utente</translation>
+ <translation type="vanished">Profili definiti dall&apos;utente</translation>
</message>
<message>
<source>System profiles</source>
- <translation>Profili di sistema</translation>
+ <translation type="vanished">Profili di sistema</translation>
</message>
<message>
<source>An import of profiles is not allowed, while changes are pending.</source>
- <translation type="unfinished"></translation>
+ <translation>Non è consentito importare profili mentre ci sono modifiche in corso.</translation>
</message>
<message>
<source>New profile</source>
@@ -8608,85 +8634,123 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>Exporting profiles</source>
- <translation type="unfinished"></translation>
+ <translation>Esportazione profili</translation>
</message>
<message>
<source>No profiles found for export</source>
- <translation type="unfinished"></translation>
+ <translation>Nessun profilo trovato per l&apos;esportazione</translation>
</message>
<message>
<source>Select zip file for export</source>
- <translation type="unfinished"></translation>
+ <translation>Seleziona file zip per l&apos;esportazione</translation>
</message>
<message numerus="yes">
<source>%Ln profile(s) have been exported</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation type="vanished">
+ <numerusform>%Ln profili è stato esportato</numerusform>
+ <numerusform>%Ln profili sono stati esportati</numerusform>
</translation>
</message>
<message>
<source>An error has occured while exporting profiles</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Si è verificato un errore durante l&apos;esportazione di profili</translation>
</message>
<message>
<source>Select zip file for import</source>
<translation>Seleziona file zip per l&apos;importazione</translation>
</message>
+ <message>
+ <source>Select directory for import</source>
+ <translation>Seleziona cartella per l&apos;importazione</translation>
+ </message>
+ <message>
+ <source>Zip File (*.zip)</source>
+ <translation>File Zip (*.zip)</translation>
+ </message>
+ <message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
- <source>%Ln profile(s) imported</source>
+ <source>%Ln selected personal profile(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished">Errore</translation>
+ </message>
<message numerus="yes">
- <source>, %Ln profile(s) skipped</source>
+ <source>%Ln profile(s) exported</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
- <source>Select directory for import</source>
+ <source>An error has occurred while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Zip File (*.zip)</source>
- <translation>File Zip (*.zip)</translation>
- </message>
- <message>
<source>No profiles found for import in %1</source>
<translation>Nessun profilo trovato per l&apos;importazione in %1</translation>
</message>
- <message>
- <source>, %1 profile(s) skipped</source>
- <translation type="vanished">, %1 profili saltati</translation>
+ <message numerus="yes">
+ <source>%Ln profile(s) imported</source>
+ <translation>
+ <numerusform>%Ln profilo importato</numerusform>
+ <numerusform>%Ln profili importati</numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>, %Ln profile(s) skipped</source>
+ <translation>
+ <numerusform>, %Ln profilo importato</numerusform>
+ <numerusform>, %Ln profili importati</numerusform>
+ </translation>
</message>
<message>
<source>Importing profiles</source>
<translation>Importazione profili</translation>
</message>
- <message>
- <source>One profile has been imported</source>
- <translation type="vanished">Un profilo è stato importato</translation>
- </message>
- <message>
- <source>%1 profiles have been imported</source>
- <translation type="vanished">%1 profili sono stati importati</translation>
- </message>
</context>
<context>
<name>ProfileModel</name>
<message>
<source>User</source>
- <translation>Utente</translation>
+ <translation type="vanished">Utente</translation>
</message>
<message>
<source>Resetting to default</source>
<translation>Ripristino dei valori predefiniti</translation>
</message>
<message>
+ <source>Imported profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Created from default settings</source>
<translation>Creato dalle impostazioni predefinite</translation>
</message>
@@ -8696,52 +8760,44 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>system provided</source>
+ <translation>fornito dal sistema</translation>
+ </message>
+ <message>
+ <source>renamed to</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>deleted</source>
- <translation type="unfinished"></translation>
+ <translation>eliminato</translation>
</message>
<message>
<source>copy</source>
<comment>noun</comment>
- <translation type="unfinished">copia</translation>
+ <translation>copia</translation>
</message>
<message>
<source>Exporting profiles while changes are pending is not allowed</source>
- <translation type="unfinished"></translation>
+ <translation>Non è consentito esportare profili mentre ci sono modifiche in corso.</translation>
</message>
<message>
<source>No profiles found to export</source>
+ <translation>Nessun profilo trovato per l&apos;esportazione</translation>
+ </message>
+ <message>
+ <source>Can&apos;t delete profile directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A profile name cannot contain the following characters: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Il nome di un profilo non può contenere i seguenti caratteri: %1</translation>
</message>
<message>
<source>A profile name cannot contain the &apos;/&apos; character.</source>
- <translation type="unfinished"></translation>
+ <translation>Il nome di un profilo non può contenere il carattere &apos;/&apos;. </translation>
</message>
<message>
<source>A profile cannot start or end with a period (.)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Will be reset to default values</source>
- <translation type="vanished">Sarà ripristinato ai valori predefiniti</translation>
- </message>
- <message>
- <source>Created from %1</source>
- <translation type="vanished">Creato da %1</translation>
- </message>
- <message>
- <source>(system provided)</source>
- <translation type="vanished">(fornito dal sistema)</translation>
- </message>
- <message>
- <source>(deleted)</source>
- <translation type="vanished">(eliminato)</translation>
+ <translation>Un profilo non può iniziare o finire con un punto (.)</translation>
</message>
<message>
<source>Default</source>
@@ -8749,7 +8805,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>System</source>
- <translation>Sistema </translation>
+ <translation type="vanished">Sistema </translation>
</message>
<message>
<source>Renamed from: </source>
@@ -8760,16 +8816,16 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Questo è un profilo fornito dal sistema.</translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
- <translation type="vanished">Il profilo sarà ripristinato ai valori predefiniti.</translation>
+ <source>Global</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
- <translation>Un profilo con questo nome esiste già.</translation>
+ <source>Personal</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
- <translation type="vanished">Un profilo con questo nome esiste già</translation>
+ <source>A profile already exists with this name.</source>
+ <translation>Un profilo con questo nome esiste già.</translation>
</message>
<message>
<source>Profile</source>
@@ -8779,21 +8835,20 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<source>Type</source>
<translation>Tipo</translation>
</message>
+</context>
+<context>
+ <name>ProfileSortModel</name>
<message>
- <source>Path</source>
- <translation type="vanished">Percorso</translation>
- </message>
- <message>
- <source>copy</source>
- <translation type="vanished">copia</translation>
+ <source>All profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not contain any of the following characters: %1</source>
- <translation type="vanished">Un profilo non deve contenere uno dei seguenti caratteri: %1</translation>
+ <source>Personal profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not start or end with a period (.)</source>
- <translation type="vanished">Un profilo non deve iniziare o finire con un punto (.)</translation>
+ <source>Global profiles</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -8810,6 +8865,66 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Dettagli del pacchetto</translation>
</message>
<message>
+ <source>Expand Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse Subtrees</source>
+ <translation type="unfinished">Contrai sottoalberi</translation>
+ </message>
+ <message>
+ <source>Expand All</source>
+ <translation type="unfinished">Espandi tutti</translation>
+ </message>
+ <message>
+ <source>Collapse All</source>
+ <translation type="unfinished">Contrai tutti</translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation type="unfinished">Copia</translation>
+ </message>
+ <message>
+ <source>All Visible Items</source>
+ <translation type="unfinished">Tutti gli elementi visibili</translation>
+ </message>
+ <message>
+ <source>All Visible Selected Tree Items</source>
+ <translation type="unfinished">Tutti gli elementi visibili dell&apos;albero selezionato</translation>
+ </message>
+ <message>
+ <source>Desription</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Name</source>
+ <translation type="unfinished">Nome campo</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation type="unfinished">Valore</translation>
+ </message>
+ <message>
+ <source>As Filter</source>
+ <translation type="unfinished">Come filtro</translation>
+ </message>
+ <message>
+ <source>Wiki Protocol Page</source>
+ <translation type="unfinished">Pagina wiki del protocollo</translation>
+ </message>
+ <message>
+ <source>Filter Field Reference</source>
+ <translation type="unfinished">Riferimento campo di filtro</translation>
+ </message>
+ <message>
+ <source>Wiki Page for %1</source>
+ <translation type="unfinished">Pagina wiki per %1</translation>
+ </message>
+ <message>
+ <source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
+ <translation type="unfinished">&lt;p&gt;Il Wiki di Wireshark è gestito dalla comunità.&lt;/p&gt;&lt;p&gt;La pagina che stai per caricare potrebbe essere perfetta, incompleta, errata o inesistente.&lt;/p&gt;&lt;p&gt;Vuoi proseguire?&lt;/p&gt;</translation>
+ </message>
+ <message>
<source>Colorize with Filter</source>
<translation>Colora con filtro</translation>
</message>
@@ -12898,6 +13013,10 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Seleziona tutte le chiamate</translation>
</message>
<message>
+ <source>Display time as time of day</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy as CSV</source>
<translation>Copia come CSV</translation>
</message>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 500b8d5bf4..b8a600777d 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -2478,8 +2478,9 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save parameter on capture start</source>
- <translation>キャプチャ開始時にパラメタを保存します</translation>
+ <source>Save parameter(s) on capture start</source>
+ <oldsource>Save parameter on capture start</oldsource>
+ <translation type="unfinished">キャプチャ開始時にパラメタを保存します</translation>
</message>
</context>
<context>
@@ -4242,6 +4243,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>External capture interfaces disabled.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Start capture</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InterfaceSortFilterModel</name>
@@ -5675,10 +5680,26 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">インポート</translation>
</message>
<message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Export</source>
<translation type="unfinished">エクスポート</translation>
</message>
<message>
+ <source>selected personal profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>新規</translation>
@@ -5722,13 +5743,12 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<oldsource>No expert info</oldsource>
<translation>エキスパート情報はありません</translation>
</message>
- <message>
- <source>, 1 byte</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>, %1 bytes</source>
- <translation type="unfinished"></translation>
+ <message numerus="yes">
+ <source>%Ln byte(s)</source>
+ <oldsource>, 1 byte</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>Byte %1</source>
@@ -8530,7 +8550,8 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileDialog</name>
<message>
- <source>Search for profile ...</source>
+ <source>Search for profile …</source>
+ <oldsource>Search for profile ...</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8538,8 +8559,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>デフォルトの設定を用いて新規プロファイルを作成します</translation>
</message>
<message>
- <source>Remove this profile. System provided profiles cannot be removed.</source>
- <oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove this profile. System provided profiles cannot be removed. The default profile will be resetted upon deletion.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8561,79 +8581,101 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">エクスポート</translation>
</message>
<message>
- <source>All Profiles</source>
+ <source>An import of profiles is not allowed, while changes are pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>New profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>System profiles</source>
+ <source>Profile Error</source>
+ <translation>プロファイルエラー</translation>
+ </message>
+ <message>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending.</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>New profile</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>プロファイルエラー</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Exporting profiles</source>
+ <source>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for export</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for export</source>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <source>%Ln profile(s) have been exported</source>
+ <source>%Ln selected personal profile(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <source>An error has occured while exporting profiles</source>
+ <source>all personal profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>An import is pending to be saved. Additional imports are not allowed.</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>%Ln profile(s) imported</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished">エラー</translation>
</message>
<message numerus="yes">
- <source>, %Ln profile(s) skipped</source>
+ <source>%Ln profile(s) exported</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <source>Select directory for import</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Zip File (*.zip)</source>
+ <source>An error has occurred while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No profiles found for import in %1</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>%Ln profile(s) imported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>, %Ln profile(s) skipped</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
<source>Importing profiles</source>
<translation type="unfinished"></translation>
@@ -8642,11 +8684,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileModel</name>
<message>
- <source>User</source>
+ <source>Resetting to default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Resetting to default</source>
+ <source>Imported profile</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8662,6 +8704,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>renamed to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>deleted</source>
<translation type="unfinished"></translation>
</message>
@@ -8679,6 +8725,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can&apos;t delete profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -8695,15 +8745,19 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>System</source>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from: </source>
+ <source>This is a system provided profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>Global</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8720,6 +8774,21 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ProfileSortModel</name>
+ <message>
+ <source>All profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Global profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ProgressFrame</name>
<message>
<source>Frame</source>
@@ -8733,6 +8802,66 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>パケット詳細</translation>
</message>
<message>
+ <source>Expand Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Expand All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation type="unfinished">コピー</translation>
+ </message>
+ <message>
+ <source>All Visible Items</source>
+ <translation type="unfinished">すべての見えている項目</translation>
+ </message>
+ <message>
+ <source>All Visible Selected Tree Items</source>
+ <translation type="unfinished">すべての見えている選択されたツリー項目</translation>
+ </message>
+ <message>
+ <source>Desription</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Name</source>
+ <translation type="unfinished">フィールド名</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation type="unfinished">値</translation>
+ </message>
+ <message>
+ <source>As Filter</source>
+ <translation type="unfinished">フィルタとして</translation>
+ </message>
+ <message>
+ <source>Wiki Protocol Page</source>
+ <translation type="unfinished">Wikiプロトコルページ</translation>
+ </message>
+ <message>
+ <source>Filter Field Reference</source>
+ <translation type="unfinished">フィルタフィールドリファレンス</translation>
+ </message>
+ <message>
+ <source>Wiki Page for %1</source>
+ <translation type="unfinished">%1 の Wikiページ</translation>
+ </message>
+ <message>
+ <source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
+ <translation type="unfinished">&lt;p&gt;ワイヤーシャークWikiはコミュニティによって運営されています &lt;/p&gt;&lt;p&gt;いま見ているページはすばらしかったり、不完全だったり、間違っていたり、存在しないかもしれません。&lt;/p&gt;&lt;p&gt;Wikiに移動しますか?&lt;/p&gt;</translation>
+ </message>
+ <message>
<source>Colorize with Filter</source>
<translation>フィルタで色付け</translation>
</message>
@@ -12799,6 +12928,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>すべての通話を選択します</translation>
</message>
<message>
+ <source>Display time as time of day</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy as CSV</source>
<translation type="unfinished">CSVとしてコピー</translation>
</message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 364cdb16b2..1e74857778 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -2492,8 +2492,9 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Nie znaleziono pomocy dla interfejsu extcap %1. Plik: %2</translation>
</message>
<message>
- <source>Save parameter on capture start</source>
- <translation>Zapisz parametry przy starcie przechwytywania</translation>
+ <source>Save parameter(s) on capture start</source>
+ <oldsource>Save parameter on capture start</oldsource>
+ <translation type="unfinished">Zapisz parametry przy starcie przechwytywania</translation>
</message>
</context>
<context>
@@ -4263,6 +4264,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>External capture interfaces disabled.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Start capture</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InterfaceSortFilterModel</name>
@@ -5696,10 +5701,26 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Importuj</translation>
</message>
<message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Export</source>
<translation type="unfinished">Eksportuj</translation>
</message>
<message>
+ <source>selected personal profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Nowy</translation>
@@ -5743,13 +5764,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<oldsource>No expert info</oldsource>
<translation>Brak informacji eksperckiej</translation>
</message>
- <message>
- <source>, 1 byte</source>
- <translation>, 1 bajt</translation>
+ <message numerus="yes">
+ <source>%Ln byte(s)</source>
+ <oldsource>, 1 byte</oldsource>
+ <translation type="unfinished">
+ <numerusform>, 1 bajt</numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>, %1 bytes</source>
- <translation>, %1 bajtów</translation>
+ <translation type="vanished">, %1 bajtów</translation>
</message>
<message>
<source>Byte %1</source>
@@ -8556,7 +8582,8 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileDialog</name>
<message>
- <source>Search for profile ...</source>
+ <source>Search for profile …</source>
+ <oldsource>Search for profile ...</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8564,9 +8591,13 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Utwórz nowy profil używając ustawień domyślnych.</translation>
</message>
<message>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove this profile. System provided profiles cannot be removed. The default profile will be resetted upon deletion.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Remove this profile. System provided profiles cannot be removed.</source>
<oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource>
- <translation>Usuń profil. Profile dostarczone z tym oprogramowaniem nie mogą być usunięte.</translation>
+ <translation type="vanished">Usuń profil. Profile dostarczone z tym oprogramowaniem nie mogą być usunięte.</translation>
</message>
<message>
<source>Copy this profile.</source>
@@ -8587,43 +8618,51 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Eksportuj</translation>
</message>
<message>
- <source>All Profiles</source>
+ <source>An import of profiles is not allowed, while changes are pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>New profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>System profiles</source>
+ <source>Profile Error</source>
+ <translation>Błąd w profilu</translation>
+ </message>
+ <message>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending.</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>New profile</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>Błąd w profilu</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Exporting profiles</source>
+ <source>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for export</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for export</source>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <source>%Ln profile(s) have been exported</source>
+ <source>%Ln selected personal profile(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
@@ -8631,11 +8670,39 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</translation>
</message>
<message>
- <source>An error has occured while exporting profiles</source>
+ <source>all personal profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>An import is pending to be saved. Additional imports are not allowed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <source>%Ln profile(s) exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>An error has occurred while exporting profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>No profiles found for import in %1</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
@@ -8655,18 +8722,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</translation>
</message>
<message>
- <source>Select directory for import</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Zip File (*.zip)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>No profiles found for import in %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Importing profiles</source>
<translation type="unfinished"></translation>
</message>
@@ -8674,11 +8729,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileModel</name>
<message>
- <source>User</source>
+ <source>Resetting to default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Resetting to default</source>
+ <source>Imported profile</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8694,6 +8749,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>renamed to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>deleted</source>
<translation type="unfinished"></translation>
</message>
@@ -8711,6 +8770,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can&apos;t delete profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -8727,15 +8790,19 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Domyślnie</translation>
</message>
<message>
- <source>System</source>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from: </source>
+ <source>This is a system provided profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>Global</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8752,6 +8819,21 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ProfileSortModel</name>
+ <message>
+ <source>All profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Global profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ProgressFrame</name>
<message>
<source>Frame</source>
@@ -8765,6 +8847,66 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Szczegóły pakietu</translation>
</message>
<message>
+ <source>Expand Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Expand All</source>
+ <translation type="unfinished">Rozwiń wszystko</translation>
+ </message>
+ <message>
+ <source>Collapse All</source>
+ <translation type="unfinished">Zwiń wszystko</translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation type="unfinished">Kopiuj</translation>
+ </message>
+ <message>
+ <source>All Visible Items</source>
+ <translation type="unfinished">Wszystkie widoczne pozycje</translation>
+ </message>
+ <message>
+ <source>All Visible Selected Tree Items</source>
+ <translation type="unfinished">Wszystkie widoczne pozycje wybranego poddrzewa</translation>
+ </message>
+ <message>
+ <source>Desription</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Name</source>
+ <translation type="unfinished">Nazwa pola</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation type="unfinished">Wartość</translation>
+ </message>
+ <message>
+ <source>As Filter</source>
+ <translation type="unfinished">Jako filtr</translation>
+ </message>
+ <message>
+ <source>Wiki Protocol Page</source>
+ <translation type="unfinished">Strona Wiki Protokołów</translation>
+ </message>
+ <message>
+ <source>Filter Field Reference</source>
+ <translation type="unfinished">Odwołania filtru pola</translation>
+ </message>
+ <message>
+ <source>Wiki Page for %1</source>
+ <translation type="unfinished">Strona Wiki dla %1</translation>
+ </message>
+ <message>
+ <source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
+ <translation type="unfinished">&lt;p&gt;Strona Wiki Wiresharka jest zarządzania przez społeczność.&lt;/p&gt;&lt;p&gt;Strona którą chcesz wczytać może być wspaniała, niekompletna, błędna lub nie istnieć.&lt;/p&gt;&lt;p&gt;Kontynuować wczytywanie strony Wiki?&lt;/p&gt;</translation>
+ </message>
+ <message>
<source>Colorize with Filter</source>
<translation>Koloruj z filtrem</translation>
</message>
@@ -12857,6 +12999,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Zaznacz wszystkie połączenia</translation>
</message>
<message>
+ <source>Display time as time of day</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy as CSV</source>
<translation>Kopiuj jako CSV</translation>
</message>
diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts
index 95f6459a2a..8e16c28bbf 100644
--- a/ui/qt/wireshark_ru.ts
+++ b/ui/qt/wireshark_ru.ts
@@ -2495,8 +2495,9 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Справка для extcap-интерфейса %1 не найдена. Указанный файл: %2</translation>
</message>
<message>
- <source>Save parameter on capture start</source>
- <translation>Сохранить параметр при старте захвата</translation>
+ <source>Save parameter(s) on capture start</source>
+ <oldsource>Save parameter on capture start</oldsource>
+ <translation type="unfinished">Сохранить параметр при старте захвата</translation>
</message>
</context>
<context>
@@ -4273,6 +4274,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>External capture interfaces disabled.</source>
<translation>Внешние интерфейсы захвата отключены. </translation>
</message>
+ <message>
+ <source>Start capture</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InterfaceSortFilterModel</name>
@@ -5706,10 +5711,26 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Импорт</translation>
</message>
<message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Export</source>
<translation type="unfinished">Экспорт</translation>
</message>
<message>
+ <source>selected personal profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Новый</translation>
@@ -5753,13 +5774,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<oldsource>No expert info</oldsource>
<translation>Нет информации эксперта</translation>
</message>
- <message>
- <source>, 1 byte</source>
- <translation>, 1 байт</translation>
+ <message numerus="yes">
+ <source>%Ln byte(s)</source>
+ <oldsource>, 1 byte</oldsource>
+ <translation type="unfinished">
+ <numerusform>, 1 байт</numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>, %1 bytes</source>
- <translation>, %1 байты</translation>
+ <translation type="vanished">, %1 байты</translation>
</message>
<message>
<source>Byte %1</source>
@@ -8567,7 +8593,8 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileDialog</name>
<message>
- <source>Search for profile ...</source>
+ <source>Search for profile …</source>
+ <oldsource>Search for profile ...</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8575,9 +8602,13 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Создать новый профиль, используя настройки по умолчанию.</translation>
</message>
<message>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove this profile. System provided profiles cannot be removed. The default profile will be resetted upon deletion.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Remove this profile. System provided profiles cannot be removed.</source>
<oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource>
- <translation>Удалить этот профиль. Системные профили не могут быть удалены.</translation>
+ <translation type="vanished">Удалить этот профиль. Системные профили не могут быть удалены.</translation>
</message>
<message>
<source>Copy this profile.</source>
@@ -8598,43 +8629,51 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Экспорт</translation>
</message>
<message>
- <source>All Profiles</source>
+ <source>An import of profiles is not allowed, while changes are pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>New profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>System profiles</source>
+ <source>Profile Error</source>
+ <translation>Ошибка Профиля</translation>
+ </message>
+ <message>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending.</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>New profile</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>Ошибка Профиля</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Exporting profiles</source>
+ <source>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for export</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for export</source>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <source>%Ln profile(s) have been exported</source>
+ <source>%Ln selected personal profile(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
@@ -8642,11 +8681,39 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</translation>
</message>
<message>
- <source>An error has occured while exporting profiles</source>
+ <source>all personal profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>An import is pending to be saved. Additional imports are not allowed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished">Ошибка</translation>
+ </message>
+ <message numerus="yes">
+ <source>%Ln profile(s) exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>An error has occurred while exporting profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>No profiles found for import in %1</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
@@ -8666,18 +8733,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</translation>
</message>
<message>
- <source>Select directory for import</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Zip File (*.zip)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>No profiles found for import in %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Importing profiles</source>
<translation type="unfinished"></translation>
</message>
@@ -8685,11 +8740,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileModel</name>
<message>
- <source>User</source>
+ <source>Resetting to default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Resetting to default</source>
+ <source>Imported profile</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8705,6 +8760,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>renamed to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>deleted</source>
<translation type="unfinished"></translation>
</message>
@@ -8722,6 +8781,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can&apos;t delete profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -8738,10 +8801,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">По умолчанию</translation>
</message>
<message>
- <source>System</source>
- <translation type="unfinished">Системный</translation>
- </message>
- <message>
<source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
@@ -8750,6 +8809,14 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Global</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>A profile already exists with this name.</source>
<translation type="unfinished"></translation>
</message>
@@ -8763,6 +8830,21 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ProfileSortModel</name>
+ <message>
+ <source>All profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Global profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ProgressFrame</name>
<message>
<source>Frame</source>
@@ -8776,6 +8858,66 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Подробная информация о пакете</translation>
</message>
<message>
+ <source>Expand Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse Subtrees</source>
+ <translation type="unfinished">Свернуть Подчинённые Деревья</translation>
+ </message>
+ <message>
+ <source>Expand All</source>
+ <translation type="unfinished">Развернуть Всё</translation>
+ </message>
+ <message>
+ <source>Collapse All</source>
+ <translation type="unfinished">Свернуть Всё</translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation type="unfinished">Копировать</translation>
+ </message>
+ <message>
+ <source>All Visible Items</source>
+ <translation type="unfinished">Все Видимые Пункты</translation>
+ </message>
+ <message>
+ <source>All Visible Selected Tree Items</source>
+ <translation type="unfinished">Все Видимые Пункты Выбранного Дерева</translation>
+ </message>
+ <message>
+ <source>Desription</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Name</source>
+ <translation type="unfinished">Имя Поля</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation type="unfinished">Значение</translation>
+ </message>
+ <message>
+ <source>As Filter</source>
+ <translation type="unfinished">Как Фильтр</translation>
+ </message>
+ <message>
+ <source>Wiki Protocol Page</source>
+ <translation type="unfinished">Wiki-страница Протокола</translation>
+ </message>
+ <message>
+ <source>Filter Field Reference</source>
+ <translation type="unfinished">Справка по Полю Фильтра</translation>
+ </message>
+ <message>
+ <source>Wiki Page for %1</source>
+ <translation type="unfinished">Страница Wiki для %1</translation>
+ </message>
+ <message>
+ <source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
+ <translation type="unfinished">&lt;p&gt;Wireshark Wiki поддерживается сообществом.&lt;/p&gt;&lt;p&gt;Страница, которую Вы пытаетесь загрузить, может быть качественной, незаконченной, ошибочной или несуществующей.&lt;/p&gt;&lt;p&gt;Продолжить работу с wiki?&lt;/p&gt;</translation>
+ </message>
+ <message>
<source>Colorize with Filter</source>
<translation>Придать Цвета с Помощью Фильтра</translation>
</message>
@@ -12873,6 +13015,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Выбрать все звонки</translation>
</message>
<message>
+ <source>Display time as time of day</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy as CSV</source>
<translation>Копировать как CSV</translation>
</message>
diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts
index 31a3c0223a..08e3df7629 100644
--- a/ui/qt/wireshark_sv.ts
+++ b/ui/qt/wireshark_sv.ts
@@ -2488,8 +2488,9 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Hjälpen för extcap-gränssnittet %1 kan inte hittas. Angiven fil: %2</translation>
</message>
<message>
- <source>Save parameter on capture start</source>
- <translation>Spara parametrarna vid fångststart</translation>
+ <source>Save parameter(s) on capture start</source>
+ <oldsource>Save parameter on capture start</oldsource>
+ <translation type="unfinished">Spara parametrarna vid fångststart</translation>
</message>
</context>
<context>
@@ -4259,6 +4260,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<source>External capture interfaces disabled.</source>
<translation>Externa fångstgränssnitt avaktiverade.</translation>
</message>
+ <message>
+ <source>Start capture</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InterfaceSortFilterModel</name>
@@ -5690,10 +5695,26 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation type="unfinished">Importera</translation>
</message>
<message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Export</source>
<translation type="unfinished">Exportera</translation>
</message>
<message>
+ <source>selected personal profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Ny</translation>
@@ -5737,13 +5758,17 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<oldsource>No expert info</oldsource>
<translation>Ingen expertinformation</translation>
</message>
- <message>
- <source>, 1 byte</source>
- <translation>, 1 byte</translation>
+ <message numerus="yes">
+ <source>%Ln byte(s)</source>
+ <oldsource>, 1 byte</oldsource>
+ <translation type="unfinished">
+ <numerusform>, 1 byte</numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>, %1 bytes</source>
- <translation>, %1 byte</translation>
+ <translation type="vanished">, %1 byte</translation>
</message>
<message>
<source>Byte %1</source>
@@ -8548,7 +8573,8 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<context>
<name>ProfileDialog</name>
<message>
- <source>Search for profile ...</source>
+ <source>Search for profile …</source>
+ <oldsource>Search for profile ...</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8556,9 +8582,13 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Skapa en ny profil baserat på standardinställningarna.</translation>
</message>
<message>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove this profile. System provided profiles cannot be removed. The default profile will be resetted upon deletion.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Remove this profile. System provided profiles cannot be removed.</source>
<oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource>
- <translation>Ta bort denna profil. Profiler som kommer med systemet kan inte tas bort.</translation>
+ <translation type="vanished">Ta bort denna profil. Profiler som kommer med systemet kan inte tas bort.</translation>
</message>
<message>
<source>Copy this profile.</source>
@@ -8579,82 +8609,105 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation type="unfinished">Exportera</translation>
</message>
<message>
- <source>All Profiles</source>
+ <source>An import of profiles is not allowed, while changes are pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>New profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>System profiles</source>
+ <source>Profile Error</source>
+ <translation>Profilfel</translation>
+ </message>
+ <message>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending.</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>New profile</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>Profilfel</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Exporting profiles</source>
+ <source>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for export</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for export</source>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <source>%Ln profile(s) have been exported</source>
+ <source>%Ln selected personal profile(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
- <source>An error has occured while exporting profiles</source>
+ <source>all personal profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>An import is pending to be saved. Additional imports are not allowed.</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>%Ln profile(s) imported</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished">Fel</translation>
</message>
<message numerus="yes">
- <source>, %Ln profile(s) skipped</source>
+ <source>%Ln profile(s) exported</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
- <source>Select directory for import</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Zip File (*.zip)</source>
+ <source>An error has occurred while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No profiles found for import in %1</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>%Ln profile(s) imported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>, %Ln profile(s) skipped</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
<source>Importing profiles</source>
<translation type="unfinished"></translation>
@@ -8663,11 +8716,11 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<context>
<name>ProfileModel</name>
<message>
- <source>User</source>
+ <source>Resetting to default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Resetting to default</source>
+ <source>Imported profile</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8683,6 +8736,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation type="unfinished"></translation>
</message>
<message>
+ <source>renamed to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>deleted</source>
<translation type="unfinished"></translation>
</message>
@@ -8700,6 +8757,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can&apos;t delete profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -8716,10 +8777,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation type="unfinished">Standard</translation>
</message>
<message>
- <source>System</source>
- <translation type="unfinished">System</translation>
- </message>
- <message>
<source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
@@ -8728,6 +8785,14 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Global</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>A profile already exists with this name.</source>
<translation type="unfinished"></translation>
</message>
@@ -8741,6 +8806,21 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
</message>
</context>
<context>
+ <name>ProfileSortModel</name>
+ <message>
+ <source>All profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Global profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ProgressFrame</name>
<message>
<source>Frame</source>
@@ -8754,6 +8834,66 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Paketdetaljer</translation>
</message>
<message>
+ <source>Expand Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse Subtrees</source>
+ <translation type="unfinished">Fäll ihop underträd</translation>
+ </message>
+ <message>
+ <source>Expand All</source>
+ <translation type="unfinished">Fäll ut alla</translation>
+ </message>
+ <message>
+ <source>Collapse All</source>
+ <translation type="unfinished">Fäll ihop alla</translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation type="unfinished">Kopiera</translation>
+ </message>
+ <message>
+ <source>All Visible Items</source>
+ <translation type="unfinished">Alla synliga objekt</translation>
+ </message>
+ <message>
+ <source>All Visible Selected Tree Items</source>
+ <translation type="unfinished">Alla synliga valda trädobjekt</translation>
+ </message>
+ <message>
+ <source>Desription</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Name</source>
+ <translation type="unfinished">Fältnamn</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation type="unfinished">Värde</translation>
+ </message>
+ <message>
+ <source>As Filter</source>
+ <translation type="unfinished">Som filter</translation>
+ </message>
+ <message>
+ <source>Wiki Protocol Page</source>
+ <translation type="unfinished">Wiki-protokollsida</translation>
+ </message>
+ <message>
+ <source>Filter Field Reference</source>
+ <translation type="unfinished">Filterfältreferens</translation>
+ </message>
+ <message>
+ <source>Wiki Page for %1</source>
+ <translation type="unfinished">Wiki-sida för %1</translation>
+ </message>
+ <message>
+ <source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
+ <translation type="unfinished">&lt;p&gt;Wireshark-wikin underhålls av gemenskapen.&lt;/p&gt;&lt;p&gt;Sidan du står i begrepp att läsa in kan vara underbar, ofullständig, felaktig, eller saknas.&lt;/p&gt;&lt;p&gt;Gå vidare till wikin?&lt;/p&gt;</translation>
+ </message>
+ <message>
<source>Colorize with Filter</source>
<translation>Färglägg med filter</translation>
</message>
@@ -12847,6 +12987,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Välj alla anrop</translation>
</message>
<message>
+ <source>Display time as time of day</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy as CSV</source>
<translation>Kopiera som CSV</translation>
</message>
diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts
index 2967d28a0f..d16cd6ce22 100644
--- a/ui/qt/wireshark_uk.ts
+++ b/ui/qt/wireshark_uk.ts
@@ -2466,7 +2466,8 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save parameter on capture start</source>
+ <source>Save parameter(s) on capture start</source>
+ <oldsource>Save parameter on capture start</oldsource>
<translation type="unfinished"></translation>
</message>
</context>
@@ -4215,6 +4216,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>External capture interfaces disabled.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Start capture</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InterfaceSortFilterModel</name>
@@ -5623,10 +5628,26 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Імпортувати</translation>
</message>
<message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Export</source>
<translation type="unfinished">Експортувати</translation>
</message>
<message>
+ <source>selected personal profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation type="unfinished"></translation>
@@ -5670,13 +5691,14 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<oldsource>No expert info</oldsource>
<translation>Експертна інформація відсутня</translation>
</message>
- <message>
- <source>, 1 byte</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>, %1 bytes</source>
- <translation type="unfinished"></translation>
+ <message numerus="yes">
+ <source>%Ln byte(s)</source>
+ <oldsource>, 1 byte</oldsource>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>Byte %1</source>
@@ -8473,7 +8495,8 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileDialog</name>
<message>
- <source>Search for profile ...</source>
+ <source>Search for profile …</source>
+ <oldsource>Search for profile ...</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8481,8 +8504,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Створити новий профіль, використовуючи типові налаштування.</translation>
</message>
<message>
- <source>Remove this profile. System provided profiles cannot be removed.</source>
- <oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove this profile. System provided profiles cannot be removed. The default profile will be resetted upon deletion.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8504,43 +8526,51 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Експортувати</translation>
</message>
<message>
- <source>All Profiles</source>
+ <source>An import of profiles is not allowed, while changes are pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>New profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>System profiles</source>
+ <source>Profile Error</source>
+ <translation>Помилка Профілю</translation>
+ </message>
+ <message>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending.</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>New profile</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>Помилка Профілю</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Exporting profiles</source>
+ <source>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for export</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for export</source>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <source>%Ln profile(s) have been exported</source>
+ <source>%Ln selected personal profile(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
@@ -8548,11 +8578,39 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</translation>
</message>
<message>
- <source>An error has occured while exporting profiles</source>
+ <source>all personal profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>An import is pending to be saved. Additional imports are not allowed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished">Помилка</translation>
+ </message>
+ <message numerus="yes">
+ <source>%Ln profile(s) exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>An error has occurred while exporting profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>No profiles found for import in %1</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
@@ -8572,18 +8630,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</translation>
</message>
<message>
- <source>Select directory for import</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Zip File (*.zip)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>No profiles found for import in %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Importing profiles</source>
<translation type="unfinished"></translation>
</message>
@@ -8591,11 +8637,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileModel</name>
<message>
- <source>User</source>
+ <source>Resetting to default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Resetting to default</source>
+ <source>Imported profile</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8611,6 +8657,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>renamed to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>deleted</source>
<translation type="unfinished"></translation>
</message>
@@ -8628,6 +8678,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can&apos;t delete profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -8644,15 +8698,19 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>System</source>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from: </source>
+ <source>This is a system provided profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>Global</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8669,6 +8727,21 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ProfileSortModel</name>
+ <message>
+ <source>All profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Global profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ProgressFrame</name>
<message>
<source>Frame</source>
@@ -8682,6 +8755,66 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Складові пакету</translation>
</message>
<message>
+ <source>Expand Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Expand All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation type="unfinished">Скопіювати</translation>
+ </message>
+ <message>
+ <source>All Visible Items</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All Visible Selected Tree Items</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Desription</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Name</source>
+ <translation type="unfinished">Назва Поля</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation type="unfinished">Значення</translation>
+ </message>
+ <message>
+ <source>As Filter</source>
+ <translation type="unfinished">Як Фільтр</translation>
+ </message>
+ <message>
+ <source>Wiki Protocol Page</source>
+ <translation type="unfinished">Вікі-Сторінка Протоколів</translation>
+ </message>
+ <message>
+ <source>Filter Field Reference</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Wiki Page for %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Colorize with Filter</source>
<translation type="unfinished"></translation>
</message>
@@ -12682,6 +12815,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Display time as time of day</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy as CSV</source>
<translation type="unfinished">Скопіювати як CSV</translation>
</message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 19a74570b7..2e7244cc40 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -2476,8 +2476,9 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>无法找到 extcap接口 %1 的帮助。文件:%2</translation>
</message>
<message>
- <source>Save parameter on capture start</source>
- <translation>捕获开始时保存参数</translation>
+ <source>Save parameter(s) on capture start</source>
+ <oldsource>Save parameter on capture start</oldsource>
+ <translation type="unfinished">捕获开始时保存参数</translation>
</message>
</context>
<context>
@@ -4240,6 +4241,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>External capture interfaces disabled.</source>
<translation>已禁用外部捕获接口。</translation>
</message>
+ <message>
+ <source>Start capture</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InterfaceSortFilterModel</name>
@@ -5669,10 +5674,26 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">导入</translation>
</message>
<message>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Export</source>
<translation type="unfinished">导出</translation>
</message>
<message>
+ <source>selected personal profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>all personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>新建</translation>
@@ -5716,13 +5737,16 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<oldsource>No expert info</oldsource>
<translation>无专家信息</translation>
</message>
- <message>
- <source>, 1 byte</source>
- <translation>, 1 字节</translation>
+ <message numerus="yes">
+ <source>%Ln byte(s)</source>
+ <oldsource>, 1 byte</oldsource>
+ <translation type="unfinished">
+ <numerusform>, 1 字节</numerusform>
+ </translation>
</message>
<message>
<source>, %1 bytes</source>
- <translation>, %1 字节</translation>
+ <translation type="vanished">, %1 字节</translation>
</message>
<message>
<source>Byte %1</source>
@@ -8523,7 +8547,8 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileDialog</name>
<message>
- <source>Search for profile ...</source>
+ <source>Search for profile …</source>
+ <oldsource>Search for profile ...</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8531,9 +8556,13 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>用默认设置创建新的配置文件。</translation>
</message>
<message>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove this profile. System provided profiles cannot be removed. The default profile will be resetted upon deletion.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Remove this profile. System provided profiles cannot be removed.</source>
<oldsource>Remove this profile. The Default profile and system provided profiles cannot be removed.</oldsource>
- <translation>移除此配置文件。默认配置和系统提供的配置不能移除。</translation>
+ <translation type="vanished">移除此配置文件。默认配置和系统提供的配置不能移除。</translation>
</message>
<message>
<source>Copy this profile.</source>
@@ -8554,79 +8583,101 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">导出</translation>
</message>
<message>
- <source>All Profiles</source>
+ <source>An import of profiles is not allowed, while changes are pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>New profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>System profiles</source>
+ <source>Profile Error</source>
+ <translation>配置文件错误</translation>
+ </message>
+ <message>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending.</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>New profile</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>配置文件错误</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Exporting profiles</source>
+ <source>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for export</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for export</source>
+ <source>from zip file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>from directory</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <source>%Ln profile(s) have been exported</source>
+ <source>%Ln selected personal profile(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <source>An error has occured while exporting profiles</source>
+ <source>all personal profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>An import is pending to be saved. Additional imports are not allowed.</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <source>%Ln profile(s) imported</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- </translation>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished">错误</translation>
</message>
<message numerus="yes">
- <source>, %Ln profile(s) skipped</source>
+ <source>%Ln profile(s) exported</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <source>Select directory for import</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Zip File (*.zip)</source>
+ <source>An error has occurred while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No profiles found for import in %1</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>%Ln profile(s) imported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>, %Ln profile(s) skipped</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
<source>Importing profiles</source>
<translation type="unfinished"></translation>
@@ -8635,11 +8686,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileModel</name>
<message>
- <source>User</source>
+ <source>Resetting to default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Resetting to default</source>
+ <source>Imported profile</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8655,6 +8706,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>renamed to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>deleted</source>
<translation type="unfinished"></translation>
</message>
@@ -8672,6 +8727,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can&apos;t delete profile directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -8688,10 +8747,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">默认</translation>
</message>
<message>
- <source>System</source>
- <translation type="unfinished">系统</translation>
- </message>
- <message>
<source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
@@ -8700,6 +8755,14 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Global</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>A profile already exists with this name.</source>
<translation type="unfinished"></translation>
</message>
@@ -8713,6 +8776,21 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>ProfileSortModel</name>
+ <message>
+ <source>All profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Global profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ProgressFrame</name>
<message>
<source>Frame</source>
@@ -8726,6 +8804,66 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>分组详情</translation>
</message>
<message>
+ <source>Expand Subtrees</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Collapse Subtrees</source>
+ <translation type="unfinished">折叠子树</translation>
+ </message>
+ <message>
+ <source>Expand All</source>
+ <translation type="unfinished">全部展开</translation>
+ </message>
+ <message>
+ <source>Collapse All</source>
+ <translation type="unfinished">全部折叠</translation>
+ </message>
+ <message>
+ <source>Copy</source>
+ <translation type="unfinished">复制</translation>
+ </message>
+ <message>
+ <source>All Visible Items</source>
+ <translation type="unfinished">所有可见项目</translation>
+ </message>
+ <message>
+ <source>All Visible Selected Tree Items</source>
+ <translation type="unfinished">选中树的所有可见项目</translation>
+ </message>
+ <message>
+ <source>Desription</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Field Name</source>
+ <translation type="unfinished">字段名称</translation>
+ </message>
+ <message>
+ <source>Value</source>
+ <translation type="unfinished">值</translation>
+ </message>
+ <message>
+ <source>As Filter</source>
+ <translation type="unfinished">作为过滤器</translation>
+ </message>
+ <message>
+ <source>Wiki Protocol Page</source>
+ <translation type="unfinished">Wiki 协议页面</translation>
+ </message>
+ <message>
+ <source>Filter Field Reference</source>
+ <translation type="unfinished">过滤器字段参考</translation>
+ </message>
+ <message>
+ <source>Wiki Page for %1</source>
+ <translation type="unfinished">%1 的 Wiki 页面</translation>
+ </message>
+ <message>
+ <source>&lt;p&gt;The Wireshark Wiki is maintained by the community.&lt;/p&gt;&lt;p&gt;The page you are about to load might be wonderful, incomplete, wrong, or nonexistent.&lt;/p&gt;&lt;p&gt;Proceed to the wiki?&lt;/p&gt;</source>
+ <translation type="unfinished">&lt;p&gt;Wireshark Wiki 由社区进行维护。&lt;/p&gt;&lt;p&gt;您即将加载的页面可能是良好的、不完整的、有错误的,甚至不存在的。&lt;/p&gt;&lt;p&gt;继续访问该 Wiki?&lt;/p&gt;</translation>
+ </message>
+ <message>
<source>Colorize with Filter</source>
<translation>用过滤器着色</translation>
</message>
@@ -12811,6 +12949,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>选择所有呼叫</translation>
</message>
<message>
+ <source>Display time as time of day</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Copy as CSV</source>
<translation>复制为 CSV</translation>
</message>