aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-07-21 08:23:24 +0000
committerGerald Combs <gerald@wireshark.org>2019-07-21 08:23:28 +0000
commit795b8cff4adb3985a473d6ef8389035cb4a10006 (patch)
tree7b35499e7768c605a1e6d3a1fe2ccba555bdd3bd
parentf5280dba25f8fc5c184a36987be5a6c6503df85c (diff)
[Automatic update for 2019-07-21]
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ia6332d213cbf2fdf0b52730fddadb7599c630f3a Reviewed-on: https://code.wireshark.org/review/34035 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r--AUTHORS1
-rw-r--r--NEWS6
-rw-r--r--enterprises.tsv41
-rw-r--r--manuf49
-rw-r--r--ui/qt/wireshark_de.ts122
-rw-r--r--ui/qt/wireshark_en.ts54
-rw-r--r--ui/qt/wireshark_fr.ts74
-rw-r--r--ui/qt/wireshark_it.ts122
-rw-r--r--ui/qt/wireshark_ja_JP.ts74
-rw-r--r--ui/qt/wireshark_pl.ts92
-rw-r--r--ui/qt/wireshark_ru.ts98
-rw-r--r--ui/qt/wireshark_sv.ts98
-rw-r--r--ui/qt/wireshark_uk.ts54
-rw-r--r--ui/qt/wireshark_zh_CN.ts92
14 files changed, 565 insertions, 412 deletions
diff --git a/AUTHORS b/AUTHORS
index b212846fb5..aab10701c0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4618,6 +4618,7 @@ Tom Haynes <loghyr[AT]primarydata.com>
Tomas Konecny <tomas.konecny[AT]eldis.cz>
Tomas Kukosa <tomas.kukosa[AT]ixperta.com>
Trond Myklebust <trond.myklebust[AT]primarydata.com>
+Trond Norbye <trond[AT]couchbase.com>
Ulf <ulf33286[AT]gmail.com>
Uli Schlachter <psychon[AT]znc.in>
Umberto Corponi <umberto.corponi[AT]athonet.com>
diff --git a/NEWS b/NEWS
index c369532d7a..9f0e36c2bd 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,8 @@ Wireshark 3.1.0 Release Notes
been added. It can be accessed through the "-z credentials"
option in tshark or from the "tools" menu in Wireshark.
+ • Editcap can now split files on floating point intervals.
+
New Protocol Support
CableLabs Layer-3 Protocol IEEE EtherType 0xb4e3 (CL3), Distributed
@@ -89,7 +91,7 @@ Wireshark 3.1.0 Release Notes
A complete FAQ is available on the Wireshark web site[9].
- Last updated 2019-07-14 08:08:24 UTC
+ Last updated 2019-07-21 08:08:38 UTC
References
@@ -100,5 +102,5 @@ Wireshark 3.1.0 Release Notes
5. https://ask.wireshark.org/
6. https://www.wireshark.org/lists/
7. https://bugs.wireshark.org/
- 8. http://www.wiresharktraining.com/
+ 8. https://www.wiresharktraining.com/
9. https://www.wireshark.org/faq.html
diff --git a/enterprises.tsv b/enterprises.tsv
index 04008b1178..1870f0c073 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-13)
+# (last updated 2019-07-20)
0 Reserved
1 NxNetworks
@@ -53931,7 +53931,6 @@
54120 visionvera information technology Co., Ltd.
54121 Deadlogic Desenvolvimento e Tecnologia LTDA
54122 fwgx
-54123 Ravnik IT
54124 MSG Mechatronic Systems GmbH
54125 Kreativität trifft Technik e.V.
54126 Hitachi Advanced Systems Corporation.
@@ -54081,3 +54080,41 @@
54270 Nanjing e-Quantum Information Technology Co., Ltd.
54271 Lulin Systems Co., Ltd.
54272 Encurest
+54273 LLC "Imlight-Showtechnic"
+54274 ITEres GmbH
+54275 Surface Generation Ltd
+54276 DWF LLP
+54277 Jan de Rijk
+54278 Silverengine GmbH
+54279 Nelson Tran
+54280 PC Informatica
+54281 VARTOS
+54282 Fuuzio Group
+54283 Max Kessler
+54284 iD Corporation.
+54285 ECNS.EPC.HCI.CN
+54286 Wagner Group
+54287 Blue Box Group Srl
+54288 Aristotle Space and Aeronautics Team
+54289 Microdigital Argentina
+54290 RMACD.COM
+54291 Rebecca Pruim
+54292 CareFlite
+54293 8ZERO2 Consultants
+54294 Magellan Robotech
+54295 Network Treinamento e Capacitação
+54296 Waagner-Biro Bridge
+54297 SHARD CAPITAL PARTNERS LLP
+54298 Private citizen
+54299 Lawrenceburg Municipal Utilities
+54300 The Zanzibar Company Ltd.
+54301 Andromeda Research, Inc
+54302 EverFocus Electronics Corp.
+54303 ADB Safegate Austria GmbH.
+54304 Permian Women's Center, P.A.
+54305 iMed Software Inc.
+54306 Jackson River
+54307 ABN AMRO Bank N.V.
+54308 Binarno s.p.
+54309 Camrize
+54310 AG Rechnersicherheit (TU-Berlin)
diff --git a/manuf b/manuf
index 7033c408ef..1e1259a049 100644
--- a/manuf
+++ b/manuf
@@ -45,23 +45,23 @@
# http://standards-oui.ieee.org/cid/cid.csv:
# Content-Length: 7621
-# Last-Modified: Sun, 14 Jul 2019 08:00:32 GMT
+# Last-Modified: Sun, 21 Jul 2019 08:00:20 GMT
# http://standards-oui.ieee.org/iab/iab.csv:
# Content-Length: 381248
-# Last-Modified: Sun, 14 Jul 2019 08:01:32 GMT
+# Last-Modified: Sun, 21 Jul 2019 08:01:20 GMT
# http://standards-oui.ieee.org/oui/oui.csv:
-# Content-Length: 2386547
-# Last-Modified: Sun, 14 Jul 2019 08:03:57 GMT
+# Content-Length: 2388285
+# Last-Modified: Sun, 21 Jul 2019 08:03:41 GMT
# http://standards-oui.ieee.org/oui28/mam.csv:
-# Content-Length: 283910
-# Last-Modified: Sun, 14 Jul 2019 08:02:04 GMT
+# Content-Length: 284447
+# Last-Modified: Sun, 21 Jul 2019 08:01:48 GMT
# http://standards-oui.ieee.org/oui36/oui36.csv:
-# Content-Length: 295998
-# Last-Modified: Sun, 14 Jul 2019 08:03:28 GMT
+# Content-Length: 296927
+# Last-Modified: Sun, 21 Jul 2019 08:03:12 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
@@ -18356,7 +18356,13 @@
10:DA:43 Netgear
10:DC:4A Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
10:DC:B6 IeeeRegi IEEE Registration Authority
+10:DC:B6:00:00:00/28 Private
10:DC:B6:30:00:00/28 Hanacns
+10:DC:B6:40:00:00/28 Annapurn Annapurna labs
+10:DC:B6:A0:00:00/28 Pickerin Pickering Interfaces Ltd
+10:DC:B6:B0:00:00/28 EyeballF Eyeball Fintech Company
+10:DC:B6:C0:00:00/28 BbposInt BBPOS International Limited
+10:DC:B6:D0:00:00/28 Leolabs
10:DD:B1 Apple Apple, Inc.
10:DD:F4 MaxwayEl Maxway Electronics CO.,LTD
10:DE:E4 Automati automationNEXT GmbH
@@ -18434,6 +18440,7 @@
14:22:33 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
14:22:DB Eero eero inc.
14:23:D7 Eutronix Eutronix Co., Ltd.
+14:24:75 4Dreplay 4DReplay, Inc
14:28:82 MidicomE Midicom Electronics Co.Ltd
14:29:71 NemoaEle Nemoa Electronics (Hk) Co. Ltd
14:2B:D2 Armtel Armtel Ltd.
@@ -19100,6 +19107,7 @@
1C:98:EC HewlettP Hewlett Packard Enterprise
1C:99:4C MurataMa Murata Manufacturing Co., Ltd.
1C:9C:26 ZoovelTe Zoovel Technologies
+1C:9C:8C JuniperN Juniper Networks
1C:9D:3E Integrat Integrated Device Technology (Malaysia) Sdn. Bhd.
1C:9E:46 Apple Apple, Inc.
1C:9E:CB BeijingN Beijing Nari Smartchip Microelectronics Company Limited
@@ -19634,6 +19642,7 @@
24:BE:18 Dadoutek Dadoutek Company Limited
24:BF:74 Private
24:C0:B3 Rsf
+24:C1:7A BeijingI Beijing Iactive Network Co.,Ltd
24:C1:BD CrrcDali Crrc Dalian R&D Co.,Ltd.
24:C3:F9 Securita Securitas Direct AB
24:C4:2F PhilipsL Philips Lifeline
@@ -20453,6 +20462,7 @@
30:8C:FB Dropcam
30:8D:99 HewlettP Hewlett Packard
30:90:AB Apple Apple, Inc.
+30:91:76 Skyworth Skyworth Digital Technology(Shenzhen) Co.,Ltd
30:91:8F Technico Technicolor
30:92:F6 Shanghai Shanghai Sunmon Communication Technogy Co.,Ltd
30:94:35 VivoMobi vivo Mobile Communication Co., Ltd.
@@ -20736,6 +20746,7 @@
34:B2:0A HuaweiDe Huawei Device Co., Ltd.
34:B3:54 HuaweiTe Huawei Technologies Co.,Ltd
34:B5:71 Plds
+34:B5:A3 CigShang Cig Shanghai Co Ltd
34:B7:FD Guangzho Guangzhou Younghead Electronic Technology Co.,Ltd
34:BA:38 PalMohan Pal Mohan Electronics Pvt Ltd
34:BA:51 Se-KureC Se-Kure Controls, Inc.
@@ -20825,6 +20836,7 @@
34:E9:11 VivoMobi vivo Mobile Communication Co., Ltd.
34:EA:34 Hangzhou HangZhou Gubei Electronics Technology Co.,Ltd
34:ED:0B Shanghai Shanghai XZ-COM.CO.,Ltd.
+34:ED:1B Cisco Cisco Systems, Inc
34:EF:44 2Wire 2Wire Inc
34:EF:8B NttCommu NTT Communications Corporation
34:F0:CA Shenzhen Shenzhen Linghangyuan Digital Technology Co.,Ltd.
@@ -22811,6 +22823,7 @@
4C:7F:62 Nokia Nokia Corporation
4C:80:4F Armstron Armstrong Monitoring Corp
4C:80:93 IntelCor Intel Corporate
+4C:80:BA WuhanTia Wuhan Tianyu Information Industry Co., Ltd.
4C:81:20 TaicangT Taicang T&W Electronics
4C:82:CF DishTech Dish Technologies Corp
4C:83:DE CiscoSpv Cisco SPVTG
@@ -23844,6 +23857,7 @@
5C:CB:CA FujianSt Fujian Star-Net Communication Co.,Ltd
5C:CC:A0 Gridwiz Gridwiz Inc.
5C:CC:FF Techrout Techroutes Network Pvt Ltd
+5C:CD:5B IntelCor Intel Corporate
5C:CD:7C MeizuTec MEIZU Technology Co.,Ltd.
5C:CE:AD Cdyne CDYNE Corporation
5C:CF:7F Espressi Espressif Inc.
@@ -24326,6 +24340,7 @@
64:C6:67 Barnes&N Barnes&Noble
64:C6:AF AxerraNe AXERRA Networks Ltd
64:C7:53 Apple Apple, Inc.
+64:C9:01 Inventec INVENTEC Corporation
64:C9:44 LarkTech LARK Technologies, Inc
64:CB:5D Sia"Tele SIA "TeleSet"
64:CB:9F TecnoMob Tecno Mobile Limited
@@ -24419,6 +24434,7 @@
68:1F:D8 SiemensI Siemens Industry, Inc.
68:23:4B NihonDen Nihon Dengyo Kousaku
68:26:2A SichuanT Sichuan Tianyi Comheart Telecomco., Ltd
+68:27:19 Microchi Microchip Technology Inc.
68:27:37 SamsungE Samsung Electronics Co.,Ltd
68:28:BA Dejai
68:28:F6 VubiqNet Vubiq Networks, Inc.
@@ -25434,6 +25450,7 @@
70:B3:D5:1E:B0:00/36 Xavant
70:B3:D5:1E:E0:00/36 Meggitt
70:B3:D5:1E:F0:00/36 Adtek
+70:B3:D5:1F:00:00/36 Harmonic Harmonic Design GmbH
70:B3:D5:1F:10:00/36 DiehlCon DIEHL Connectivity Solutions
70:B3:D5:1F:30:00/36 SmartEne Smart Energy Code Company Limited
70:B3:D5:1F:40:00/36 Hangzhou Hangzhou Woosiyuan Communication Co.,Ltd.
@@ -26017,6 +26034,7 @@
70:B3:D5:4E:10:00/36 GrupoEpe Grupo Epelsa S.L.
70:B3:D5:4E:50:00/36 VizaarIn viZaar industrial imaging AG
70:B3:D5:4E:70:00/36 DigitalD Digital Domain
+70:B3:D5:4E:80:00/36 CopiousI Copious Imaging LLC
70:B3:D5:4E:90:00/36 AdetecSa Adetec Sas
70:B3:D5:4E:A0:00/36 Vocality Vocality international T/A Cubic
70:B3:D5:4E:B0:00/36 Infosoft Infosoft Digital Design & Services Private Limited
@@ -26328,6 +26346,7 @@
70:B3:D5:68:D0:00/36 "Meta-Ch "Meta-chrom" Co. Ltd.
70:B3:D5:68:E0:00/36 CeaTechn CEA Technologies Pty Ltd
70:B3:D5:68:F0:00/36 PeekTraf Peek Traffic
+70:B3:D5:69:10:00/36 PeekTraf Peek Traffic
70:B3:D5:69:20:00/36 HosinInd Hosin Industrial Limited
70:B3:D5:69:30:00/36 AltronAS Altron, a.s.
70:B3:D5:69:40:00/36 Movither MoviTHERM
@@ -27051,6 +27070,7 @@
70:B3:D5:A3:50:00/36 SiconSrl Sicon srl
70:B3:D5:A3:60:00/36 BeijingD Beijing DamingWuzhou Science&Technology Co., Ltd.
70:B3:D5:A3:70:00/36 Mitsubis Mitsubishi Heavy Industries Thermal Systems, Ltd.
+70:B3:D5:A3:80:00/36 Aditec Aditec GmbH
70:B3:D5:A3:90:00/36 Spetsstr SPETSSTROY-SVYAZ Ltd
70:B3:D5:A3:A0:00/36 Epsoft EPSOFT Co., Ltd
70:B3:D5:A3:B0:00/36 GraceDes Grace Design/Lunatec LLC
@@ -27073,6 +27093,7 @@
70:B3:D5:A4:F0:00/36 WeltekTe Weltek Technologies Co. Ltd.
70:B3:D5:A5:00:00/36 Lecip Lecip Corporation
70:B3:D5:A5:10:00/36 RfCode RF Code
+70:B3:D5:A5:20:00/36 ApexStab APEX Stabilizations GmbH
70:B3:D5:A5:30:00/36 GsIndust GS Industrie-Elektronik GmbH
70:B3:D5:A5:40:00/36 Provedo
70:B3:D5:A5:50:00/36 EmbestTe Embest Technology Co., Ltd
@@ -27236,6 +27257,7 @@
70:B3:D5:B1:60:00/36 XiAnShen Xi'An Shenming Electron Technology Co.,Ltd
70:B3:D5:B1:70:00/36 Intesens
70:B3:D5:B1:80:00/36 AbbasAS Abbas, a.s.
+70:B3:D5:B1:90:00/36 BraydenA Brayden Automation Corp
70:B3:D5:B1:A0:00/36 Aaronia Aaronia AG
70:B3:D5:B1:D0:00/36 SafeletB Safelet BV
70:B3:D5:B1:E0:00/36 Fen Fen Systems Ltd
@@ -27312,6 +27334,7 @@
70:B3:D5:B8:00:00/36 Bighouse Bighouse.,Inc.
70:B3:D5:B8:10:00/36 InstroPr Instro Precision Limited
70:B3:D5:B8:20:00/36 LookoutP Lookout Portable Security
+70:B3:D5:B8:40:00/36 OooResea OOO Research and Production Center "Computer Technologies"
70:B3:D5:B8:50:00/36 Fenotech Fenotech Inc.
70:B3:D5:B8:80:00/36 Arp ARP Corporation
70:B3:D5:B8:90:00/36 Ida
@@ -27406,6 +27429,7 @@
70:B3:D5:BF:A0:00/36 NesaSrl Nesa Srl
70:B3:D5:BF:B0:00/36 Sensor42 Sensor 42
70:B3:D5:BF:C0:00/36 VishayNo Vishay Nobel AB
+70:B3:D5:BF:D0:00/36 Lumentum
70:B3:D5:BF:E0:00/36 AplexTec Aplex Technology Inc.
70:B3:D5:C0:00:00/36 BesoSpZO BESO sp. z o.o.
70:B3:D5:C0:10:00/36 Smartgua SmartGuard LLC
@@ -27861,6 +27885,7 @@
70:B3:D5:E5:70:00/36 Iradimed
70:B3:D5:E5:80:00/36 ThurlbyT Thurlby Thandar Instruments LTD
70:B3:D5:E5:90:00/36 Fracarro Fracarro srl
+70:B3:D5:E5:B0:00/36 ArgosyLa Argosy Labs Inc.
70:B3:D5:E5:D0:00/36 BoffinsT Boffins Technologies AB
70:B3:D5:E5:E0:00/36 Critical Critical Link LLC
70:B3:D5:E6:10:00/36 Adeli
@@ -27936,6 +27961,7 @@
70:B3:D5:EB:E0:00/36 SierraPa Sierra Pacific Innovations Corp
70:B3:D5:EC:10:00/36 XafaxNed Xafax Nederland bv
70:B3:D5:EC:30:00/36 VirtualC Virtual Control Systems Ltd
+70:B3:D5:EC:40:00/36 HmtTelem hmt telematik GmbH
70:B3:D5:EC:60:00/36 Esii
70:B3:D5:EC:70:00/36 Neoptix Neoptix Inc.
70:B3:D5:EC:80:00/36 VikoElek Viko Elektrik-Elektronik A.Ş.
@@ -28029,6 +28055,7 @@
70:B3:D5:F3:F0:00/36 Comtac comtac AG
70:B3:D5:F4:20:00/36 Matsuhis Matsuhisa Corporation
70:B3:D5:F4:30:00/36 Divelbis Divelbiss Corporation
+70:B3:D5:F4:40:00/36 MagnetiM Magneti Marelli S.p.A. Electronics
70:B3:D5:F4:50:00/36 NorbitOd Norbit ODM AS
70:B3:D5:F4:80:00/36 Heitec Heitec Ag
70:B3:D5:F4:B0:00/36 ChengduL Chengdu Lingya Technology Co., Ltd.
@@ -29269,6 +29296,7 @@
80:61:5F BeijingS Beijing Sinead Technology Co., Ltd.
80:61:8F Shenzhen Shenzhen sangfei consumer communications co.,ltd
80:64:59 Nimbus Nimbus Inc.
+80:64:7A OlaSense Ola Sense Inc
80:65:6D SamsungE Samsung Electronics Co.,Ltd
80:65:E9 Benq BenQ Corporation
80:66:29 Prescope Prescope Technologies CO.,LTD.
@@ -31482,6 +31510,7 @@ A0:A7:63 Polytron Polytron Vertrieb GmbH
A0:A8:CD IntelCor Intel Corporate
A0:AA:FD Erathink EraThink Technologies Corp.
A0:AB:1B D-LinkIn D-Link International
+A0:AB:51 WeifangG Weifang Goertek Electronics Co.,Ltd
A0:AD:A1 JmrElect JMR Electronics, Inc
A0:AF:BD IntelCor Intel Corporate
A0:B0:45 HalongMi Halong Mining
@@ -32697,6 +32726,7 @@ B4:37:D1:D0:00:00/28 ZxySport ZXY Sport Tracking
B4:37:D1:E0:00:00/28 UnionTec Union Tecnologica Noxium S.L.
B4:37:D1:F0:00:00/28 Private
B4:39:34 PenGener Pen Generations, Inc.
+B4:39:39 Shenzhen Shenzhen TINNO Mobile Technology Corp.
B4:39:D6 Procurve ProCurve Networking by HP
B4:3A:28 SamsungE Samsung Electronics Co.,Ltd
B4:3D:B2 Degreane Degreane Horizon
@@ -33322,6 +33352,7 @@ BC:9F:EF Apple Apple, Inc.
BC:A0:42 Shanghai Shanghai Flyco Electrical Appliance Co.,Ltd
BC:A1:3A Ses-Imag SES-imagotag
BC:A4:E1 Nabto
+BC:A5:11 Netgear
BC:A5:8B SamsungE Samsung Electronics Co.,Ltd
BC:A8:A6 IntelCor Intel Corporate
BC:A9:20 Apple Apple, Inc.
@@ -33540,6 +33571,7 @@ C0:B5:D7 Chongqin Chongqing Fugui Electronics Co.,Ltd.
C0:B6:58 Apple Apple, Inc.
C0:B6:F9 IntelCor Intel Corporate
C0:B7:13 BeijingX Beijing Xiaoyuer Technology Co. Ltd.
+C0:B8:83 IntelCor Intel Corporate
C0:B8:B1 Bitbox BitBox Ltd
C0:BA:E6 Applicat Application Solutions (Electronics and Vision) Ltd
C0:BD:42 ZpaSmart ZPA Smart Energy a.s.
@@ -35788,6 +35820,7 @@ E4:5D:75 SamsungE Samsung Electronics Co.,Ltd
E4:60:59 Pingtek Pingtek Co., Ltd.
E4:62:51 HaoCheng Hao Cheng Group Limited
E4:64:49 ArrisGro ARRIS Group, Inc.
+E4:67:1E ShenZhen SHEN ZHEN NUO XIN CHENG TECHNOLOGY co., Ltd.
E4:67:BA DanishIn Danish Interpretation Systems A/S
E4:68:A3 HuaweiTe Huawei Technologies Co.,Ltd
E4:69:5A DictumHe Dictum Health, Inc.
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 63283bcc2c..552e231d41 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -5679,6 +5679,10 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Profile verwalten</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Importieren</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Neu</translation>
@@ -8533,12 +8537,8 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<context>
<name>ProfileDialog</name>
<message>
- <source>Name</source>
- <translation type="vanished">Name</translation>
- </message>
- <message>
<source>Search for profile ...</source>
- <translation type="unfinished"></translation>
+ <translation>Nach Profil suchen ...</translation>
</message>
<message>
<source>Create a new profile using default settings.</source>
@@ -8554,155 +8554,159 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Dieses Profil kopieren.</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Importieren</translation>
+ </message>
+ <message>
<source>Configuration Profiles</source>
<translation>Profile konfigurieren</translation>
</message>
<message>
<source>All Profiles</source>
- <translation type="unfinished"></translation>
+ <translation>Alle Profile</translation>
</message>
<message>
<source>Global profiles</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Globale Profile</translation>
</message>
<message>
<source>User-defined profiles</source>
- <translation type="unfinished"></translation>
+ <translation>Benutzerdefinierte Profile</translation>
</message>
<message>
- <source>New profile</source>
+ <source>System profiles</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>
+ <source>New profile</source>
+ <translation>Neues Profil</translation>
</message>
<message>
- <source>Created from default settings</source>
- <translation type="vanished">Erstellt aus den Standardeinstellungen</translation>
+ <source>Profile Error</source>
+ <translation>Profil Fehler</translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="vanished">Umbenannt von %1</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Go to %1</source>
- <translation type="vanished">Gehe zu %1</translation>
+ <source>Zip File (*.zip)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
- <translation type="vanished">Dies ist ein vorgegebenes Profil.</translation>
+ <source>No profiles found for import in %1</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>, %1 profile(s) skipped</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>Importing profiles</source>
+ <translation type="unfinished"></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>One profile has been imported</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>Profil Fehler</translation>
+ <source>%1 profiles have been imported</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProfileModel</name>
<message>
<source>Global</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Global</translation>
</message>
<message>
<source>User</source>
- <translation type="unfinished"></translation>
+ <translation>Benutzer</translation>
</message>
<message>
<source>Resetting to default</source>
- <translation type="unfinished"></translation>
+ <translation>Auf Standard zurücksetzen</translation>
</message>
<message>
<source>Created from default settings</source>
- <translation type="unfinished">Erstellt aus den Standardeinstellungen</translation>
+ <translation>Erstellt aus den Standardeinstellungen</translation>
</message>
<message>
<source>Copied from: </source>
- <translation type="unfinished"></translation>
+ <translation>Kopiert von:</translation>
</message>
<message>
<source>Will be reset to default values</source>
- <translation type="unfinished">Auf Ausgangswerte zurücksetzen</translation>
+ <translation>Auf Ausgangswerte zurücksetzen</translation>
</message>
<message>
<source>Created from %1</source>
- <translation type="unfinished">Erstellt von %1</translation>
+ <translation>Erstellt von %1</translation>
</message>
<message>
<source>(system provided)</source>
- <translation type="unfinished">(vom System vorgegeben)</translation>
+ <translation>(vom System vorgegeben)</translation>
</message>
<message>
<source>(deleted)</source>
- <translation type="unfinished">(gelöscht)</translation>
+ <translation>(gelöscht)</translation>
</message>
<message>
<source>Renamed from %1</source>
- <translation type="unfinished">Umbenannt von %1</translation>
+ <translation type="vanished">Umbenannt von %1</translation>
+ </message>
+ <message>
+ <source>Default</source>
+ <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>
<message>
<source>This is a system provided profile.</source>
- <translation type="unfinished">Dies ist ein vorgegebenes Profil.</translation>
+ <translation>Dies ist ein vorgegebenes Profil.</translation>
</message>
<message>
<source>The profile will be reset to default values.</source>
- <translation type="unfinished">Das Profil wird auf den Ausgangswert zurückgesetzt.</translation>
+ <translation>Das Profil wird auf den Ausgangswert zurückgesetzt.</translation>
</message>
<message>
<source>A profile already exists with this name.</source>
- <translation type="unfinished">Ein Profil mit diesem Namen existiert bereits.</translation>
+ <translation>Ein Profil mit diesem Namen existiert bereits.</translation>
</message>
<message>
<source>A profile already exists with this name</source>
- <translation type="unfinished">Ein Profil mit diesem Namen existiert bereits.</translation>
+ <translation>Ein Profil mit diesem Namen existiert bereits</translation>
</message>
<message>
<source>Profile</source>
- <translation type="unfinished"></translation>
+ <translation>Profile</translation>
</message>
<message>
<source>Type</source>
- <translation type="unfinished">Typ</translation>
+ <translation>Typ</translation>
</message>
<message>
<source>Path</source>
- <translation type="unfinished">Pfad</translation>
+ <translation>Pfad</translation>
</message>
<message>
<source>copy</source>
- <translation type="unfinished"></translation>
+ <translation>Kopieren</translation>
</message>
<message>
<source>A profile must not contain any of the following characters: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Ein Profil darf keines der folgenden Zeichen enthalten: %1</translation>
</message>
<message>
<source>A profile must not start or end with a period (.)</source>
- <translation type="unfinished"></translation>
+ <translation>Ein Profil darf nicht mit einem Punkt (.) beginnen oder enden</translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 515ec144c4..e2ffae0be1 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -5620,6 +5620,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>Import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation type="unfinished"></translation>
@@ -8489,6 +8493,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>Import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Configuration Profiles</source>
<translation type="unfinished"></translation>
</message>
@@ -8497,11 +8505,11 @@ 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 profiles</source>
+ <source>User-defined profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>System profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8512,14 +8520,38 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>Profile Error</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>ProfileModel</name>
<message>
- <source>Global</source>
+ <source>Select zip file 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>, %1 profile(s) skipped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Importing profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <source>One profile has been imported</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 profiles have been imported</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ProfileModel</name>
+ <message>
<source>User</source>
<translation type="unfinished"></translation>
</message>
@@ -8552,7 +8584,15 @@ 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 from %1</source>
+ <source>Default</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 8f0a246ffa..f8f08b7db6 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -5655,6 +5655,10 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Gérer des Profils</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Importer</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Nouveau</translation>
@@ -8503,10 +8507,6 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<context>
<name>ProfileDialog</name>
<message>
- <source>Name</source>
- <translation type="vanished">Nom</translation>
- </message>
- <message>
<source>Search for profile ...</source>
<translation type="unfinished"></translation>
</message>
@@ -8524,6 +8524,10 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Copier ce profil.</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Importer</translation>
+ </message>
+ <message>
<source>Configuration Profiles</source>
<translation>Profils de configuration</translation>
</message>
@@ -8532,11 +8536,11 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
- <source>Global profiles</source>
+ <source>User-defined profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>System profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8544,45 +8548,41 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
- <source>Created from %1</source>
- <translation type="vanished">Créé à partir de %1</translation>
+ <source>Profile Error</source>
+ <translation>Erreur de Profil</translation>
</message>
<message>
- <source>Created from default settings</source>
- <translation type="vanished">Créé à partir des paramètres par défaut</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="vanished">Renomé à partir de %1</translation>
+ <source>Zip File (*.zip)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Go to %1</source>
- <translation type="vanished">Aller à %1</translation>
+ <source>No profiles found for import in %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
- <translation type="vanished">Ceci est un profile fournit par le système.</translation>
+ <source>, %1 profile(s) skipped</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
- <translation type="vanished">Un profil existe déjà avec ce nom.</translation>
+ <source>Importing profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
- <translation type="vanished">Un profil existe déjà avec ce nom.</translation>
+ <source>One profile has been imported</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>Erreur de Profil</translation>
+ <source>%1 profiles have been imported</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProfileModel</name>
<message>
- <source>Global</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>User</source>
<translation type="unfinished"></translation>
</message>
@@ -8592,7 +8592,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
</message>
<message>
<source>Created from default settings</source>
- <translation type="unfinished">Créé à partir des paramètres par défaut</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Copied from: </source>
@@ -8604,7 +8604,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
</message>
<message>
<source>Created from %1</source>
- <translation type="unfinished">Créé à partir de %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>(system provided)</source>
@@ -8615,12 +8615,20 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="unfinished">Renomé à partir de %1</translation>
+ <source>Default</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Renamed from: </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>This is a system provided profile.</source>
- <translation type="unfinished">Ceci est un profile fournit par le système.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>The profile will be reset to default values.</source>
@@ -8628,11 +8636,11 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
</message>
<message>
<source>A profile already exists with this name.</source>
- <translation type="unfinished">Un profil existe déjà avec ce nom.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>A profile already exists with this name</source>
- <translation type="unfinished">Un profil existe déjà avec ce nom.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Profile</source>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 84f63ae0b5..5305eeed7a 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -5679,6 +5679,10 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Gestisci i profili</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Importa</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Nuovo</translation>
@@ -8533,12 +8537,8 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<context>
<name>ProfileDialog</name>
<message>
- <source>Name</source>
- <translation type="vanished">Nome</translation>
- </message>
- <message>
<source>Search for profile ...</source>
- <translation type="unfinished"></translation>
+ <translation>Cerca profilo...</translation>
</message>
<message>
<source>Create a new profile using default settings.</source>
@@ -8554,155 +8554,159 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Copia questo profilo.</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Importa</translation>
+ </message>
+ <message>
<source>Configuration Profiles</source>
<translation>Profili di configurazione</translation>
</message>
<message>
<source>All Profiles</source>
- <translation type="unfinished"></translation>
+ <translation>Tutti i profili</translation>
</message>
<message>
<source>Global profiles</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Profili globali</translation>
</message>
<message>
<source>User-defined profiles</source>
- <translation type="unfinished"></translation>
+ <translation>Profili definiti dall&apos;utente</translation>
</message>
<message>
- <source>New profile</source>
+ <source>System profiles</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>
+ <source>New profile</source>
+ <translation>Nuon profilo</translation>
</message>
<message>
- <source>Created from default settings</source>
- <translation type="vanished">Creato dalle impostazioni predefinite</translation>
+ <source>Profile Error</source>
+ <translation>Errore di profilo</translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="vanished">Rinominato da %1</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Go to %1</source>
- <translation type="vanished">Vai a %1</translation>
+ <source>Zip File (*.zip)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
- <translation type="vanished">Questo è un profilo fornito dal sistema.</translation>
+ <source>No profiles found for import in %1</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>, %1 profile(s) skipped</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>Importing profiles</source>
+ <translation type="unfinished"></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>One profile has been imported</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>Errore di profilo</translation>
+ <source>%1 profiles have been imported</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProfileModel</name>
<message>
<source>Global</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Globale</translation>
</message>
<message>
<source>User</source>
- <translation type="unfinished"></translation>
+ <translation>Utente</translation>
</message>
<message>
<source>Resetting to default</source>
- <translation type="unfinished"></translation>
+ <translation>Ripristino dei valori predefiniti</translation>
</message>
<message>
<source>Created from default settings</source>
- <translation type="unfinished">Creato dalle impostazioni predefinite</translation>
+ <translation>Creato dalle impostazioni predefinite</translation>
</message>
<message>
<source>Copied from: </source>
- <translation type="unfinished"></translation>
+ <translation>Copiato da:</translation>
</message>
<message>
<source>Will be reset to default values</source>
- <translation type="unfinished">Sarà ripristinato ai valori predefiniti</translation>
+ <translation>Sarà ripristinato ai valori predefiniti</translation>
</message>
<message>
<source>Created from %1</source>
- <translation type="unfinished">Creato da %1</translation>
+ <translation>Creato da %1</translation>
</message>
<message>
<source>(system provided)</source>
- <translation type="unfinished">(fornito dal sistema)</translation>
+ <translation>(fornito dal sistema)</translation>
</message>
<message>
<source>(deleted)</source>
- <translation type="unfinished">(eliminato)</translation>
+ <translation>(eliminato)</translation>
</message>
<message>
<source>Renamed from %1</source>
- <translation type="unfinished">Rinominato da %1</translation>
+ <translation type="vanished">Rinominato da %1</translation>
+ </message>
+ <message>
+ <source>Default</source>
+ <translation type="unfinished">Predefinito</translation>
+ </message>
+ <message>
+ <source>System</source>
+ <translation type="unfinished">Sistema</translation>
+ </message>
+ <message>
+ <source>Renamed from: </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>This is a system provided profile.</source>
- <translation type="unfinished">Questo è un profilo fornito dal sistema.</translation>
+ <translation>Questo è un profilo fornito dal sistema.</translation>
</message>
<message>
<source>The profile will be reset to default values.</source>
- <translation type="unfinished">Il profilo sarà ripristinato ai valori predefiniti.</translation>
+ <translation>Il profilo sarà ripristinato ai valori predefiniti.</translation>
</message>
<message>
<source>A profile already exists with this name.</source>
- <translation type="unfinished">Un profilo con questo nome esiste già.</translation>
+ <translation>Un profilo con questo nome esiste già.</translation>
</message>
<message>
<source>A profile already exists with this name</source>
- <translation type="unfinished">Un profilo con questo nome esiste già</translation>
+ <translation>Un profilo con questo nome esiste già</translation>
</message>
<message>
<source>Profile</source>
- <translation type="unfinished"></translation>
+ <translation>Profilo</translation>
</message>
<message>
<source>Type</source>
- <translation type="unfinished">Tipo</translation>
+ <translation>Tipo</translation>
</message>
<message>
<source>Path</source>
- <translation type="unfinished">Percorso</translation>
+ <translation>Percorso</translation>
</message>
<message>
<source>copy</source>
- <translation type="unfinished"></translation>
+ <translation>copia</translation>
</message>
<message>
<source>A profile must not contain any of the following characters: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Un profilo non deve contenere uno dei seguenti caratteri: %1</translation>
</message>
<message>
<source>A profile must not start or end with a period (.)</source>
- <translation type="unfinished"></translation>
+ <translation>Un profilo non deve iniziare o finire con un punto (.)</translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index d96538f288..027a53bea9 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -5664,6 +5664,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>プロファイルの管理</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">インポート</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>新規</translation>
@@ -8515,10 +8519,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileDialog</name>
<message>
- <source>Name</source>
- <translation type="vanished">名前</translation>
- </message>
- <message>
<source>Search for profile ...</source>
<translation type="unfinished"></translation>
</message>
@@ -8536,6 +8536,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>このプロファイルをコピーします</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">インポート</translation>
+ </message>
+ <message>
<source>Configuration Profiles</source>
<translation>設定プロファイル</translation>
</message>
@@ -8544,11 +8548,11 @@ 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 profiles</source>
+ <source>User-defined profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>System profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8556,45 +8560,41 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Created from %1</source>
- <translation type="vanished">%1 から作成</translation>
+ <source>Profile Error</source>
+ <translation>プロファイルエラー</translation>
</message>
<message>
- <source>Created from default settings</source>
- <translation type="vanished">デフォルト設定から作成</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="vanished">%1 の名前を変更</translation>
+ <source>Zip File (*.zip)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Go to %1</source>
- <translation type="vanished">%1 に移動</translation>
+ <source>No profiles found for import in %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
- <translation type="vanished">これはシステム提供プロファイルです</translation>
+ <source>, %1 profile(s) skipped</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
- <translation type="vanished">この名前のプロファイルは既に存在します</translation>
+ <source>Importing profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
- <translation type="vanished">既存プロファイル名</translation>
+ <source>One profile has been imported</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>プロファイルエラー</translation>
+ <source>%1 profiles have been imported</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProfileModel</name>
<message>
- <source>Global</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>User</source>
<translation type="unfinished"></translation>
</message>
@@ -8604,7 +8604,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Created from default settings</source>
- <translation type="unfinished">デフォルト設定から作成</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Copied from: </source>
@@ -8616,7 +8616,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Created from %1</source>
- <translation type="unfinished">%1 から作成</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>(system provided)</source>
@@ -8627,12 +8627,20 @@ 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 from %1</source>
- <translation type="unfinished">%1 の名前を変更</translation>
+ <source>Default</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Renamed from: </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>This is a system provided profile.</source>
- <translation type="unfinished">これはシステム提供プロファイルです</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>The profile will be reset to default values.</source>
@@ -8640,11 +8648,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>A profile already exists with this name.</source>
- <translation type="unfinished">この名前のプロファイルは既に存在します</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>A profile already exists with this name</source>
- <translation type="unfinished">既存プロファイル名</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Profile</source>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 26d2233bea..e22ae83795 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -5685,6 +5685,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Zarządzaj profilami</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Importuj</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Nowy</translation>
@@ -8541,10 +8545,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileDialog</name>
<message>
- <source>Name</source>
- <translation type="vanished">Nazwa</translation>
- </message>
- <message>
<source>Search for profile ...</source>
<translation type="unfinished"></translation>
</message>
@@ -8562,6 +8562,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Kopiuj ten profil.</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Importuj</translation>
+ </message>
+ <message>
<source>Configuration Profiles</source>
<translation>Konfiguracja profili</translation>
</message>
@@ -8570,11 +8574,11 @@ 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 profiles</source>
+ <source>User-defined profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>System profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8582,57 +8586,41 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Will be reset to default values</source>
- <translation type="vanished">Będzie zresetowany do wartości domyślnych.</translation>
- </message>
- <message>
- <source>Created from %1</source>
- <translation type="vanished">Utworzono z %1</translation>
- </message>
- <message>
- <source>(system provided)</source>
- <translation type="vanished">(dostarczone przez system)</translation>
- </message>
- <message>
- <source>Created from default settings</source>
- <translation type="vanished">Utworzono z domyślnych ustawień</translation>
+ <source>Profile Error</source>
+ <translation>Błąd w profilu</translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="vanished">Przemianowano z %1</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Go to %1</source>
- <translation type="vanished">Przejdź do %1</translation>
+ <source>Zip File (*.zip)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
- <translation type="vanished">To jest profil dostarczony z tym oprogramowaniem.</translation>
+ <source>No profiles found for import in %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
- <translation type="vanished">Profil o tej nazwie już istnieje.</translation>
+ <source>, %1 profile(s) skipped</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
- <translation type="vanished">Profil o tej nazwie już istnieje</translation>
+ <source>Importing profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
- <translation type="vanished">Profil będzie zresetowany do wartości domyślnych.</translation>
+ <source>One profile has been imported</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>Błąd w profilu</translation>
+ <source>%1 profiles have been imported</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProfileModel</name>
<message>
- <source>Global</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>User</source>
<translation type="unfinished"></translation>
</message>
@@ -8642,7 +8630,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Created from default settings</source>
- <translation type="unfinished">Utworzono z domyślnych ustawień</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Copied from: </source>
@@ -8650,39 +8638,47 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Will be reset to default values</source>
- <translation type="unfinished">Będzie zresetowany do wartości domyślnych.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Created from %1</source>
- <translation type="unfinished">Utworzono z %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>(system provided)</source>
- <translation type="unfinished">(dostarczone przez system)</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>(deleted)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="unfinished">Przemianowano z %1</translation>
+ <source>Default</source>
+ <translation type="unfinished">Domyślnie</translation>
+ </message>
+ <message>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Renamed from: </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>This is a system provided profile.</source>
- <translation type="unfinished">To jest profil dostarczony z tym oprogramowaniem.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>The profile will be reset to default values.</source>
- <translation type="unfinished">Profil będzie zresetowany do wartości domyślnych.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>A profile already exists with this name.</source>
- <translation type="unfinished">Profil o tej nazwie już istnieje.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>A profile already exists with this name</source>
- <translation type="unfinished">Profil o tej nazwie już istnieje</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Profile</source>
diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts
index bf9c640ef8..695de3ca85 100644
--- a/ui/qt/wireshark_ru.ts
+++ b/ui/qt/wireshark_ru.ts
@@ -5695,6 +5695,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Управлять Профилями</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Импорт</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Новый</translation>
@@ -8552,10 +8556,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileDialog</name>
<message>
- <source>Name</source>
- <translation type="vanished">Имя</translation>
- </message>
- <message>
<source>Search for profile ...</source>
<translation type="unfinished"></translation>
</message>
@@ -8573,6 +8573,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Копировать этот профиль.</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Импорт</translation>
+ </message>
+ <message>
<source>Configuration Profiles</source>
<translation>Конфигурационные Профили</translation>
</message>
@@ -8581,11 +8585,11 @@ 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 profiles</source>
+ <source>User-defined profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>System profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8593,61 +8597,41 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Will be reset to default values</source>
- <translation type="vanished">Будет сброшено до значений по умолчанию</translation>
- </message>
- <message>
- <source>Created from %1</source>
- <translation type="vanished">Создано из %1</translation>
- </message>
- <message>
- <source>(system provided)</source>
- <translation type="vanished">(системный)</translation>
- </message>
- <message>
- <source>(deleted)</source>
- <translation type="vanished">(удалено)</translation>
- </message>
- <message>
- <source>Created from default settings</source>
- <translation type="vanished">Создан из настроек по умолчанию</translation>
+ <source>Profile Error</source>
+ <translation>Ошибка Профиля</translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="vanished">Переименовано из %1</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Go to %1</source>
- <translation type="vanished">Перейти к %1</translation>
+ <source>Zip File (*.zip)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
- <translation type="vanished">Это системный профиль.</translation>
+ <source>No profiles found for import in %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
- <translation type="vanished">Профиль с таким именем уже существует.</translation>
+ <source>, %1 profile(s) skipped</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
- <translation type="vanished">Профиль с таким именем уже существует</translation>
+ <source>Importing profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
- <translation type="vanished">Профиль будет сброшен до значений по умолчанию.</translation>
+ <source>One profile has been imported</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>Ошибка Профиля</translation>
+ <source>%1 profiles have been imported</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProfileModel</name>
<message>
- <source>Global</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>User</source>
<translation type="unfinished"></translation>
</message>
@@ -8657,7 +8641,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Created from default settings</source>
- <translation type="unfinished">Создан из настроек по умолчанию</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Copied from: </source>
@@ -8665,39 +8649,47 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Will be reset to default values</source>
- <translation type="unfinished">Будет сброшено до значений по умолчанию</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Created from %1</source>
- <translation type="unfinished">Создано из %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>(system provided)</source>
- <translation type="unfinished">(системный)</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>(deleted)</source>
- <translation type="unfinished">(удалено)</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Default</source>
+ <translation type="unfinished">По умолчанию</translation>
+ </message>
+ <message>
+ <source>System</source>
+ <translation type="unfinished">Системный</translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="unfinished">Переименовано из %1</translation>
+ <source>Renamed from: </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>This is a system provided profile.</source>
- <translation type="unfinished">Это системный профиль.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>The profile will be reset to default values.</source>
- <translation type="unfinished">Профиль будет сброшен до значений по умолчанию.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>A profile already exists with this name.</source>
- <translation type="unfinished">Профиль с таким именем уже существует.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>A profile already exists with this name</source>
- <translation type="unfinished">Профиль с таким именем уже существует</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Profile</source>
diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts
index 6cacf8329f..3534905e97 100644
--- a/ui/qt/wireshark_sv.ts
+++ b/ui/qt/wireshark_sv.ts
@@ -5679,6 +5679,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Hantera profiler</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Importera</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Ny</translation>
@@ -8533,10 +8537,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<context>
<name>ProfileDialog</name>
<message>
- <source>Name</source>
- <translation type="vanished">Namn</translation>
- </message>
- <message>
<source>Search for profile ...</source>
<translation type="unfinished"></translation>
</message>
@@ -8554,6 +8554,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Kopiera denna profil.</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Importera</translation>
+ </message>
+ <message>
<source>Configuration Profiles</source>
<translation>Konfigurationsprofiler</translation>
</message>
@@ -8562,11 +8566,11 @@ 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 profiles</source>
+ <source>User-defined profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>System profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8574,61 +8578,41 @@ 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>Will be reset to default values</source>
- <translation type="vanished">Kommer att återställas till standardvärden</translation>
- </message>
- <message>
- <source>Created from %1</source>
- <translation type="vanished">Skapad från %1</translation>
- </message>
- <message>
- <source>(system provided)</source>
- <translation type="vanished">(tillhandahålls av systemet)</translation>
- </message>
- <message>
- <source>(deleted)</source>
- <translation type="vanished">(borttagen)</translation>
- </message>
- <message>
- <source>Created from default settings</source>
- <translation type="vanished">Skapad från standardinställningarna</translation>
+ <source>Profile Error</source>
+ <translation>Profilfel</translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="vanished">Bytt namn från %1</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Go to %1</source>
- <translation type="vanished">Gå till %1</translation>
+ <source>Zip File (*.zip)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
- <translation type="vanished">Detta är en profil systemet tillhandahåller.</translation>
+ <source>No profiles found for import in %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
- <translation type="vanished">Det finns redan en profil med det namnet.</translation>
+ <source>, %1 profile(s) skipped</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
- <translation type="vanished">Det finns redan en profil med det namnet</translation>
+ <source>Importing profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
- <translation type="vanished">Profilen kommer att återställas till standardvärden.</translation>
+ <source>One profile has been imported</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>Profilfel</translation>
+ <source>%1 profiles have been imported</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProfileModel</name>
<message>
- <source>Global</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>User</source>
<translation type="unfinished"></translation>
</message>
@@ -8638,7 +8622,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
</message>
<message>
<source>Created from default settings</source>
- <translation type="unfinished">Skapad från standardinställningarna</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Copied from: </source>
@@ -8646,39 +8630,47 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
</message>
<message>
<source>Will be reset to default values</source>
- <translation type="unfinished">Kommer att återställas till standardvärden</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Created from %1</source>
- <translation type="unfinished">Skapad från %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>(system provided)</source>
- <translation type="unfinished">(tillhandahålls av systemet)</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>(deleted)</source>
- <translation type="unfinished">(borttagen)</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Default</source>
+ <translation type="unfinished">Standard</translation>
+ </message>
+ <message>
+ <source>System</source>
+ <translation type="unfinished">System</translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="unfinished">Bytt namn från %1</translation>
+ <source>Renamed from: </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>This is a system provided profile.</source>
- <translation type="unfinished">Detta är en profil systemet tillhandahåller.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>The profile will be reset to default values.</source>
- <translation type="unfinished">Profilen kommer att återställas till standardvärden.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>A profile already exists with this name.</source>
- <translation type="unfinished">Det finns redan en profil med det namnet.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>A profile already exists with this name</source>
- <translation type="unfinished">Det finns redan en profil med det namnet</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Profile</source>
diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts
index 64d6001cb8..ef304c4007 100644
--- a/ui/qt/wireshark_uk.ts
+++ b/ui/qt/wireshark_uk.ts
@@ -5612,6 +5612,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Управління Профілями</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Імпортувати</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation type="unfinished"></translation>
@@ -8475,6 +8479,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Скопіювати цей профіль.</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">Імпортувати</translation>
+ </message>
+ <message>
<source>Configuration Profiles</source>
<translation>Профілі Конфігурації</translation>
</message>
@@ -8483,11 +8491,11 @@ 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 profiles</source>
+ <source>User-defined profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>System profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8498,14 +8506,38 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>Profile Error</source>
<translation>Помилка Профілю</translation>
</message>
-</context>
-<context>
- <name>ProfileModel</name>
<message>
- <source>Global</source>
+ <source>Select zip file 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>, %1 profile(s) skipped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Importing profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <source>One profile has been imported</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 profiles have been imported</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ProfileModel</name>
+ <message>
<source>User</source>
<translation type="unfinished"></translation>
</message>
@@ -8538,7 +8570,15 @@ 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 from %1</source>
+ <source>Default</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>System</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 2a66c4b9af..4377bdf354 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -5658,6 +5658,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>管理配置文件</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">导入</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>新建</translation>
@@ -8508,10 +8512,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<context>
<name>ProfileDialog</name>
<message>
- <source>Name</source>
- <translation type="vanished">名称</translation>
- </message>
- <message>
<source>Search for profile ...</source>
<translation type="unfinished"></translation>
</message>
@@ -8529,6 +8529,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>复制该配置文件。</translation>
</message>
<message>
+ <source>Import</source>
+ <translation type="unfinished">导入</translation>
+ </message>
+ <message>
<source>Configuration Profiles</source>
<translation>配置文件</translation>
</message>
@@ -8537,11 +8541,11 @@ 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 profiles</source>
+ <source>User-defined profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>User-defined profiles</source>
+ <source>System profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8549,57 +8553,41 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Will be reset to default values</source>
- <translation type="vanished">将重置为默认值</translation>
- </message>
- <message>
- <source>Created from %1</source>
- <translation type="vanished">创建自 %1</translation>
- </message>
- <message>
- <source>(system provided)</source>
- <translation type="vanished">(系统提供)</translation>
- </message>
- <message>
- <source>Created from default settings</source>
- <translation type="vanished">根据默认设置创建</translation>
+ <source>Profile Error</source>
+ <translation>配置文件错误</translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="vanished">重命名自 %1</translation>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Go to %1</source>
- <translation type="vanished">转到 %1</translation>
+ <source>Zip File (*.zip)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
- <translation type="vanished">这是一个系统提供的配置文件。</translation>
+ <source>No profiles found for import in %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
- <translation type="vanished">已存在该名称的配置文件。</translation>
+ <source>, %1 profile(s) skipped</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
- <translation type="vanished">已存在该名称的配置文件。</translation>
+ <source>Importing profiles</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
- <translation type="vanished">此配置文件将重置为默认值。</translation>
+ <source>One profile has been imported</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Profile Error</source>
- <translation>配置文件错误</translation>
+ <source>%1 profiles have been imported</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProfileModel</name>
<message>
- <source>Global</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>User</source>
<translation type="unfinished"></translation>
</message>
@@ -8609,7 +8597,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Created from default settings</source>
- <translation type="unfinished">根据默认设置创建</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Copied from: </source>
@@ -8617,39 +8605,47 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Will be reset to default values</source>
- <translation type="unfinished">将重置为默认值</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Created from %1</source>
- <translation type="unfinished">创建自 %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>(system provided)</source>
- <translation type="unfinished">(系统提供)</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>(deleted)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from %1</source>
- <translation type="unfinished">重命名自 %1</translation>
+ <source>Default</source>
+ <translation type="unfinished">默认</translation>
+ </message>
+ <message>
+ <source>System</source>
+ <translation type="unfinished">系统</translation>
+ </message>
+ <message>
+ <source>Renamed from: </source>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>This is a system provided profile.</source>
- <translation type="unfinished">这是一个系统提供的配置文件。</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>The profile will be reset to default values.</source>
- <translation type="unfinished">此配置文件将重置为默认值。</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>A profile already exists with this name.</source>
- <translation type="unfinished">已存在该名称的配置文件。</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>A profile already exists with this name</source>
- <translation type="unfinished">已存在该名称的配置文件。</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Profile</source>