aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-07-28 08:20:20 +0000
committerGerald Combs <gerald@wireshark.org>2019-07-28 08:20:23 +0000
commitede4ecb8c8caff5ae45df51e93ff765ed15126ef (patch)
tree6aed351c4d60334ab764dcfc7a29ffb556e76149
parent22e7952e06f01c475f427699f5e06578f4b18cf7 (diff)
[Automatic update for 2019-07-28]
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Iae1d6218e2353d99569caaeff072f6691b7b817f Reviewed-on: https://code.wireshark.org/review/34104 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r--AUTHORS5
-rw-r--r--NEWS21
-rw-r--r--docbook/wsug_src/capinfos-h.txt2
-rw-r--r--docbook/wsug_src/dumpcap-h.txt2
-rw-r--r--docbook/wsug_src/editcap-T.txt1
-rw-r--r--docbook/wsug_src/editcap-h.txt2
-rw-r--r--docbook/wsug_src/mergecap-h.txt2
-rw-r--r--docbook/wsug_src/rawshark-h.txt2
-rw-r--r--docbook/wsug_src/reordercap-h.txt2
-rw-r--r--docbook/wsug_src/text2pcap-h.txt2
-rw-r--r--docbook/wsug_src/tshark-h.txt2
-rw-r--r--enterprises.tsv28
-rw-r--r--epan/dissectors/usb.c1
-rw-r--r--manuf89
-rw-r--r--services1
-rw-r--r--ui/qt/wireshark_de.ts153
-rw-r--r--ui/qt/wireshark_en.ts97
-rw-r--r--ui/qt/wireshark_fr.ts109
-rw-r--r--ui/qt/wireshark_it.ts153
-rw-r--r--ui/qt/wireshark_ja_JP.ts168
-rw-r--r--ui/qt/wireshark_pl.ts112
-rw-r--r--ui/qt/wireshark_ru.ts120
-rw-r--r--ui/qt/wireshark_sv.ts117
-rw-r--r--ui/qt/wireshark_uk.ts112
-rw-r--r--ui/qt/wireshark_zh_CN.ts114
25 files changed, 1018 insertions, 399 deletions
diff --git a/AUTHORS b/AUTHORS
index 4a4ff93321..d8033ddf2f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4211,6 +4211,7 @@ Graham Shanks <graham.shanks[AT]blueyonder.co.uk>
Greg Morris <greg.morris[AT]microfocus.com>
Gregor Beck <gbeck[AT]sernet.de>
Gregor Jasny <gjasny[AT]googlemail.com>
+Gregor Jasny <gregor.jasny[AT]logmein.com>
Gregor Miernik <gregor.miernik[AT]hytec.de>
Guillaume Autran <gautran[AT]clearpathrobotics.com>
Guy Davies <aguydavies[AT]gmail.com>
@@ -4253,6 +4254,7 @@ Jan Spevak <jan.spevak[AT]nokia.com>
Jan-Hendrik Bolte <jabolte[AT]uos.de>
Jano Svitok <jsv[AT]whitestein.com>
Jared Rittle <jrittle[AT]cisco.com>
+Jason Cohen <j.cohen[AT]f5.com>
Jason Cohen <kryojenik2[AT]gmail.com>
Jason Heimann <jheimann[AT]pertino.com>
Jason Uher <jason.uher[AT]jhuapl.edu>
@@ -4617,6 +4619,7 @@ Tom <tom916[AT]qq.com>
Tom Haynes <loghyr[AT]primarydata.com>
Tomas Konecny <tomas.konecny[AT]eldis.cz>
Tomas Kukosa <tomas.kukosa[AT]ixperta.com>
+Topi Miettinen <toiwoton[AT]gmail.com>
Trond Myklebust <trond.myklebust[AT]primarydata.com>
Trond Norbye <trond[AT]couchbase.com>
Ulf <ulf33286[AT]gmail.com>
@@ -4700,7 +4703,7 @@ http://www.kylheku.com/~kaz/kazlib.html
We use Lua BitOp, written by Mike Pall, for bitwise operations
on numbers in Lua. The Lua BitOp home page can be found at
-http://bitop.luajit.org/
+https://bitop.luajit.org
snax <snax[AT]shmoo.com> gave permission to use his(?) weak key
detection code from Airsnort.
diff --git a/NEWS b/NEWS
index c5bf07f07d..85c44caea2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Wireshark 3.1.0 Release Notes
+Wireshark 3.1.1 Release Notes
This is an experimental release intended to test new features for
Wireshark 3.2.
@@ -13,12 +13,14 @@ Wireshark 3.1.0 Release Notes
Many improvements have been made. See the “New and Updated Features”
section below for more details.
- Windows .msi packages are now signed using SHA-2[1]. .exe installers
- are still dual-signed using SHA-1 and SHA-2.
-
New and Updated Features
The following features are new (or have been significantly updated)
+ since version 3.1.0:
+
+ • Nothing as of yet.
+
+ The following features are new (or have been significantly updated)
since version 3.0.0:
• Drag&Drop a field to a column header to create a column for that
@@ -43,7 +45,7 @@ Wireshark 3.1.0 Release Notes
• WireGuard decryption can now be enabled through keys embedded in
a pcapng in addition to the existing key log preference (Bug
- 15571[2]).
+ 15571[1]).
• A new tap for extracting credentials from the capture file has
been added. It can be accessed through the "-z credentials"
@@ -51,6 +53,9 @@ Wireshark 3.1.0 Release Notes
• Editcap can now split files on floating point intervals.
+ • Windows .msi packages are now signed using SHA-2[2]. .exe
+ installers are still dual-signed using SHA-1 and SHA-2.
+
New Protocol Support
3GPP BICC MST (BICC-MST), 3GPP log packet (LOG3GPP), 3GPP/GSM Cell
@@ -113,13 +118,13 @@ Wireshark 3.1.0 Release Notes
A complete FAQ is available on the Wireshark web site[10].
- Last updated 2019-07-25 18:44:33 UTC
+ Last updated 2019-07-28 08:08:28 UTC
References
- 1. https://support.microsoft.com/en-us/help/4472027/2019-sha-2-code-s
+ 1. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15571
+ 2. https://support.microsoft.com/en-us/help/4472027/2019-sha-2-code-s
igning-support-requirement-for-windows-and-wsus
- 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=15571
3. https://www.wireshark.org/download.html
4. https://www.wireshark.org/download.html#thirdparty
5. https://www.wireshark.org/docs/
diff --git a/docbook/wsug_src/capinfos-h.txt b/docbook/wsug_src/capinfos-h.txt
index 7261cce3a9..79c0fa0f71 100644
--- a/docbook/wsug_src/capinfos-h.txt
+++ b/docbook/wsug_src/capinfos-h.txt
@@ -1,4 +1,4 @@
-Capinfos (Wireshark) 3.1.0 (v3.1.0rc0-160-g95bf9f5e)
+Capinfos (Wireshark) 3.1.1 (v3.1.1rc0-10-g22e7952e06f0)
Print various information (infos) about capture files.
See https://www.wireshark.org for more information.
diff --git a/docbook/wsug_src/dumpcap-h.txt b/docbook/wsug_src/dumpcap-h.txt
index c26be7ca4d..2079cae082 100644
--- a/docbook/wsug_src/dumpcap-h.txt
+++ b/docbook/wsug_src/dumpcap-h.txt
@@ -1,4 +1,4 @@
-Dumpcap (Wireshark) 3.1.0 (v3.1.0rc0-36-g18b180c5)
+Dumpcap (Wireshark) 3.1.1 (v3.1.1rc0-10-g22e7952e06f0)
Capture network packets and dump them into a pcapng or pcap file.
See https://www.wireshark.org for more information.
diff --git a/docbook/wsug_src/editcap-T.txt b/docbook/wsug_src/editcap-T.txt
index 5c69b9e989..26e723d10c 100644
--- a/docbook/wsug_src/editcap-T.txt
+++ b/docbook/wsug_src/editcap-T.txt
@@ -173,6 +173,7 @@ editcap: The available encapsulation types for the "-T" flag are:
tzsp - Tazmen sniffer protocol
unknown - Unknown
unknown-nettl - Unknown link-layer type with nettl headers
+ usb-20 - USB 2.0/1.1/1.0 packets
usb-darwin - USB packets with Darwin (macOS, etc.) headers
usb-freebsd - USB packets with FreeBSD header
usb-linux - USB packets with Linux header
diff --git a/docbook/wsug_src/editcap-h.txt b/docbook/wsug_src/editcap-h.txt
index e222ea7a66..a5b5c5fa46 100644
--- a/docbook/wsug_src/editcap-h.txt
+++ b/docbook/wsug_src/editcap-h.txt
@@ -1,4 +1,4 @@
-Editcap (Wireshark) 3.1.0 (v3.1.0rc0-160-g95bf9f5e)
+Editcap (Wireshark) 3.1.1 (v3.1.1rc0-10-g22e7952e06f0)
Edit and/or translate the format of capture files.
See https://www.wireshark.org for more information.
diff --git a/docbook/wsug_src/mergecap-h.txt b/docbook/wsug_src/mergecap-h.txt
index 498a0e7e12..f11a2eb284 100644
--- a/docbook/wsug_src/mergecap-h.txt
+++ b/docbook/wsug_src/mergecap-h.txt
@@ -1,4 +1,4 @@
-Mergecap (Wireshark) 3.1.0 (v3.1.0rc0-36-g18b180c5)
+Mergecap (Wireshark) 3.1.1 (v3.1.1rc0-10-g22e7952e06f0)
Merge two or more capture files into one.
See https://www.wireshark.org for more information.
diff --git a/docbook/wsug_src/rawshark-h.txt b/docbook/wsug_src/rawshark-h.txt
index 09f04b286e..e38dc4b70a 100644
--- a/docbook/wsug_src/rawshark-h.txt
+++ b/docbook/wsug_src/rawshark-h.txt
@@ -1,4 +1,4 @@
-Rawshark (Wireshark) 3.1.0 (v3.1.0rc0-36-g18b180c5)
+Rawshark (Wireshark) 3.1.1 (v3.1.1rc0-10-g22e7952e06f0)
Dump and analyze network traffic.
See https://www.wireshark.org for more information.
diff --git a/docbook/wsug_src/reordercap-h.txt b/docbook/wsug_src/reordercap-h.txt
index eafe0e07b3..0978996b26 100644
--- a/docbook/wsug_src/reordercap-h.txt
+++ b/docbook/wsug_src/reordercap-h.txt
@@ -1,4 +1,4 @@
-Reordercap (Wireshark) 3.1.0 (v3.1.0rc0-36-g18b180c5)
+Reordercap (Wireshark) 3.1.1 (v3.1.1rc0-10-g22e7952e06f0)
Reorder timestamps of input file frames into output file.
See https://www.wireshark.org for more information.
diff --git a/docbook/wsug_src/text2pcap-h.txt b/docbook/wsug_src/text2pcap-h.txt
index 90b00d822a..b2a0959f6a 100644
--- a/docbook/wsug_src/text2pcap-h.txt
+++ b/docbook/wsug_src/text2pcap-h.txt
@@ -1,4 +1,4 @@
-Text2pcap (Wireshark) 3.1.0 (v3.1.0rc0-36-g18b180c5)
+Text2pcap (Wireshark) 3.1.1 (v3.1.1rc0-10-g22e7952e06f0)
Generate a capture file from an ASCII hexdump of packets.
See https://www.wireshark.org for more information.
diff --git a/docbook/wsug_src/tshark-h.txt b/docbook/wsug_src/tshark-h.txt
index 1c011cd7b6..1d55c561f0 100644
--- a/docbook/wsug_src/tshark-h.txt
+++ b/docbook/wsug_src/tshark-h.txt
@@ -1,4 +1,4 @@
-TShark (Wireshark) 3.1.0 (v3.1.0rc0-36-g18b180c5)
+TShark (Wireshark) 3.1.1 (v3.1.1rc0-10-g22e7952e06f0)
Dump and analyze network traffic.
See https://www.wireshark.org for more information.
diff --git a/enterprises.tsv b/enterprises.tsv
index 1870f0c073..5452cef21f 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-20)
+# (last updated 2019-07-27)
0 Reserved
1 NxNetworks
@@ -54118,3 +54118,29 @@
54308 Binarno s.p.
54309 Camrize
54310 AG Rechnersicherheit (TU-Berlin)
+54311 Vektor LLC
+54312 Naval Group
+54313 Personal
+54314 ARM Automation
+54315 Pevans East Africa Limited
+54316 Tibx
+54317 SPECIALTY MICROWAVE
+54318 Center of Hope
+54319 Disy Informationssysteme GmbH
+54320 Häger+Busch GbR
+54321 Research School of Astronomy and Astrophysics, Australian National University
+54322 LogPoint A/S
+54323 Datera Inc.
+54324 Rhenus SE & Co. KG
+54325 Datamecanic
+54326 Saudia, Corp.
+54327 Tule River Tribe Gaming Commission
+54328 Kimbrell
+54329 Modern Treasury Corp.
+54330 "Digital Solutions" JSC
+54331 Eurofins Digital Testing
+54332 Nefeli Networks
+54333 Clicks Online Business e.K
+54334 Central National Gottesman
+54335 Infrascale, Inc
+54336 rowspace
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index cadfc3df81..ee1126ac7d 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -19872,6 +19872,7 @@ static const value_string usb_products_vals[] = {
{ 0x23570101, "RTL8812AU Archer T4U 802.11ac" },
{ 0x23570103, "Archer T4UH wireless Realtek 8812AU" },
{ 0x23570105, "Archer T1U 802.11a/n/ac Wireless Adapter [MediaTek MT7610U]" },
+ { 0x23570106, "Archer T9UH v1 [Realtek RTL8814AU]" },
{ 0x23570107, "TL-WN821N Version 5 RTL8192EU" },
{ 0x23570108, "TL-WN822N Version 4 RTL8192EU" },
{ 0x23570109, "TL WN823N RTL8192EU" },
diff --git a/manuf b/manuf
index 1e1259a049..eb8795c7c4 100644
--- a/manuf
+++ b/manuf
@@ -45,23 +45,23 @@
# http://standards-oui.ieee.org/cid/cid.csv:
# Content-Length: 7621
-# Last-Modified: Sun, 21 Jul 2019 08:00:20 GMT
+# Last-Modified: Sun, 28 Jul 2019 08:00:31 GMT
# http://standards-oui.ieee.org/iab/iab.csv:
# Content-Length: 381248
-# Last-Modified: Sun, 21 Jul 2019 08:01:20 GMT
+# Last-Modified: Sun, 28 Jul 2019 08:01:39 GMT
# http://standards-oui.ieee.org/oui/oui.csv:
-# Content-Length: 2388285
-# Last-Modified: Sun, 21 Jul 2019 08:03:41 GMT
+# Content-Length: 2391952
+# Last-Modified: Sun, 28 Jul 2019 08:04:06 GMT
# http://standards-oui.ieee.org/oui28/mam.csv:
-# Content-Length: 284447
-# Last-Modified: Sun, 21 Jul 2019 08:01:48 GMT
+# Content-Length: 286888
+# Last-Modified: Sun, 28 Jul 2019 08:02:07 GMT
# http://standards-oui.ieee.org/oui36/oui36.csv:
-# Content-Length: 296927
-# Last-Modified: Sun, 21 Jul 2019 08:03:12 GMT
+# Content-Length: 298555
+# Last-Modified: Sun, 28 Jul 2019 08:03:33 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
@@ -17277,6 +17277,7 @@
04:0A:83 Alcatel- Alcatel-Lucent
04:0A:E0 XmitComp Xmit Ag Computer Networks
04:0C:CE Apple Apple, Inc.
+04:0E:3C Hp HP Inc.
04:0E:C2 Viewsoni ViewSonic Mobile China Limited
04:15:52 Apple Apple, Inc.
04:15:D9 Viwone
@@ -17424,7 +17425,9 @@
04:AC:44 HoltekSe Holtek Semiconductor Inc.
04:B0:E7 HuaweiTe Huawei Technologies Co.,Ltd
04:B1:67 XiaomiCo Xiaomi Communications Co Ltd
+04:B1:A1 SamsungE Samsung Electronics Co.,Ltd
04:B3:B6 SeamapUk Seamap (UK) Ltd
+04:B4:29 SamsungE Samsung Electronics Co.,Ltd
04:B4:66 Bsp BSP Co., Ltd.
04:B6:48 Zenner
04:BA:36 LiSengTe Li Seng Technology Ltd
@@ -17915,6 +17918,7 @@
0C:2A:E7 BeijingG Beijing General Research Institute of Mining and Metallurgy
0C:2C:54 HuaweiTe Huawei Technologies Co.,Ltd
0C:2D:89 QiiqComm QiiQ Communications Inc.
+0C:2F:B0 SamsungE Samsung Electronics Co.,Ltd
0C:30:21 Apple Apple, Inc.
0C:37:47 Zte zte corporation
0C:37:DC HuaweiTe Huawei Technologies Co.,Ltd
@@ -18357,12 +18361,20 @@
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:10:00:00/28 AbbSwitz ABB Switzerland Ltd.
+10:DC:B6:20:00:00/28 Cal-Comp Cal-Comp Industria E Comercio De Eletronicos E Informatica Ltda
10:DC:B6:30:00:00/28 Hanacns
10:DC:B6:40:00:00/28 Annapurn Annapurna labs
+10:DC:B6:50:00:00/28 Milesigh Milesight Taiwan
+10:DC:B6:60:00:00/28 ProlanZr Prolan Zrt.
+10:DC:B6:70:00:00/28 MoyaComm Moya Commumication Technology (Shenzhen) Co.,Ltd.
+10:DC:B6:80:00:00/28 SanofiBe Sanofi (Beijing) Pharmaceutical Co., Ltd.
+10:DC:B6:90:00:00/28 FuzhouRo Fuzhou Rockchip Electronics Co.,Ltd
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:DC:B6:E0:00:00/28 Shenzhen Shenzhen Sunwoda intelligent hardware Co.,Ltd
10:DD:B1 Apple Apple, Inc.
10:DD:F4 MaxwayEl Maxway Electronics CO.,LTD
10:DE:E4 Automati automationNEXT GmbH
@@ -18838,6 +18850,7 @@
18:CF:24 HuaweiTe Huawei Technologies Co.,Ltd
18:CF:5E LiteonTe Liteon Technology Corporation
18:D0:71 Dasan Dasan Co., Ltd.
+18:D0:C5 Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
18:D2:25 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
18:D2:76 HuaweiTe Huawei Technologies Co.,Ltd
18:D5:B6 SmgHoldi SMG Holdings LLC
@@ -18873,6 +18886,7 @@
18:F6:50 Multimed Multimedia Pacific Limited
18:F7:6B Zhejiang Zhejiang Winsight Technology CO.,LTD
18:F8:7A I3Intern i3 International Inc.
+18:F9:C4 Bae BAE Systems
18:FA:6F IscAppli ISC applied systems corp
18:FB:7B Dell Dell Inc.
18:FC:9F ChangheE Changhe Electronics Co., Ltd.
@@ -19801,6 +19815,7 @@
28:51:32 Shenzhen Shenzhen Prayfly Technology Co.,Ltd
28:52:61 Cisco Cisco Systems, Inc
28:52:E0 LayonInt Layon international Electronic & Telecom Co.,Ltd
+28:52:F9 Zhongxin Zhongxin Intelligent Times (Shenzhen) Co., Ltd.
28:56:5A HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
28:56:C1 HarmanIn Harman International
28:57:67 DishTech Dish Technologies Corp
@@ -20434,6 +20449,7 @@
30:6A:85 SamsungE Samsung Electronics Co.,Ltd
30:6C:BE Skymotio Skymotion Technology (HK) Limited
30:6E:5C ValidusT Validus Technologies
+30:6F:07 NationsT Nations Technologies Inc.
30:71:B2 Hangzhou Hangzhou Prevail Optoelectronic Equipment Co.,LTD.
30:73:50 InpecoSa Inpeco SA
30:74:96 HuaweiTe Huawei Technologies Co.,Ltd
@@ -20795,6 +20811,7 @@
34:D2:70 AmazonTe Amazon Technologies Inc.
34:D2:C4 RenaPrin RENA GmbH Print Systeme
34:D7:12 Smartisa Smartisan Digital Co., Ltd
+34:D7:72 XiamenYu Xiamen Yudian Automation Technology Co., Ltd
34:D7:B4 Tributar Tributary Systems, Inc.
34:D9:54 Wibotic WiBotic Inc.
34:DA:B7 Zte zte corporation
@@ -22439,6 +22456,7 @@
44:F4:59 SamsungE Samsung Electronics Co.,Ltd
44:F4:77 JuniperN Juniper Networks
44:F8:49 UnionPac Union Pacific Railroad
+44:F9:71 Shenzhen Shenzhen Mercury Communication Technologies Co.,Ltd.
44:FB:42 Apple Apple, Inc.
44:FB:5A Zte zte corporation
44:FD:A3 Everysig Everysight LTD.
@@ -22564,6 +22582,7 @@
48:75:83 Intellio Intellion AG
48:76:04 Private
48:77:46 Calix Calix Inc.
+48:79:4D SamsungE Samsung Electronics Co.,Ltd
48:7A:55 AleInter ALE International
48:7A:DA Hangzhou Hangzhou H3C Technologies Co., Limited
48:7B:6B HuaweiTe Huawei Technologies Co.,Ltd
@@ -23403,6 +23422,19 @@
54:A2:74 Cisco Cisco Systems, Inc
54:A3:1B Shenzhen Shenzhen Linkworld Technology Co,.LTD
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: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: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: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
@@ -24084,6 +24116,7 @@
60:A9:B0 Merchand Merchandising Technologies, Inc
60:AB:14 LgInnote LG Innotek
60:AB:67 XiaomiCo Xiaomi Communications Co Ltd
+60:AB:D2 Bose Bose Corporation
60:AC:C8 Kunteng KunTeng Inc.
60:AF:6D SamsungE Samsung Electronics Co.,Ltd
60:B1:85 AthSyste ATH system
@@ -24389,6 +24422,7 @@
64:F8:8A ChinaMob China Mobile IOT Company Limited
64:F9:70 KenadeEl Kenade Electronics Technology Co.,LTD.
64:F9:87 Avvasi Avvasi Inc.
+64:F9:C0 AnalogDe Analog Devices
64:FB:50 Roomread RoomReady/Zdi, Inc.
64:FB:81 IeeeRegi IEEE Registration Authority
64:FB:81:00:00:00/28 Shanghai Shanghai Simcom Limited
@@ -24571,6 +24605,7 @@
68:B9:83 B-Plus b-plus GmbH
68:BC:0C Cisco Cisco Systems, Inc
68:BD:AB Cisco Cisco Systems, Inc
+68:BF:C4 SamsungE Samsung Electronics Co.,Ltd
68:C4:4D Motorola Motorola Mobility LLC, a Lenovo Company
68:C6:3A Espressi Espressif Inc.
68:C9:0B TexasIns Texas Instruments
@@ -24643,6 +24678,7 @@
6C:18:11 DecaturE Decatur Electronics
6C:19:8F D-LinkIn D-Link International
6C:19:C0 Apple Apple, Inc.
+6C:1C:71 Zhejiang Zhejiang Dahua Technology Co., Ltd.
6C:1D:EB U-Blox u-blox AG
6C:1E:70 Guangzho Guangzhou YBDS IT Co.,Ltd
6C:1E:90 HansolTe Hansol Technics Co., Ltd.
@@ -25140,6 +25176,7 @@
70:B3:D5:06:30:00/36 Pooldigi PoolDigital GmbH & Co. KG
70:B3:D5:06:40:00/36 Precisio Ab Precision (Poole) Ltd
70:B3:D5:06:60:00/36 NorthPol North Pole Engineering, Inc.
+70:B3:D5:06:70:00/36 NeopathI Neopath Integrated Systems Ltda
70:B3:D5:06:80:00/36 Onethinx Onethinx BV
70:B3:D5:06:90:00/36 Ondemand ONDEMAND LABORATORY Co., Ltd.
70:B3:D5:06:B0:00/36 U-Tech
@@ -25690,6 +25727,7 @@
70:B3:D5:31:D0:00/36 AvaMonit AVA Monitoring AB
70:B3:D5:31:E0:00/36 Gillam-F Gillam-Fei S.A.
70:B3:D5:31:F0:00/36 Elcoma
+70:B3:D5:32:00:00/36 Cynix CYNIX Systems Inc
70:B3:D5:32:30:00/36 TattileS Tattile Srl
70:B3:D5:32:40:00/36 ThalesNe Thales Nederland BV
70:B3:D5:32:50:00/36 Bluemark BlueMark Innovations BV
@@ -25756,6 +25794,7 @@
70:B3:D5:36:F0:00/36 Buddygua BuddyGuard GmbH
70:B3:D5:37:00:00/36 Inphi Inphi Corporation
70:B3:D5:37:10:00/36 Bederov BEDEROV GmbH
+70:B3:D5:37:20:00/36 Matelex
70:B3:D5:37:40:00/36 OooNppMa OOO NPP Mars-Energo
70:B3:D5:37:50:00/36 AdelSyst Adel System srl
70:B3:D5:37:60:00/36 Private
@@ -25885,6 +25924,7 @@
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: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
70:B3:D5:42:10:00/36 NorthSta North Star Bestech Co.,
70:B3:D5:42:60:00/36 ZehnderG Zehnder Group Nederland
@@ -25976,6 +26016,7 @@
70:B3:D5:49:90:00/36 Pycom Pycom Ltd
70:B3:D5:49:A0:00/36 HaxeSyst Haxe Systeme
70:B3:D5:49:B0:00/36 AlgodueE Algodue Elettronica Srl
+70:B3:D5:49:D0:00/36 Shenzhen Shenzhen Chanslink Network Technology Co., Ltd
70:B3:D5:49:E0:00/36 CaptempL CAPTEMP, Lda
70:B3:D5:49:F0:00/36 BPASrl B.P.A. Srl
70:B3:D5:4A:00:00/36 Fludia
@@ -26007,6 +26048,7 @@
70:B3:D5:4B:C0:00/36 Tiama
70:B3:D5:4B:D0:00/36 BoulderA Boulder Amplifiers, Inc.
70:B3:D5:4B:E0:00/36 Gy-FxSas Gy-Fx Sas
+70:B3:D5:4B:F0:00/36 ExsomCom Exsom Computers LLC
70:B3:D5:4C:00:00/36 Technica Technica Engineering GmbH
70:B3:D5:4C:10:00/36 QuercusT Quercus Technologies, S. L.
70:B3:D5:4C:20:00/36 HeraLabo hera Laborsysteme GmbH
@@ -26082,6 +26124,7 @@
70:B3:D5:52:50:00/36 Plantiga Plantiga Technologies Inc
70:B3:D5:52:60:00/36 FlownetL FlowNet LLC
70:B3:D5:52:80:00/36 AplexTec Aplex Technology Inc.
+70:B3:D5:52:A0:00/36 Dataflex Dataflex International BV
70:B3:D5:52:B0:00/36 GeAviati GE Aviation Cheltenham
70:B3:D5:52:C0:00/36 Centurya Centuryarks Ltd.,
70:B3:D5:52:D0:00/36 TanakaEl Tanaka Electric Industry Co., Ltd.
@@ -26366,6 +26409,7 @@
70:B3:D5:6A:60:00/36 WowSyste WOW System
70:B3:D5:6A:80:00/36 VitschEl Vitsch Electronics
70:B3:D5:6A:90:00/36 OhmoriEl Ohmori Electric Industries Co.Ltd
+70:B3:D5:6A:B0:00/36 ArrowChi Arrow (China) Electronics Trading Co., Ltd.
70:B3:D5:6A:D0:00/36 Connit
70:B3:D5:6A:F0:00/36 Sensorbe Sensorberg GmbH
70:B3:D5:6B:00:00/36 Ptype PTYPE Co., LTD.
@@ -26376,6 +26420,7 @@
70:B3:D5:6B:60:00/36 Inradios INRADIOS GmbH
70:B3:D5:6B:70:00/36 Grossenb Grossenbacher Systeme AG
70:B3:D5:6B:80:00/36 Bt9
+70:B3:D5:6B:90:00/36 BectonDi Becton Dickinson
70:B3:D5:6B:A0:00/36 Integrot Integrotech sp. z o.o.
70:B3:D5:6B:B0:00/36 Luceo
70:B3:D5:6B:C0:00/36 EaElektr EA Elektroautomatik GmbH & Co. KG
@@ -26587,6 +26632,7 @@
70:B3:D5:7B:80:00/36 Serenerg SerEnergy A/S
70:B3:D5:7B:90:00/36 QiagenIn QIAGEN Instruments AG
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:F0:00/36 StoneThr Stone Three
70:B3:D5:7C:00:00/36 Torgovyy Torgovyy Dom Tehnologiy Llc
@@ -26657,6 +26703,7 @@
70:B3:D5:81:10:00/36 Cjsc«Int Cjsc «Interset»
70:B3:D5:81:30:00/36 WavemedS Wavemed srl
70:B3:D5:81:40:00/36 Ingenieu Ingenieurbuero SOMTRONIK
+70:B3:D5:81:50:00/36 WacoGike Waco Giken Co., Ltd.
70:B3:D5:81:60:00/36 SmithMet Smith Meter, Inc.
70:B3:D5:81:70:00/36 AplexTec Aplex Technology Inc.
70:B3:D5:81:80:00/36 Crde
@@ -26794,6 +26841,7 @@
70:B3:D5:8C:80:00/36 Kronotec Kronotech Srl
70:B3:D5:8C:A0:00/36 AlliedDa Allied Data Systems
70:B3:D5:8C:B0:00/36 Welt WELT Corporation
+70:B3:D5:8C:C0:00/36 PiranhaE Piranha EMS Inc.
70:B3:D5:8C:D0:00/36 EaElektr EA Elektroautomatik GmbH & Co. KG
70:B3:D5:8C:E0:00/36 Cores CORES Corporation
70:B3:D5:8C:F0:00/36 Dainichi Dainichi Denshi Co.,LTD
@@ -27000,6 +27048,7 @@
70:B3:D5:9D:E0:00/36 System11 System 11 Sp. z o.o.
70:B3:D5:9D:F0:00/36 DobeComp DOBE Computing
70:B3:D5:9E:00:00/36 EsIndust ES Industrial Systems Co., Ltd.
+70:B3:D5:9E:10:00/36 BolideTe Bolide Technology Group, Inc.
70:B3:D5:9E:20:00/36 OfilUsa Ofil USA
70:B3:D5:9E:30:00/36 LgElectr LG Electronics
70:B3:D5:9E:60:00/36 BlocksiL Blocksi Llc
@@ -27425,6 +27474,7 @@
70:B3:D5:BF:30:00/36 Cg-Wirel Cg-Wireless
70:B3:D5:BF:50:00/36 AcaciaRe Acacia Research
70:B3:D5:BF:60:00/36 Comtac comtac AG
+70:B3:D5:BF:80:00/36 RchItali Rch Italia Spa
70:B3:D5:BF:90:00/36 OkolabSr Okolab Srl
70:B3:D5:BF:A0:00/36 NesaSrl Nesa Srl
70:B3:D5:BF:B0:00/36 Sensor42 Sensor 42
@@ -27638,6 +27688,7 @@
70:B3:D5:D1:10:00/36 EreeElec EREE Electronique
70:B3:D5:D1:20:00/36 Fideltro Fideltronik Poland Sp. Z O.O.
70:B3:D5:D1:50:00/36 3DgenceS 3DGence sp. z o.o.
+70:B3:D5:D1:60:00/36 Monnit Monnit Corporation
70:B3:D5:D1:A0:00/36 Monnit Monnit Corporation
70:B3:D5:D1:B0:00/36 GrupoEpe Grupo Epelsa S.L.
70:B3:D5:D1:C0:00/36 Speciali Specialised Imaging Limited
@@ -27783,6 +27834,7 @@
70:B3:D5:DD:20:00/36 Insitu Insitu, Inc
70:B3:D5:DD:30:00/36 Vitec
70:B3:D5:DD:50:00/36 Cooltera Cooltera Limited
+70:B3:D5:DD:60:00/36 Umweltan Umweltanalytik Holbach GmbH
70:B3:D5:DD:70:00/36 DetectAu DETECT Australia
70:B3:D5:DD:80:00/36 Emscan EMSCAN Corp.
70:B3:D5:DD:90:00/36 ManimaTe MaNima Technologies BV
@@ -27962,6 +28014,7 @@
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:50:00/36 TattileS Tattile Srl
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.Ş.
@@ -28360,6 +28413,7 @@
74:38:89 AnnaxAnz ANNAX Anzeigesysteme GmbH
74:38:B7 Canon Canon Inc.
74:3A:65 Nec NEC Corporation
+74:3C:18 TaicangT Taicang T&W Electronics
74:3E:2B RuckusWi Ruckus Wireless
74:3E:CB Gentrice Gentrice tech
74:40:BB HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
@@ -28467,6 +28521,7 @@
74:9D:DC 2Wire 2Wire Inc
74:9E:A5 Ohsung
74:9E:AF Apple Apple, Inc.
+74:9E:F5 SamsungE Samsung Electronics Co.,Ltd
74:A0:2F Cisco Cisco Systems, Inc
74:A0:63 HuaweiTe Huawei Technologies Co.,Ltd
74:A2:E6 Cisco Cisco Systems, Inc
@@ -29629,6 +29684,7 @@
84:96:D8 ArrisGro ARRIS Group, Inc.
84:97:B8 Memjet Memjet Inc.
84:98:66 SamsungE Samsung Electronics Co.,Ltd
+84:9A:40 Hangzhou Hangzhou Hikvision Digital Technology Co.,Ltd.
84:9C:A6 Arcadyan Arcadyan Technology Corporation
84:9D:64 Smc SMC Corporation
84:9D:C5 CenteraP Centera Photonics Inc.
@@ -30020,6 +30076,7 @@
8A:DA:26 Eleven Eleven Inc.
8A:FB:16 Terabyte TeraByte, Inc.
8C:00:6D Apple Apple, Inc.
+8C:02:FA Commando COMMANDO Networks Limited
8C:04:BA Dell Dell Inc.
8C:04:FF Technico Technicolor CH USA Inc.
8C:05:51 Koubachi Koubachi AG
@@ -30240,6 +30297,7 @@
8C:C6:61 CurrentP Current, powered by GE
8C:C7:AA RadinetC Radinet Communications Inc.
8C:C7:D0 Zhejiang zhejiang ebang communication co.,ltd
+8C:C8:4B Chongqin Chongqing Fugui Electronics Co.,Ltd.
8C:C8:CD SamsungE Samsung Electronics Co.,Ltd
8C:C8:F4 IeeeRegi IEEE Registration Authority
8C:C8:F4:00:00:00/28 Guardtec Guardtec,Inc
@@ -31860,6 +31918,7 @@ A4:C3:F0 IntelCor Intel Corporate
A4:C4:94 IntelCor Intel Corporate
A4:C6:4F HuaweiTe Huawei Technologies Co.,Ltd
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:CF:12 Espressi Espressif Inc.
@@ -32017,6 +32076,7 @@ A8:5B:78 Apple Apple, Inc.
A8:5B:B0 Shenzhen Shenzhen Dehoo Technology Co.,Ltd
A8:5B:F3 Audivo Audivo GmbH
A8:5C:2C Apple Apple, Inc.
+A8:5E:45 AsustekC ASUSTek COMPUTER INC.
A8:5E:E4 12SidedT 12Sided Technology, LLC
A8:60:B6 Apple Apple, Inc.
A8:61:0A Arduino Arduino Ag
@@ -32666,6 +32726,7 @@ B0:FE:BD Private
B4:00:16 Ingenico Ingenico Terminals Sas
B4:00:9C Cablewor CableWorld Ltd.
B4:01:42 GciScien GCI Science & Technology Co.,LTD
+B4:02:16 Cisco Cisco Systems, Inc
B4:04:18 Smartchi Smartchip Integrated Inc.
B4:05:5D InspurEl Inspur Electronic Information Industry Co.,Ltd.
B4:05:66 SpBest SP Best Corporation Co., LTD.
@@ -33144,6 +33205,7 @@ B8:F6:B1 Apple Apple, Inc.
B8:F7:32 AryakaNe Aryaka Networks Inc
B8:F7:4A Rcntec
B8:F8:28 Changshu Changshu Gaoshida Optoelectronic Technology Co. Ltd.
+B8:F8:53 Arcadyan Arcadyan Corporation
B8:F8:83 Tp-LinkT Tp-Link Technologies Co.,Ltd.
B8:F8:BE Bluecom
B8:F9:34 SonyMobi Sony Mobile Communications Inc
@@ -33618,6 +33680,7 @@ C0:D9:62 AskeyCom Askey Computer Corp
C0:D9:F7 Shandong ShanDong Domor Intelligent S&T CO.,Ltd
C0:DA:74 Hangzhou Hangzhou Sunyard Technology Co., Ltd.
C0:DC:6A QingdaoE Qingdao Eastsoft Communication Technology Co.,LTD
+C0:DC:DA SamsungE Samsung Electronics Co.,Ltd
C0:DF:77 ConradEl Conrad Electronic SE
C0:E4:22 TexasIns Texas Instruments
C0:E4:2D Tp-LinkT Tp-Link Technologies Co.,Ltd.
@@ -33847,6 +33910,7 @@ C4:E3:9F Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
C4:E5:06 PiperNet Piper Networks, Inc.
C4:E5:10 Mechatro Mechatro, Inc.
C4:E7:BE Scspro SCSpro Co.,Ltd
+C4:E9:0A D-LinkIn D-Link International
C4:E9:2F Sciex AB Sciex
C4:E9:84 Tp-LinkT Tp-Link Technologies Co.,Ltd.
C4:EA:1D Technico Technicolor
@@ -34245,6 +34309,7 @@ CC:40:D0 Netgear
CC:43:E3 TrumpSA Trump s.a.
CC:44:63 Apple Apple, Inc.
CC:46:39 Waav WAAV, Inc.
+CC:46:4E SamsungE Samsung Electronics Co.,Ltd
CC:46:D6 Cisco Cisco Systems, Inc
CC:47:03 Intercon Intercon Systems Co., Ltd.
CC:4A:E1 Fourtec- fourtec -Fourier Technologies
@@ -34849,6 +34914,7 @@ D4:72:08 Bragi Bragi GmbH
D4:72:26 Zte zte corporation
D4:74:1B BeijingH Beijing HuaDa ZhiBao Electronic System Co.,Ltd.
D4:76:EA Zte zte corporation
+D4:77:2B NanjingZ Nanjing Ztlink Network Technology Co.,Ltd
D4:78:56 Avaya Avaya Inc
D4:78:9B Cisco Cisco Systems, Inc
D4:79:C3 Camerone Cameronet GmbH & Co. KG
@@ -34989,6 +35055,7 @@ D8:06:D1 Honeywel Honeywell Fire System (Shanghai) Co,. Ltd.
D8:08:31 SamsungE Samsung Electronics Co.,Ltd
D8:08:F5 ArcadiaN Arcadia Networks Co. Ltd.
D8:09:C3 Cercacor Cercacor Labs
+D8:0B:9A SamsungE Samsung Electronics Co.,Ltd
D8:0C:CF CGVSAS C.G.V. S.A.S.
D8:0D:17 Tp-LinkT Tp-Link Technologies Co.,Ltd.
D8:0D:E3 FxiTechn Fxi Technologies As
@@ -35678,6 +35745,7 @@ E0:CC:7A HuaweiTe Huawei Technologies Co.,Ltd
E0:CD:FD BeijingE Beijing E3Control Technology Co, LTD
E0:CE:C3 AskeyCom Askey Computer Corp
E0:CF:2D Gemintek Gemintek Corporation
+E0:D0:83 SamsungE Samsung Electronics Co.,Ltd
E0:D1:0A Katouden Katoudenkikougyousyo co ltd
E0:D1:73 Cisco Cisco Systems, Inc
E0:D1:E6 AliphDba Aliph dba Jawbone
@@ -36442,7 +36510,7 @@ F0:24:75 Apple Apple, Inc.
F0:25:72 Cisco Cisco Systems, Inc
F0:25:B7 SamsungE Samsung Electro-Mechanics(Thailand)
F0:26:24 WafaTech Wafa Technologies Co., Ltd.
-F0:26:4C DrSigris Dr. Sigrist AG
+F0:26:4C Sigrist- Sigrist-Photometer AG
F0:27:2D AmazonTe Amazon Technologies Inc.
F0:27:45 F-Secure F-Secure Corporation
F0:27:65 MurataMa Murata Manufacturing Co., Ltd.
@@ -37044,6 +37112,7 @@ F8:81:1A Overkiz
F8:84:79 YaojinTe Yaojin Technology(Shenzhen)Co.,Ltd
F8:84:F2 SamsungE Samsung Electronics Co.,Ltd
F8:87:F1 Apple Apple, Inc.
+F8:89:3C Inventec Inventec Appliances Corp.
F8:8A:3C IeeeRegi IEEE Registration Authority
F8:8A:3C:00:00:00/28 Art Art Spa
F8:8A:3C:10:00:00/28 Carefree Carefree of Colorado
@@ -37082,6 +37151,7 @@ F8:99:55 Fortress Fortress Technology Inc
F8:9A:78 HuaweiTe Huawei Technologies Co.,Ltd
F8:9D:0D ControlT Control Technology Inc.
F8:9D:BB Tintri
+F8:9E:28 CiscoMer Cisco Meraki
F8:9F:B8 YazakiEn YAZAKI Energy System Corporation
F8:A0:3D DinstarT Dinstar Technologies Co., Ltd.
F8:A0:97 ArrisGro ARRIS Group, Inc.
@@ -37136,6 +37206,7 @@ F8:C2:88 Cisco Cisco Systems, Inc
F8:C3:72 TsuzukiD Tsuzuki Denki
F8:C3:97 Nzxt NZXT Corp. Ltd.
F8:C3:9E HuaweiTe Huawei Technologies Co.,Ltd
+F8:C4:F3 Shanghai Shanghai Infinity Wireless Technologies Co.,Ltd.
F8:C6:78 Carefusi Carefusion
F8:C9:6C Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
F8:CA:59 NetcommW NetComm Wireless
diff --git a/services b/services
index b25869d3c9..584f28644d 100644
--- a/services
+++ b/services
@@ -5309,6 +5309,7 @@ mc-appserver 8763/tcp/udp # MC-APPSERVER
openqueue 8764/tcp/udp # OPENQUEUE
ultraseek-http 8765/tcp/udp # Ultraseek HTTP
amcs 8766/tcp/udp # Agilent Connectivity Service
+core-of-source 8767/tcp # Online mobile multiplayer game
dpap 8770/tcp/udp # Digital Photo Access Protocol (iPhoto)
uec 8778/tcp # Stonebranch Universal Enterprise Controller
msgclnt 8786/tcp/udp # Message Client
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 552e231d41..b844399246 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1768,6 +1768,13 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
</context>
<context>
+ <name>CopyFromProfileMenu</name>
+ <message>
+ <source>System default</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CredentialsDialog</name>
<message>
<source>Wireshark - Credentials</source>
@@ -5680,7 +5687,11 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>Import</source>
- <translation type="unfinished">Importieren</translation>
+ <translation>Importieren</translation>
+ </message>
+ <message>
+ <source>Export</source>
+ <translation type="unfinished">Exportieren</translation>
</message>
<message>
<source>New</source>
@@ -8555,19 +8566,25 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>Import</source>
- <translation type="unfinished">Importieren</translation>
+ <translation type="vanished">Importieren</translation>
</message>
<message>
<source>Configuration Profiles</source>
<translation>Profile konfigurieren</translation>
</message>
<message>
- <source>All Profiles</source>
- <translation>Alle Profile</translation>
+ <source>Import</source>
+ <comment>noun</comment>
+ <translation type="unfinished">Importieren</translation>
+ </message>
+ <message>
+ <source>Export</source>
+ <comment>noun</comment>
+ <translation type="unfinished">Exportieren</translation>
</message>
<message>
- <source>Global profiles</source>
- <translation type="vanished">Globale Profile</translation>
+ <source>All Profiles</source>
+ <translation>Alle Profile</translation>
</message>
<message>
<source>User-defined profiles</source>
@@ -8575,6 +8592,10 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>System profiles</source>
+ <translation>Systemprofile</translation>
+ </message>
+ <message>
+ <source>An import of profiles is not allowed, while changes are pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8586,41 +8607,78 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Profil Fehler</translation>
</message>
<message>
+ <source>Exporting profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>No profiles found for export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Select zip file for export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <source>%Ln profile(s) have been exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </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>Zum Importieren eine Zipdatei auswählen</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>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Zip File (*.zip)</source>
- <translation type="unfinished"></translation>
+ <translation>Zipdatei (*.zip)</translation>
</message>
<message>
<source>No profiles found for import in %1</source>
- <translation type="unfinished"></translation>
+ <translation>Keine Profile unter %1 zum Importieren gefunden</translation>
</message>
<message>
<source>, %1 profile(s) skipped</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">, %1 Profil(e) übersprungen</translation>
</message>
<message>
<source>Importing profiles</source>
- <translation type="unfinished"></translation>
+ <translation>Profile importieren</translation>
</message>
<message>
<source>One profile has been imported</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Ein Profil wurde importiert</translation>
</message>
<message>
<source>%1 profiles have been imported</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">%1 Profile wurden importiert</translation>
</message>
</context>
<context>
<name>ProfileModel</name>
<message>
- <source>Global</source>
- <translation type="vanished">Global</translation>
- </message>
- <message>
<source>User</source>
<translation>Benutzer</translation>
</message>
@@ -8637,36 +8695,65 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Kopiert von:</translation>
</message>
<message>
+ <source>system provided</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>deleted</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>copy</source>
+ <comment>noun</comment>
+ <translation type="unfinished">Kopieren</translation>
+ </message>
+ <message>
+ <source>Exporting profiles while changes are pending is not allowed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>No profiles found to export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>A profile name cannot contain the following characters: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>A profile name cannot contain the &apos;/&apos; character.</source>
+ <translation type="unfinished"></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>Auf Ausgangswerte zurücksetzen</translation>
+ <translation type="vanished">Auf Ausgangswerte zurücksetzen</translation>
</message>
<message>
<source>Created from %1</source>
- <translation>Erstellt von %1</translation>
+ <translation type="vanished">Erstellt von %1</translation>
</message>
<message>
<source>(system provided)</source>
- <translation>(vom System vorgegeben)</translation>
+ <translation type="vanished">(vom System vorgegeben)</translation>
</message>
<message>
<source>(deleted)</source>
- <translation>(gelöscht)</translation>
- </message>
- <message>
- <source>Renamed from %1</source>
- <translation type="vanished">Umbenannt von %1</translation>
+ <translation type="vanished">(gelöscht)</translation>
</message>
<message>
<source>Default</source>
- <translation type="unfinished">Standard</translation>
+ <translation>Standard</translation>
</message>
<message>
<source>System</source>
- <translation type="unfinished">System</translation>
+ <translation>System</translation>
</message>
<message>
<source>Renamed from: </source>
- <translation type="unfinished"></translation>
+ <translation>Umbenannt von:</translation>
</message>
<message>
<source>This is a system provided profile.</source>
@@ -8674,7 +8761,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>The profile will be reset to default values.</source>
- <translation>Das Profil wird auf den Ausgangswert zurückgesetzt.</translation>
+ <translation type="vanished">Das Profil wird auf den Ausgangswert zurückgesetzt.</translation>
</message>
<message>
<source>A profile already exists with this name.</source>
@@ -8682,7 +8769,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>A profile already exists with this name</source>
- <translation>Ein Profil mit diesem Namen existiert bereits</translation>
+ <translation type="vanished">Ein Profil mit diesem Namen existiert bereits</translation>
</message>
<message>
<source>Profile</source>
@@ -8694,19 +8781,19 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>Path</source>
- <translation>Pfad</translation>
+ <translation type="vanished">Pfad</translation>
</message>
<message>
<source>copy</source>
- <translation>Kopieren</translation>
+ <translation type="vanished">Kopieren</translation>
</message>
<message>
<source>A profile must not contain any of the following characters: %1</source>
- <translation>Ein Profil darf keines der folgenden Zeichen enthalten: %1</translation>
+ <translation type="vanished">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>Ein Profil darf nicht mit einem Punkt (.) beginnen oder enden</translation>
+ <translation type="vanished">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 ea884a7c50..a95a87c640 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1765,6 +1765,13 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>CopyFromProfileMenu</name>
+ <message>
+ <source>System default</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CredentialsDialog</name>
<message>
<source>Wireshark - Credentials</source>
@@ -5624,6 +5631,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>Export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation type="unfinished"></translation>
@@ -8493,11 +8504,17 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Configuration Profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Import</source>
+ <comment>noun</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Configuration Profiles</source>
+ <source>Export</source>
+ <comment>noun</comment>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8513,6 +8530,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>An import of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8521,10 +8542,37 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Exporting profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>No profiles found for export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Select zip file for export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <source>%Ln profile(s) have been exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </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>
<message>
+ <source>Select directory for import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
@@ -8550,14 +8598,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<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>
@@ -8578,71 +8618,64 @@ 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="unfinished"></translation>
- </message>
- <message>
- <source>Created from %1</source>
+ <source>system provided</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(system provided)</source>
+ <source>deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(deleted)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Default</source>
+ <source>copy</source>
+ <comment>noun</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>System</source>
+ <source>Exporting profiles while changes are pending is not allowed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from: </source>
+ <source>No profiles found to export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
+ <source>A profile name cannot contain the &apos;/&apos; character.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
+ <source>A profile cannot start or end with a period (.)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
+ <source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile</source>
+ <source>System</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Type</source>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Path</source>
+ <source>This is a system provided profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>copy</source>
+ <source>A profile already exists with this name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not contain any of the following characters: %1</source>
+ <source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not start or end with a period (.)</source>
+ <source>Type</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index f8f08b7db6..62ca817166 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1744,6 +1744,13 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>CopyFromProfileMenu</name>
+ <message>
+ <source>System default</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CredentialsDialog</name>
<message>
<source>Wireshark - Credentials</source>
@@ -5659,6 +5666,10 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished">Importer</translation>
</message>
<message>
+ <source>Export</source>
+ <translation type="unfinished">Exporter</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Nouveau</translation>
@@ -8524,12 +8535,18 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Copier ce profil.</translation>
</message>
<message>
+ <source>Configuration Profiles</source>
+ <translation>Profils de configuration</translation>
+ </message>
+ <message>
<source>Import</source>
+ <comment>noun</comment>
<translation type="unfinished">Importer</translation>
</message>
<message>
- <source>Configuration Profiles</source>
- <translation>Profils de configuration</translation>
+ <source>Export</source>
+ <comment>noun</comment>
+ <translation type="unfinished">Exporter</translation>
</message>
<message>
<source>All Profiles</source>
@@ -8544,6 +8561,10 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
+ <source>An import of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8552,31 +8573,60 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Erreur de Profil</translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Zip File (*.zip)</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for import in %1</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>%Ln profile(s) have been exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <source>, %1 profile(s) skipped</source>
+ <source>An error has occured while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Importing profiles</source>
+ <source>Select zip file for import</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>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>One profile has been imported</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 profiles have been imported</source>
+ <source>No profiles found for import in %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Importing profiles</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -8599,72 +8649,65 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
- <source>Will be reset to default values</source>
+ <source>system provided</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Created from %1</source>
+ <source>deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(system provided)</source>
+ <source>copy</source>
+ <comment>noun</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(deleted)</source>
+ <source>Exporting profiles while changes are pending is not allowed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Default</source>
+ <source>No profiles found to export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>System</source>
+ <source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from: </source>
+ <source>A profile name cannot contain the &apos;/&apos; character.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>A profile cannot start or end with a period (.)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>A profile already exists with this name.</source>
+ <source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
+ <source>System</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile</source>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Type</source>
- <translation type="unfinished">Type</translation>
- </message>
- <message>
- <source>Path</source>
+ <source>This is a system provided profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>copy</source>
+ <source>A profile already exists with this name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not contain any of the following characters: %1</source>
+ <source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not start or end with a period (.)</source>
- <translation type="unfinished"></translation>
+ <source>Type</source>
+ <translation type="unfinished">Type</translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 5305eeed7a..bfa49076d1 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1768,6 +1768,13 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
</context>
<context>
+ <name>CopyFromProfileMenu</name>
+ <message>
+ <source>System default</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CredentialsDialog</name>
<message>
<source>Wireshark - Credentials</source>
@@ -5680,7 +5687,11 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>Import</source>
- <translation type="unfinished">Importa</translation>
+ <translation>Importa</translation>
+ </message>
+ <message>
+ <source>Export</source>
+ <translation type="unfinished">Esporta</translation>
</message>
<message>
<source>New</source>
@@ -8555,19 +8566,25 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>Import</source>
- <translation type="unfinished">Importa</translation>
+ <translation type="vanished">Importa</translation>
</message>
<message>
<source>Configuration Profiles</source>
<translation>Profili di configurazione</translation>
</message>
<message>
- <source>All Profiles</source>
- <translation>Tutti i profili</translation>
+ <source>Import</source>
+ <comment>noun</comment>
+ <translation type="unfinished">Importa</translation>
+ </message>
+ <message>
+ <source>Export</source>
+ <comment>noun</comment>
+ <translation type="unfinished">Esporta</translation>
</message>
<message>
- <source>Global profiles</source>
- <translation type="vanished">Profili globali</translation>
+ <source>All Profiles</source>
+ <translation>Tutti i profili</translation>
</message>
<message>
<source>User-defined profiles</source>
@@ -8575,6 +8592,10 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>System profiles</source>
+ <translation>Profili di sistema</translation>
+ </message>
+ <message>
+ <source>An import of profiles is not allowed, while changes are pending.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -8586,41 +8607,78 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Errore di profilo</translation>
</message>
<message>
+ <source>Exporting profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>No profiles found for export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Select zip file for export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <source>%Ln profile(s) have been exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </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>Seleziona file zip per l&apos;importazione</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>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Zip File (*.zip)</source>
- <translation type="unfinished"></translation>
+ <translation>File Zip (*.zip)</translation>
</message>
<message>
<source>No profiles found for import in %1</source>
- <translation type="unfinished"></translation>
+ <translation>Nessun profilo trovato per l&apos;importazione in %1</translation>
</message>
<message>
<source>, %1 profile(s) skipped</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">, %1 profili saltati</translation>
</message>
<message>
<source>Importing profiles</source>
- <translation type="unfinished"></translation>
+ <translation>Importazione profili</translation>
</message>
<message>
<source>One profile has been imported</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">Un profilo è stato importato</translation>
</message>
<message>
<source>%1 profiles have been imported</source>
- <translation type="unfinished"></translation>
+ <translation type="vanished">%1 profili sono stati importati</translation>
</message>
</context>
<context>
<name>ProfileModel</name>
<message>
- <source>Global</source>
- <translation type="vanished">Globale</translation>
- </message>
- <message>
<source>User</source>
<translation>Utente</translation>
</message>
@@ -8637,36 +8695,65 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Copiato da:</translation>
</message>
<message>
+ <source>system provided</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>deleted</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>copy</source>
+ <comment>noun</comment>
+ <translation type="unfinished">copia</translation>
+ </message>
+ <message>
+ <source>Exporting profiles while changes are pending is not allowed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>No profiles found to export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>A profile name cannot contain the following characters: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>A profile name cannot contain the &apos;/&apos; character.</source>
+ <translation type="unfinished"></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>Sarà ripristinato ai valori predefiniti</translation>
+ <translation type="vanished">Sarà ripristinato ai valori predefiniti</translation>
</message>
<message>
<source>Created from %1</source>
- <translation>Creato da %1</translation>
+ <translation type="vanished">Creato da %1</translation>
</message>
<message>
<source>(system provided)</source>
- <translation>(fornito dal sistema)</translation>
+ <translation type="vanished">(fornito dal sistema)</translation>
</message>
<message>
<source>(deleted)</source>
- <translation>(eliminato)</translation>
- </message>
- <message>
- <source>Renamed from %1</source>
- <translation type="vanished">Rinominato da %1</translation>
+ <translation type="vanished">(eliminato)</translation>
</message>
<message>
<source>Default</source>
- <translation type="unfinished">Predefinito</translation>
+ <translation>Predefinito</translation>
</message>
<message>
<source>System</source>
- <translation type="unfinished">Sistema</translation>
+ <translation>Sistema </translation>
</message>
<message>
<source>Renamed from: </source>
- <translation type="unfinished"></translation>
+ <translation>Rinominato da:</translation>
</message>
<message>
<source>This is a system provided profile.</source>
@@ -8674,7 +8761,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>The profile will be reset to default values.</source>
- <translation>Il profilo sarà ripristinato ai valori predefiniti.</translation>
+ <translation type="vanished">Il profilo sarà ripristinato ai valori predefiniti.</translation>
</message>
<message>
<source>A profile already exists with this name.</source>
@@ -8682,7 +8769,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>A profile already exists with this name</source>
- <translation>Un profilo con questo nome esiste già</translation>
+ <translation type="vanished">Un profilo con questo nome esiste già</translation>
</message>
<message>
<source>Profile</source>
@@ -8694,19 +8781,19 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>Path</source>
- <translation>Percorso</translation>
+ <translation type="vanished">Percorso</translation>
</message>
<message>
<source>copy</source>
- <translation>copia</translation>
+ <translation type="vanished">copia</translation>
</message>
<message>
<source>A profile must not contain any of the following characters: %1</source>
- <translation>Un profilo non deve contenere uno dei seguenti caratteri: %1</translation>
+ <translation type="vanished">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>Un profilo non deve iniziare o finire con un punto (.)</translation>
+ <translation type="vanished">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 027a53bea9..500b8d5bf4 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1330,7 +1330,7 @@
<message>
<source>Switch to the next file when the (wall clock) time is an even multiple of the specified interval.
For example, use 1 hour to have a new file created every hour on the hour.</source>
- <translation type="unfinished"></translation>
+ <translation>(時計の)時刻が特定の間隔になったら次のファイルに切り替えます。例えば、1時間に設定すると毎時1時間ごとに新しいファイルが作成されます</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;After capturing has switched to the next file and the given number of files has exceeded, the oldest file will be removed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -1456,16 +1456,16 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<message>
<source>Multiple files: Requested filesize too large. The filesize cannot be greater than 2 GiB.</source>
<oldsource>Multiple files: Requested filesize too large! The filesize cannot be greater than 2 GiB.</oldsource>
- <translation type="unfinished"></translation>
+ <translation>複数ファイル:要求されたファイルサイズが大きすぎます。ファイルサイズは2GBより大きくできません</translation>
</message>
<message>
<source>Multiple files: No capture file name given. You must specify a filename if you want to use multiple files.</source>
<oldsource>Multiple files: No capture file name given! You must specify a filename if you want to use multiple files.</oldsource>
- <translation type="unfinished"></translation>
+ <translation>複数ファイル:キャプチャファイル名がありません。服すファイルを用いたいのならファイル名を指定しなければなりません</translation>
</message>
<message>
<source>Multiple files: No file limit given. You must specify a file size, interval, or number of packets for each file.</source>
- <translation type="unfinished"></translation>
+ <translation>複数ファイル:ファイル制限がありません。各ファイルのファイルサイズ、間隔、またはパケット数を指定しなければなりません。</translation>
</message>
</context>
<context>
@@ -1492,7 +1492,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Capture packets in pcapng format</source>
- <translation type="unfinished"></translation>
+ <translation>pcapng形式でパケットをキャプチャします</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Update the list of packets while capture is in progress. This can result in dropped packets on high-speed networks.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -1512,18 +1512,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Don&apos;t load interfaces on startup</source>
- <translation type="unfinished"></translation>
+ <translation>起動時にインタフェースを読み込みません</translation>
</message>
<message>
<source>Disable external capture interfaces</source>
- <translation type="unfinished"></translation>
+ <translation>外部キャプチャインタフェースを無効にします</translation>
</message>
</context>
<context>
<name>ColoringRulesDelegate</name>
<message>
<source>the &quot;@&quot; symbol will be ignored.</source>
- <translation type="unfinished"></translation>
+ <translation>&quot;@&quot; シンボルは無視されます</translation>
</message>
</context>
<context>
@@ -1550,7 +1550,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Clear all coloring rules.</source>
- <translation type="unfinished"></translation>
+ <translation>全ての色付けルールをクリアします</translation>
</message>
<message>
<source>Set the foreground color for this rule.</source>
@@ -1570,11 +1570,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Set the display filter using this rule.</source>
- <translation type="unfinished"></translation>
+ <translation>このルールを用いる表示フィルタを設定します</translation>
</message>
<message>
<source>Apply as filter</source>
- <translation type="unfinished"></translation>
+ <translation>フィルタとして適用</translation>
</message>
<message>
<source>Import</source>
@@ -1594,19 +1594,19 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Coloring Rules %1</source>
- <translation type="unfinished"></translation>
+ <translation>色付けルール %1</translation>
</message>
<message>
<source>Copy from</source>
- <translation type="unfinished"></translation>
+ <translation>からコピー</translation>
</message>
<message>
<source>Copy coloring rules from another profile.</source>
- <translation type="unfinished"></translation>
+ <translation>別のプロファイルから色付けルールをコピーします</translation>
</message>
<message>
<source>Open </source>
- <translation type="unfinished">開く </translation>
+ <translation>開く</translation>
</message>
<message>
<source>Double click to edit. Drag to move. Rules are processed in order until a match is found.</source>
@@ -1626,22 +1626,22 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Wireshark doesn&apos;t recognize one or more of your coloring rules. They have been disabled.</source>
- <translation type="unfinished"></translation>
+ <translation>Wiresharkは1つかそれ以上の色分けルールを認識しません。それらは無効とされました。</translation>
</message>
</context>
<context>
<name>ColoringRulesModel</name>
<message>
<source>Unable to save coloring rules: %1</source>
- <translation type="unfinished"></translation>
+ <translation>色付けルール %1 を保存できません</translation>
</message>
<message>
<source>Name</source>
- <translation type="unfinished">名前</translation>
+ <translation>名前</translation>
</message>
<message>
<source>Filter</source>
- <translation type="unfinished">フィルタ</translation>
+ <translation>フィルタ</translation>
</message>
</context>
<context>
@@ -1672,15 +1672,15 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Missing fields.</source>
- <translation type="unfinished"></translation>
+ <translation>見つからないフィールド</translation>
</message>
<message>
<source>Invalid fields.</source>
- <translation type="unfinished"></translation>
+ <translation>無効なフィールド</translation>
</message>
<message>
<source>Invalid occurrence value.</source>
- <translation type="unfinished"></translation>
+ <translation>無効なオカレンス値</translation>
</message>
</context>
<context>
@@ -1756,6 +1756,13 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Conversation Hash Tables</source>
+ <translation>対話ハッシュ表</translation>
+ </message>
+</context>
+<context>
+ <name>CopyFromProfileMenu</name>
+ <message>
+ <source>System default</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1763,11 +1770,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<name>CredentialsDialog</name>
<message>
<source>Wireshark - Credentials</source>
- <translation type="unfinished"></translation>
+ <translation>ワイヤーシャーク - 証明書</translation>
</message>
<message>
<source>Credentials</source>
- <translation type="unfinished"></translation>
+ <translation>証明書</translation>
</message>
</context>
<context>
@@ -1856,7 +1863,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Open </source>
- <translation type="unfinished">開く </translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -2577,7 +2584,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Open </source>
- <translation type="unfinished">開く </translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>New filter</source>
@@ -3591,7 +3598,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Copy from</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">からコピー</translation>
</message>
<message>
<source>Copy graphs from another profile.</source>
@@ -5668,6 +5675,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>Export</source>
+ <translation type="unfinished">エクスポート</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>新規</translation>
@@ -6893,7 +6904,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Credentials</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">証明書</translation>
</message>
<message>
<source>&amp;Options…</source>
@@ -8536,12 +8547,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>このプロファイルをコピーします</translation>
</message>
<message>
+ <source>Configuration Profiles</source>
+ <translation>設定プロファイル</translation>
+ </message>
+ <message>
<source>Import</source>
+ <comment>noun</comment>
<translation type="unfinished">インポート</translation>
</message>
<message>
- <source>Configuration Profiles</source>
- <translation>設定プロファイル</translation>
+ <source>Export</source>
+ <comment>noun</comment>
+ <translation type="unfinished">エクスポート</translation>
</message>
<message>
<source>All Profiles</source>
@@ -8556,6 +8573,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>An import of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8564,31 +8585,57 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>プロファイルエラー</translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Zip File (*.zip)</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for import in %1</source>
+ <source>Select zip file for export</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <source>%Ln profile(s) have been exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>An error has occured while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>, %1 profile(s) skipped</source>
+ <source>Select zip file for import</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>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Importing profiles</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>One profile has been imported</source>
+ <source>No profiles found for import in %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 profiles have been imported</source>
+ <source>Importing profiles</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -8611,72 +8658,65 @@ 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="unfinished"></translation>
- </message>
- <message>
- <source>Created from %1</source>
+ <source>system provided</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(system provided)</source>
+ <source>deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(deleted)</source>
+ <source>copy</source>
+ <comment>noun</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Default</source>
+ <source>Exporting profiles while changes are pending is not allowed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>System</source>
+ <source>No profiles found to export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from: </source>
+ <source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>A profile name cannot contain the &apos;/&apos; character.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
+ <source>A profile cannot start or end with a period (.)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
+ <source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
+ <source>System</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile</source>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Type</source>
- <translation type="unfinished">種別</translation>
- </message>
- <message>
- <source>Path</source>
+ <source>This is a system provided profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>copy</source>
+ <source>A profile already exists with this name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not contain any of the following characters: %1</source>
+ <source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not start or end with a period (.)</source>
- <translation type="unfinished"></translation>
+ <source>Type</source>
+ <translation type="unfinished">種別</translation>
</message>
</context>
<context>
@@ -12682,7 +12722,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Copy from</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">からコピー</translation>
</message>
<message>
<source>Copy entries from another profile.</source>
@@ -12729,7 +12769,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Copy from</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">からコピー</translation>
</message>
<message>
<source>Unknown User Accessible Table</source>
@@ -12737,7 +12777,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Open </source>
- <translation type="unfinished">開く </translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index e22ae83795..364cdb16b2 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1772,6 +1772,13 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>CopyFromProfileMenu</name>
+ <message>
+ <source>System default</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CredentialsDialog</name>
<message>
<source>Wireshark - Credentials</source>
@@ -5689,6 +5696,10 @@ 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>Export</source>
+ <translation type="unfinished">Eksportuj</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Nowy</translation>
@@ -8562,12 +8573,18 @@ 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>Configuration Profiles</source>
+ <translation>Konfiguracja profili</translation>
+ </message>
+ <message>
<source>Import</source>
+ <comment>noun</comment>
<translation type="unfinished">Importuj</translation>
</message>
<message>
- <source>Configuration Profiles</source>
- <translation>Konfiguracja profili</translation>
+ <source>Export</source>
+ <comment>noun</comment>
+ <translation type="unfinished">Eksportuj</translation>
</message>
<message>
<source>All Profiles</source>
@@ -8582,6 +8599,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>An import of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8590,31 +8611,63 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Błąd w profilu</translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Zip File (*.zip)</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for import in %1</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>%Ln profile(s) have been exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <source>, %1 profile(s) skipped</source>
+ <source>An error has occured while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Importing profiles</source>
+ <source>Select zip file for import</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>%Ln profile(s) imported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>, %Ln profile(s) skipped</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <source>One profile has been imported</source>
+ <source>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 profiles have been imported</source>
+ <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>
</context>
@@ -8637,71 +8690,64 @@ 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>
+ <source>system provided</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Created from %1</source>
+ <source>deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(system provided)</source>
+ <source>copy</source>
+ <comment>noun</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(deleted)</source>
+ <source>Exporting profiles while changes are pending is not allowed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Default</source>
- <translation type="unfinished">Domyślnie</translation>
- </message>
- <message>
- <source>System</source>
+ <source>No profiles found to export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from: </source>
+ <source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>A profile name cannot contain the &apos;/&apos; character.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
+ <source>A profile cannot start or end with a period (.)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
- <translation type="unfinished"></translation>
+ <source>Default</source>
+ <translation type="unfinished">Domyślnie</translation>
</message>
<message>
- <source>A profile already exists with this name</source>
+ <source>System</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile</source>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Type</source>
+ <source>This is a system provided profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Path</source>
- <translation type="unfinished">Ścieżka</translation>
- </message>
- <message>
- <source>copy</source>
+ <source>A profile already exists with this name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not contain any of the following characters: %1</source>
+ <source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not start or end with a period (.)</source>
+ <source>Type</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts
index 695de3ca85..95f6459a2a 100644
--- a/ui/qt/wireshark_ru.ts
+++ b/ui/qt/wireshark_ru.ts
@@ -1775,6 +1775,13 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>CopyFromProfileMenu</name>
+ <message>
+ <source>System default</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CredentialsDialog</name>
<message>
<source>Wireshark - Credentials</source>
@@ -5699,6 +5706,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>Export</source>
+ <translation type="unfinished">Экспорт</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Новый</translation>
@@ -8573,12 +8584,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Копировать этот профиль.</translation>
</message>
<message>
+ <source>Configuration Profiles</source>
+ <translation>Конфигурационные Профили</translation>
+ </message>
+ <message>
<source>Import</source>
+ <comment>noun</comment>
<translation type="unfinished">Импорт</translation>
</message>
<message>
- <source>Configuration Profiles</source>
- <translation>Конфигурационные Профили</translation>
+ <source>Export</source>
+ <comment>noun</comment>
+ <translation type="unfinished">Экспорт</translation>
</message>
<message>
<source>All Profiles</source>
@@ -8593,6 +8610,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>An import of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8601,31 +8622,63 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Ошибка Профиля</translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Zip File (*.zip)</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for import in %1</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>%Ln profile(s) have been exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <source>, %1 profile(s) skipped</source>
+ <source>An error has occured while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Importing profiles</source>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <source>%Ln profile(s) imported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>, %Ln profile(s) skipped</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>One profile has been imported</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 profiles have been imported</source>
+ <source>No profiles found for import in %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Importing profiles</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -8648,72 +8701,65 @@ 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>
+ <source>system provided</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Created from %1</source>
+ <source>deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(system provided)</source>
+ <source>copy</source>
+ <comment>noun</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(deleted)</source>
+ <source>Exporting profiles while changes are pending is not allowed</source>
<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: </source>
+ <source>No profiles found to export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
+ <source>A profile name cannot contain the &apos;/&apos; character.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
+ <source>A profile cannot start or end with a period (.)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
- <translation type="unfinished"></translation>
+ <source>Default</source>
+ <translation type="unfinished">По умолчанию</translation>
</message>
<message>
- <source>Profile</source>
- <translation type="unfinished"></translation>
+ <source>System</source>
+ <translation type="unfinished">Системный</translation>
</message>
<message>
- <source>Type</source>
- <translation type="unfinished">Тип</translation>
+ <source>Renamed from: </source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Path</source>
- <translation type="unfinished">Путь</translation>
+ <source>This is a system provided profile.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>copy</source>
+ <source>A profile already exists with this name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not contain any of the following characters: %1</source>
+ <source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not start or end with a period (.)</source>
- <translation type="unfinished"></translation>
+ <source>Type</source>
+ <translation type="unfinished">Тип</translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts
index 3534905e97..31a3c0223a 100644
--- a/ui/qt/wireshark_sv.ts
+++ b/ui/qt/wireshark_sv.ts
@@ -1768,6 +1768,13 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
</message>
</context>
<context>
+ <name>CopyFromProfileMenu</name>
+ <message>
+ <source>System default</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CredentialsDialog</name>
<message>
<source>Wireshark - Credentials</source>
@@ -5683,6 +5690,10 @@ 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>Export</source>
+ <translation type="unfinished">Exportera</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>Ny</translation>
@@ -8554,12 +8565,18 @@ 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>Configuration Profiles</source>
+ <translation>Konfigurationsprofiler</translation>
+ </message>
+ <message>
<source>Import</source>
+ <comment>noun</comment>
<translation type="unfinished">Importera</translation>
</message>
<message>
- <source>Configuration Profiles</source>
- <translation>Konfigurationsprofiler</translation>
+ <source>Export</source>
+ <comment>noun</comment>
+ <translation type="unfinished">Exportera</translation>
</message>
<message>
<source>All Profiles</source>
@@ -8574,6 +8591,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>An import of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8582,31 +8603,60 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Profilfel</translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Zip File (*.zip)</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for import in %1</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>%Ln profile(s) have been exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <source>, %1 profile(s) skipped</source>
+ <source>An error has occured while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Importing profiles</source>
+ <source>Select zip file for import</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>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>One profile has been imported</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 profiles have been imported</source>
+ <source>No profiles found for import in %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Importing profiles</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -8629,72 +8679,65 @@ 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>
+ <source>system provided</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Created from %1</source>
+ <source>deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(system provided)</source>
+ <source>copy</source>
+ <comment>noun</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(deleted)</source>
+ <source>Exporting profiles while changes are pending is not allowed</source>
<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: </source>
+ <source>No profiles found to export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
+ <source>A profile name cannot contain the &apos;/&apos; character.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
+ <source>A profile cannot start or end with a period (.)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
- <translation type="unfinished"></translation>
+ <source>Default</source>
+ <translation type="unfinished">Standard</translation>
</message>
<message>
- <source>Profile</source>
- <translation type="unfinished"></translation>
+ <source>System</source>
+ <translation type="unfinished">System</translation>
</message>
<message>
- <source>Type</source>
- <translation type="unfinished">Typ</translation>
+ <source>Renamed from: </source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Path</source>
- <translation type="unfinished">Sökväg</translation>
+ <source>This is a system provided profile.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>copy</source>
+ <source>A profile already exists with this name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not contain any of the following characters: %1</source>
+ <source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not start or end with a period (.)</source>
- <translation type="unfinished"></translation>
+ <source>Type</source>
+ <translation type="unfinished">Typ</translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts
index ef304c4007..2967d28a0f 100644
--- a/ui/qt/wireshark_uk.ts
+++ b/ui/qt/wireshark_uk.ts
@@ -1748,6 +1748,13 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>CopyFromProfileMenu</name>
+ <message>
+ <source>System default</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CredentialsDialog</name>
<message>
<source>Wireshark - Credentials</source>
@@ -5616,6 +5623,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>Export</source>
+ <translation type="unfinished">Експортувати</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation type="unfinished"></translation>
@@ -8479,12 +8490,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Скопіювати цей профіль.</translation>
</message>
<message>
+ <source>Configuration Profiles</source>
+ <translation>Профілі Конфігурації</translation>
+ </message>
+ <message>
<source>Import</source>
+ <comment>noun</comment>
<translation type="unfinished">Імпортувати</translation>
</message>
<message>
- <source>Configuration Profiles</source>
- <translation>Профілі Конфігурації</translation>
+ <source>Export</source>
+ <comment>noun</comment>
+ <translation type="unfinished">Експортувати</translation>
</message>
<message>
<source>All Profiles</source>
@@ -8499,6 +8516,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>An import of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8507,31 +8528,63 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Помилка Профілю</translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Zip File (*.zip)</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for import in %1</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>%Ln profile(s) have been exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <source>, %1 profile(s) skipped</source>
+ <source>An error has occured while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Importing profiles</source>
+ <source>Select zip file for import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <source>%Ln profile(s) imported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <source>, %Ln profile(s) skipped</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </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>One profile has been imported</source>
+ <source>No profiles found for import in %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 profiles have been imported</source>
+ <source>Importing profiles</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -8554,72 +8607,65 @@ 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>
+ <source>system provided</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Created from %1</source>
+ <source>deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(system provided)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(deleted)</source>
+ <source>copy</source>
+ <comment>noun</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Default</source>
+ <source>Exporting profiles while changes are pending is not allowed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>System</source>
+ <source>No profiles found to export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Renamed from: </source>
+ <source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>A profile name cannot contain the &apos;/&apos; character.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
+ <source>A profile cannot start or end with a period (.)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
+ <source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
+ <source>System</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Profile</source>
+ <source>Renamed from: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Type</source>
- <translation type="unfinished">Тип</translation>
- </message>
- <message>
- <source>Path</source>
+ <source>This is a system provided profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>copy</source>
+ <source>A profile already exists with this name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not contain any of the following characters: %1</source>
+ <source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not start or end with a period (.)</source>
- <translation type="unfinished"></translation>
+ <source>Type</source>
+ <translation type="unfinished">Тип</translation>
</message>
</context>
<context>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 4377bdf354..19a74570b7 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1758,6 +1758,13 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>CopyFromProfileMenu</name>
+ <message>
+ <source>System default</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CredentialsDialog</name>
<message>
<source>Wireshark - Credentials</source>
@@ -5662,6 +5669,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>Export</source>
+ <translation type="unfinished">导出</translation>
+ </message>
+ <message>
<source>New</source>
<oldsource>New...</oldsource>
<translation>新建</translation>
@@ -8529,12 +8540,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>复制该配置文件。</translation>
</message>
<message>
+ <source>Configuration Profiles</source>
+ <translation>配置文件</translation>
+ </message>
+ <message>
<source>Import</source>
+ <comment>noun</comment>
<translation type="unfinished">导入</translation>
</message>
<message>
- <source>Configuration Profiles</source>
- <translation>配置文件</translation>
+ <source>Export</source>
+ <comment>noun</comment>
+ <translation type="unfinished">导出</translation>
</message>
<message>
<source>All Profiles</source>
@@ -8549,6 +8566,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>An import of profiles is not allowed, while changes are pending.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8557,31 +8578,57 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>配置文件错误</translation>
</message>
<message>
- <source>Select zip file for import</source>
+ <source>Exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Zip File (*.zip)</source>
+ <source>No profiles found for export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>No profiles found for import in %1</source>
+ <source>Select zip file for export</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <source>%Ln profile(s) have been exported</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
- <source>, %1 profile(s) skipped</source>
+ <source>An error has occured while exporting profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Importing profiles</source>
+ <source>Select zip file for import</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>Select directory for import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>One profile has been imported</source>
+ <source>Zip File (*.zip)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1 profiles have been imported</source>
+ <source>No profiles found for import in %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Importing profiles</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -8604,72 +8651,65 @@ 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>
+ <source>system provided</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Created from %1</source>
+ <source>deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(system provided)</source>
+ <source>copy</source>
+ <comment>noun</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <source>(deleted)</source>
+ <source>Exporting profiles while changes are pending is not allowed</source>
<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: </source>
+ <source>No profiles found to export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>This is a system provided profile.</source>
+ <source>A profile name cannot contain the following characters: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The profile will be reset to default values.</source>
+ <source>A profile name cannot contain the &apos;/&apos; character.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
+ <source>A profile cannot start or end with a period (.)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile already exists with this name</source>
- <translation type="unfinished"></translation>
+ <source>Default</source>
+ <translation type="unfinished">默认</translation>
</message>
<message>
- <source>Profile</source>
- <translation type="unfinished"></translation>
+ <source>System</source>
+ <translation type="unfinished">系统</translation>
</message>
<message>
- <source>Type</source>
- <translation type="unfinished">类型</translation>
+ <source>Renamed from: </source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>Path</source>
- <translation type="unfinished">路径</translation>
+ <source>This is a system provided profile.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <source>copy</source>
+ <source>A profile already exists with this name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not contain any of the following characters: %1</source>
+ <source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>A profile must not start or end with a period (.)</source>
- <translation type="unfinished"></translation>
+ <source>Type</source>
+ <translation type="unfinished">类型</translation>
</message>
</context>
<context>