aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS4
-rw-r--r--NEWS2
-rw-r--r--enterprises.tsv54
-rw-r--r--epan/dissectors/usb.c6
-rw-r--r--manuf84
-rw-r--r--ui/qt/wireshark_de.ts89
-rw-r--r--ui/qt/wireshark_fr.ts63
-rw-r--r--ui/qt/wireshark_it.ts89
-rw-r--r--ui/qt/wireshark_ja_JP.ts63
-rw-r--r--ui/qt/wireshark_pl.ts63
-rw-r--r--ui/qt/wireshark_ru.ts63
-rw-r--r--ui/qt/wireshark_sv.ts63
-rw-r--r--ui/qt/wireshark_uk.ts63
-rw-r--r--ui/qt/wireshark_zh_CN.ts63
14 files changed, 402 insertions, 367 deletions
diff --git a/AUTHORS b/AUTHORS
index 0e458790ea..f3c7588e9b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4149,6 +4149,7 @@ Dirk Weise <code[AT]dirk-weise.de>
Disha Daniel <ddaniel[AT]empirix.com>
Dmitry Bravikov <dmitry[AT]bravikov.pro>
Dmitry Lazurkin <dilaz03[AT]gmail.com>
+Dmitry Linikov <linikov[AT]arrival.com>
Dom Gifford <Dominic.Gifford[AT]atmel.com>
Dominic Chen <d.c.ddcc[AT]gmail.com>
Doug Brown <doug[AT]downtowndougbrown.com>
@@ -4434,6 +4435,7 @@ Milos Jovanovic <jeyem815[AT]gmail.com>
Miltos Patsiouras <mipatsio[AT]gmail.com>
Mirko Parthey <mirko.parthey[AT]web.de>
Moraney Jalil <moraney.jalil[AT]outlook.com>
+Morten Tryfoss <morten[AT]tryfoss.no>
Moshe Kaplan <me[AT]moshekaplan.com>
Nathan Cole <nath[AT]thecoleresidence.co.uk>
Nathaniel Clark <nathaniel.l.clark[AT]intel.com>
@@ -4509,6 +4511,7 @@ Philip Rosenberg-Watt <p.rosenberg-watt[AT]cablelabs.com>
Philipp Hancke <fippo[AT]andyet.net>
Pino Toscano <pino[AT]debian.org>
Piotr Pawłowski <ppiotru[AT]gmail.com>
+Piotr Smolinski <piotr.smolinski[AT]confluent.io>
Piotr Tulpan <piotr.tulpan[AT]netscan.pl>
Piotr Winiarczyk <wino45[AT]gmail.com>
Poornima G <pgurusid[AT]redhat.com>
@@ -4681,6 +4684,7 @@ akuchekar <akuchekar[AT]empirix.com>
anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
cheloftus <cheloftus[AT]gmail.com>
+jfp_martin <john[AT]purplemeanie.co.uk>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
mkg20001 <mkg20001[AT]gmail.com>
diff --git a/NEWS b/NEWS
index b0838662ea..84d25c66ab 100644
--- a/NEWS
+++ b/NEWS
@@ -120,7 +120,7 @@ Wireshark 3.1.1 Release Notes
A complete FAQ is available on the Wireshark web site[10].
- Last updated 2019-08-18 08:07:40 UTC
+ Last updated 2019-08-25 09:05:22 UTC
References
diff --git a/enterprises.tsv b/enterprises.tsv
index f503edce11..3065c16501 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-08-16)
+# (last updated 2019-08-23)
0 Reserved
1 NxNetworks
@@ -20253,7 +20253,7 @@
20405 Omkhar, LLC
20406 Naesasoft,Inc.
20407 Fuhrer Engineering AG
-20408 pysnmp
+20408 SNMP Laboratories # formerly 'pysnmp'
20409 Kvinnherad Breiband AS
20410 Janusys Networks, Inc.
20411 lepo
@@ -54245,3 +54245,53 @@
54436 wimxtelecom
54437 Haud Systems Limited
54438 Bradford Teaching Hospitals NHS Foundation Trust
+54439 Kanoon Iran Novin
+54440 Alperia Ltd.
+54441 Interact Consulting AG
+54442 Beahashy Network
+54443 Hospital Alemão Oswaldo Cruz
+54444 WARP
+54445 Nolte IT Services Limited
+54446 beratergruppe:Leistungen PartGmbB
+54447 Hausner Cloud
+54448 KeyPKI, Inc.
+54449 Vancouver Dispensary Society
+54450 Geedge (Hainan) Information Technology Co., Ltd.
+54451 Icon Industrial Engineering
+54452 Novo Gaming
+54453 Ministry of Interior of Republika Srpska
+54454 Zurtax
+54455 CelerSMS
+54456 Olean Medical Group
+54457 Novetta
+54458 Fernandes Banerjee Shenoy Kidney Center,LLC
+54459 XCome Technology CO., Ltd.
+54460 Cadoles
+54461 GALIOS
+54462 lorengraff.net
+54463 ITGLOBAL
+54464 YDK Co.,Ltd.
+54465 Extreme Solutions
+54466 Supalta
+54467 btdev
+54468 Research and Producion Enterprise EKRA Ltd.
+54469 Health Insurance Fund of Republika Srpska
+54470 KUBITZA Network Solutions
+54471 Belfast Health and Social Care Trust
+54472 British Standards Institution (BSI)
+54473 VR PLUS Altmark-Wendland eG
+54474 Olean Medical Group
+54475 72 Fashion Corp.
+54476 Whitlock Infrastructure Solutions
+54477 Ulbrich Technologies
+54478 Shenzhen Kiwi Smartek Co., Ltd.
+54479 NOCSI, Ltd. Liability Co.
+54480 Orphans Care Center - Dreama
+54481 CloudVirga
+54482 Virtium LLC
+54483 Infrastruktura TK, OOO (limited liability company)
+54484 weclapp SE
+54485 Airnace SA
+54486 Zecurion
+54487 Zavarovalnica Sava d.d.
+54488 Comprod Inc.
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index ee1126ac7d..43179f6f92 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2925,6 +2925,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x2fb2, "Fujitsu, Ltd" },
{ 0x3016, "Boundary Devices, LLC" },
{ 0x30a4, "Blues Wireless" },
+ { 0x30c2, "UNPARALLEL Innovation, Lda" },
{ 0x30ee, "Fujitsu Connected Technologies Limited" },
{ 0x3125, "Eagletron" },
{ 0x3136, "Navini Networks" },
@@ -10504,6 +10505,10 @@ static const value_string usb_products_vals[] = {
{ 0x05a60002, "CVA122 Cable Voice Adapter (WDM)" },
{ 0x05a60003, "CVA124E Cable Voice Adapter (WDM)" },
{ 0x05a60004, "CVA122E Cable Voice Adapter (WDM)" },
+ { 0x05a60a00, "Integrated Management Controller Hub" },
+ { 0x05a60a01, "Virtual Keyboard/Mouse" },
+ { 0x05a60a02, "Virtual Mass Storage" },
+ { 0x05a60a03, "Virtual Ethernet/RNDIS" },
{ 0x05a74000, "Bluetooth Headset" },
{ 0x05a74001, "Bluetooth Headset in DFU mode" },
{ 0x05a74002, "Bluetooth Headset Series 2" },
@@ -20080,6 +20085,7 @@ static const value_string usb_products_vals[] = {
{ 0x2dcfc952, "Audio Class 2.0 Devices" },
{ 0x30160001, "Nitrogen Bootloader" },
{ 0x30a40001, "Notecard" },
+ { 0x30c21388, "SPL Meter" },
{ 0x30ee1001, "F-01L" },
{ 0x31250001, "TrackerPod Camera Stand" },
{ 0x3195f190, "MSO-19" },
diff --git a/manuf b/manuf
index 2fce4d6b42..42286218b6 100644
--- a/manuf
+++ b/manuf
@@ -45,23 +45,23 @@
# http://standards-oui.ieee.org/cid/cid.csv:
# Content-Length: 7621
-# Last-Modified: Sun, 18 Aug 2019 08:00:39 GMT
+# Last-Modified: Sun, 25 Aug 2019 08:00:38 GMT
# http://standards-oui.ieee.org/iab/iab.csv:
# Content-Length: 381239
-# Last-Modified: Sun, 18 Aug 2019 08:01:45 GMT
+# Last-Modified: Sun, 25 Aug 2019 08:00:49 GMT
# http://standards-oui.ieee.org/oui/oui.csv:
-# Content-Length: 2400529
-# Last-Modified: Sun, 18 Aug 2019 08:04:05 GMT
+# Content-Length: 2404090
+# Last-Modified: Sun, 25 Aug 2019 08:01:18 GMT
# http://standards-oui.ieee.org/oui28/mam.csv:
-# Content-Length: 289430
-# Last-Modified: Sun, 18 Aug 2019 08:02:13 GMT
+# Content-Length: 291238
+# Last-Modified: Sun, 25 Aug 2019 08:00:56 GMT
# http://standards-oui.ieee.org/oui36/oui36.csv:
-# Content-Length: 301295
-# Last-Modified: Sun, 18 Aug 2019 08:03:37 GMT
+# Content-Length: 302891
+# Last-Modified: Sun, 25 Aug 2019 08:01:12 GMT
00:00:00 00:00:00 Officially Xerox, but 0:0:0:0:0:0 is more common
00:00:01 Xerox Xerox Corporation
@@ -1034,7 +1034,7 @@
00:03:C8 CmlEmerg CML Emergency Services
00:03:C9 Tecom TECOM Co., Ltd.
00:03:CA Mts MTS Systems Corp.
-00:03:CB NipponDe Nippon Systems Development Co., Ltd.
+00:03:CB Systemge SystemGear Co., Ltd.
00:03:CC Momentum Momentum Computer, Inc.
00:03:CD Cloverte Clovertech, Inc.
00:03:CE EtenTech ETEN Technologies, Inc.
@@ -10348,7 +10348,7 @@
00:30:53 Basler Basler AG
00:30:54 Castlene Castlenet Technology, Inc.
00:30:55 RenesasT Renesas Technology America, Inc.
-00:30:56 BeckIpc Beck IPC GmbH
+00:30:56 HmsIndus HMS Industrial Networks
00:30:57 Qtelnet QTelNet, Inc.
00:30:58 ApiMotio Api Motion
00:30:59 KontronC Kontron Compact Computers Ag
@@ -17422,6 +17422,7 @@
04:A3:16 TexasIns Texas Instruments
04:A3:F3 Emicon
04:A8:2A Nokia Nokia Corporation
+04:AA:E1 BeijingM Beijing Microvision Technology Co.,Ltd
04:AB:18 Elecom Elecom Co.,Ltd.
04:AB:6A Chun-Il Chun-il Co.,Ltd.
04:AC:44 HoltekSe Holtek Semiconductor Inc.
@@ -18261,6 +18262,7 @@
10:4D:77 Innovati Innovative Computer Engineering
10:4E:07 Shanghai Shanghai Genvision Industries Co.,Ltd
10:4E:89 GarminIn Garmin International
+10:4F:58 ArubaAHe Aruba, a Hewlett Packard Enterprise Company
10:4F:A8 Sony Sony Corporation
10:51:72 HuaweiTe Huawei Technologies Co.,Ltd
10:56:11 ArrisGro ARRIS Group, Inc.
@@ -18360,6 +18362,7 @@
10:C5:95 Lenovo
10:C6:0C DominoUk Domino UK Ltd
10:C6:1F HuaweiTe Huawei Technologies Co.,Ltd
+10:C6:5E Adapt-Ip
10:C6:7E Shenzhen Shenzhen Juchin Technology Co., Ltd
10:C6:FC GarminIn Garmin International
10:C7:3F MidasKla Midas Klark Teknik Ltd
@@ -18935,6 +18938,7 @@
1C:18:4A Shenzhen ShenZhen RicherLink Technologies Co.,LTD
1C:19:DE Eyevis eyevis GmbH
1C:1A:C0 Apple Apple, Inc.
+1C:1A:DF Microsof Microsoft Corporation
1C:1B:0D Giga-Byt Giga-Byte Technology Co.,Ltd.
1C:1B:68 ArrisGro ARRIS Group, Inc.
1C:1B:B5 IntelCor Intel Corporate
@@ -19212,6 +19216,7 @@
1C:C0:E1:D0:00:00/28 NewlandN NewLand (NZ) Communication Tech Limited
1C:C0:E1:E0:00:00/28 YunYangF Yun Yang Fire Safety Equipment Co.,Ltd.
1C:C1:1A Wavetron Wavetronix
+1C:C1:BC YichipMi Yichip Microelectronics (Hangzhou) Co.,Ltd
1C:C1:DE HewlettP Hewlett Packard
1C:C3:16 Milesigh MileSight Technology Co., Ltd.
1C:C3:EB Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
@@ -19319,6 +19324,7 @@
20:2D:07 SamsungE Samsung Electronics Co.,Ltd
20:2D:23 Collinea Collinear Networks Inc.
20:2D:F8 DigitalM Digital Media Cartridge Ltd.
+20:31:1C VivoMobi vivo Mobile Communication Co., Ltd.
20:31:EB Hdsn
20:32:33 Shenzhen Shenzhen Bilian Electronic Co.,Ltd
20:32:6C SamsungE Samsung Electronics Co.,Ltd
@@ -20136,6 +20142,7 @@
2C:39:C1 Ciena Ciena Corporation
2C:3A:28 FagorEle Fagor Electrónica
2C:3A:E8 Espressi Espressif Inc.
+2C:3A:FD AvmAudio AVM Audiovisuelles Marketing und Computersysteme GmbH
2C:3B:FD NetstorT Netstor Technology Co., Ltd.
2C:3E:CF Cisco Cisco Systems, Inc
2C:3F:0B CiscoMer Cisco Meraki
@@ -20167,6 +20174,7 @@
2C:48:35:C0:00:00/28 Santec Santec Corporation
2C:48:35:D0:00:00/28 PhasorSo Phasor Solutions Ltd
2C:48:35:E0:00:00/28 Irootech Irootech Technology Co.,Ltd
+2C:4C:C6 MurataMa Murata Manufacturing Co., Ltd.
2C:4D:54 AsustekC ASUSTek COMPUTER INC.
2C:4D:79 WeifangG Weifang Goertek Electronics Co.,Ltd
2C:4E:7D Chunghua Chunghua Intelligent Network Equipment Inc.
@@ -20818,6 +20826,7 @@
34:C8:03 Nokia Nokia Corporation
34:C9:9D EidolonC Eidolon Communications Technology Co. Ltd.
34:C9:F0 LmTechno LM Technologies Ltd
+34:CB:1A ProcterG Procter & Gamble Company
34:CC:28 Nexpring Nexpring Co. LTD.,
34:CD:6D CommskyT CommSky Technologies
34:CD:BE HuaweiTe Huawei Technologies Co.,Ltd
@@ -21155,6 +21164,7 @@
38:E6:0A XiaomiCo Xiaomi Communications Co Ltd
38:E7:D8 Htc HTC Corporation
38:E8:DF BMedien+ b gmbh medien + datenbanken
+38:E8:EE NanjingY Nanjing Youkuo Electric Technology Co., Ltd
38:E9:8C RecoSPA Reco S.p.A.
38:EA:A7 HewlettP Hewlett Packard
38:EC:11 NovatekM Novatek Microelectronics Corp.
@@ -22270,9 +22280,21 @@
44:00:4D HuaweiTe Huawei Technologies Co.,Ltd
44:03:2C IntelCor Intel Corporate
44:03:77 IeeeRegi IEEE Registration Authority
+44:03:77:00:00:00/28 MusashiS Musashi Seimitsu Industry Co.,Ltd
44:03:77:10:00:00/28 Atari Atari, Inc.
+44:03:77:20:00:00/28 ExsomCom Exsom Computers LLC
+44:03:77:30:00:00/28 Annapurn Annapurna labs
+44:03:77:40:00:00/28 LenovoIm Lenovo Image(Tianjin) Technology Ltd.
44:03:77:50:00:00/28 NordenCo Norden Communication UK Ltd.
+44:03:77:60:00:00/28 ShenZhen Shen Zhen Huawang Technology Co; Ltd
44:03:77:70:00:00/28 StaraInd Stara S/A Indústria de Implementos Agrícolas
+44:03:77:80:00:00/28 GemmyEle Gemmy Electronics (Shenzhen) Co, Ltd
+44:03:77:90:00:00/28 Shenzhen Shenzhen Ut-King Technology Co.,Ltd
+44:03:77:A0:00:00/28 Symplr
+44:03:77:B0:00:00/28 Hangzhou Hangzhou Asia Infrastructure Tech. Co., Ltd.
+44:03:77:C0:00:00/28 BigClima BIG Climatic Manufacture, Co. LTD, Zhongshan Branch
+44:03:77:D0:00:00/28 Omnisens Omnisense Systems Private Limited Taiwan Branch
+44:03:77:E0:00:00/28 BolinTec Bolin Technology Co., Ltd
44:03:A7 Cisco Cisco Systems, Inc
44:04:44 Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
44:07:0B Google Google, Inc.
@@ -22474,6 +22496,7 @@
44:D8:78 HuiZhouG Hui Zhou Gaoshengda Technology Co.,LTD
44:D8:84 Apple Apple, Inc.
44:D9:E7 Ubiquiti Ubiquiti Networks Inc.
+44:DC:4E ItelMobi Itel Mobile Limited
44:DC:91 PlanexCo Planex Communications Inc.
44:DC:CB Semindia Semindia Systems Pvt Ltd
44:E0:8E CiscoSpv Cisco SPVTG
@@ -22952,6 +22975,7 @@
4C:BB:58 ChiconyE Chicony Electronics Co., Ltd.
4C:BC:42 Shenzhen Shenzhen Hangsheng Electronics Co.,Ltd.
4C:BC:48 Cisco Cisco Systems, Inc
+4C:BC:72 PrimexWi Primex Wireless
4C:BC:98 IeeeRegi IEEE Registration Authority
4C:BC:98:00:00:00/28 Charge-A Charge-Amps AB
4C:BC:98:10:00:00/28 JscNic Jsc Nic
@@ -23145,6 +23169,8 @@
50:61:84 Avaya Avaya Inc
50:61:BF Cisco Cisco Systems, Inc
50:61:D6 Indu-Sol Indu-Sol GmbH
+50:62:55 IeeeRegi IEEE Registration Authority
+50:62:55:60:00:00/28 Shenzhen Shenzhen Sinway South Technology Co., Ltd
50:63:13 HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
50:64:2B XiaomiEl XIAOMI Electronics,CO.,LTD
50:64:41 Greenlee
@@ -24743,6 +24769,7 @@
6C:23:B9 SonyMobi Sony Mobile Communications Inc
6C:23:CB Wattty Wattty Corporation
6C:24:83 Microsof Microsoft Mobile Oy
+6C:24:A6 VivoMobi vivo Mobile Communication Co., Ltd.
6C:25:B9 BbkEduca Bbk Educational Electronics Corp.,Ltd.
6C:27:79 Microsof Microsoft Mobile Oy
6C:29:90 WizConne WiZ Connected Lighting Company Limited
@@ -25330,6 +25357,7 @@
70:B3:D5:0D:20:00/36 Unmanned Unmanned Spa
70:B3:D5:0D:30:00/36 TsatAs Tsat As
70:B3:D5:0D:40:00/36 Guangzho Guangzhou Male Industrial Animation Technology Co.,Ltd.
+70:B3:D5:0D:50:00/36 KahlerAu Kahler Automation
70:B3:D5:0D:60:00/36 TattileS Tattile Srl
70:B3:D5:0D:70:00/36 RussianT Russian Telecom Equipment Company
70:B3:D5:0D:80:00/36 LaserIma Laser Imagineering GmbH
@@ -25589,6 +25617,7 @@
70:B3:D5:21:E0:00/36 Hildebra Hildebrand Technology Limited
70:B3:D5:21:F0:00/36 Chronome Chronomedia
70:B3:D5:22:00:00/36 Private
+70:B3:D5:22:10:00/36 LxDesign LX Design House
70:B3:D5:22:20:00/36 MarioffO Marioff Corporation Oy
70:B3:D5:22:40:00/36 UrbanaSm Urbana Smart Solutions Pte Ltd
70:B3:D5:22:50:00/36 RcdRadio RCD Radiokomunikace
@@ -25653,6 +25682,7 @@
70:B3:D5:26:D0:00/36 SorionEl Sorion Electronics ltd
70:B3:D5:26:E0:00/36 Hi-TechS HI-TECH SYSTEM Co. Ltd.
70:B3:D5:26:F0:00/36 CompalEl Compal Electronics, Inc.
+70:B3:D5:27:00:00/36 AmazonTe Amazon Technologies Inc.
70:B3:D5:27:20:00/36 TelecomS Telecom Sante
70:B3:D5:27:30:00/36 WevoTech WeVo Tech
70:B3:D5:27:40:00/36 StercomP Stercom Power Solutions GmbH
@@ -26179,6 +26209,7 @@
70:B3:D5:51:60:00/36 LineageP Lineage Power Pvt Ltd.,
70:B3:D5:51:70:00/36 Ispher
70:B3:D5:51:80:00/36 Cruxell CRUXELL Corp.
+70:B3:D5:51:90:00/36 MbConnec MB connect line GmbH Fernwartungssysteme
70:B3:D5:51:B0:00/36 VitreaSm Vitrea Smart Home Technologies
70:B3:D5:51:C0:00/36 AtxNetwo ATX Networks Corp
70:B3:D5:51:D0:00/36 TecnintH Tecnint HTE SRL
@@ -26314,6 +26345,7 @@
70:B3:D5:5C:C0:00/36 AkseSrl Akse srl
70:B3:D5:5C:D0:00/36 MvtVideo MVT Video Technologies R + H Maedler GbR
70:B3:D5:5C:F0:00/36 ProelTsi PROEL TSI s.r.l.
+70:B3:D5:5D:00:00/36 Intertal InterTalk Critical Information Systems
70:B3:D5:5D:10:00/36 Software Software Motor Corp
70:B3:D5:5D:30:00/36 Supracon Supracon AG
70:B3:D5:5D:40:00/36 RchItali Rch Italia Spa
@@ -26425,6 +26457,7 @@
70:B3:D5:65:E0:00/36 SeasonEl Season Electronics Ltd
70:B3:D5:66:00:00/36 SmartSer Smart Service Technologies CO., LTD
70:B3:D5:66:10:00/36 DesignaE DesignA Electronics Limited
+70:B3:D5:66:20:00/36 IconIndu Icon Industrial Engineering
70:B3:D5:66:40:00/36 SankyoIn Sankyo Intec co.,ltd
70:B3:D5:66:50:00/36 Certusus CertUsus GmbH
70:B3:D5:66:60:00/36 AplexTec Aplex Technology Inc.
@@ -27125,6 +27158,7 @@
70:B3:D5:9E:30:00/36 LgElectr LG Electronics
70:B3:D5:9E:60:00/36 BlocksiL Blocksi Llc
70:B3:D5:9E:70:00/36 XiamenMa Xiamen Maxincom Technologies Co., Ltd.
+70:B3:D5:9E:80:00/36 Zerospac Zerospace ICT Services B.V.
70:B3:D5:9E:A0:00/36 BlueStor Blue Storm Associates, Inc.
70:B3:D5:9E:B0:00/36 PrestonI Preston Industries dba PolyScience
70:B3:D5:9E:C0:00/36 Esoftthi eSoftThings
@@ -27429,8 +27463,10 @@
70:B3:D5:B5:60:00/36 PowerEle Power Electronics Espana, S.L.
70:B3:D5:B5:80:00/36 Internet Internet Protocolo Logica Sl
70:B3:D5:B5:90:00/36 Futurete FutureTechnologyLaboratories INC.
+70:B3:D5:B5:A0:00/36 GtiTechn GTI Technologies Inc
70:B3:D5:B5:B0:00/36 Dynamoun DynaMount LLC
70:B3:D5:B5:C0:00/36 ProzessT Prozess Technologie
+70:B3:D5:B5:E0:00/36 Dynics
70:B3:D5:B5:F0:00/36 Crdmdeve Crdmdeveoppements
70:B3:D5:B6:00:00/36 ZaoZeo Zao Zeo
70:B3:D5:B6:20:00/36 SakuraSe Sakura Seiki Co.,Ltd.
@@ -27482,6 +27518,7 @@
70:B3:D5:BA:20:00/36 Mamac MAMAC Systems, Inc.
70:B3:D5:BA:30:00/36 Tiama
70:B3:D5:BA:40:00/36 EiwaGike Eiwa Giken Inc.
+70:B3:D5:BA:50:00/36 Fpgalabs fpgalabs.com
70:B3:D5:BA:60:00/36 GluonSol Gluon Solutions Inc.
70:B3:D5:BA:70:00/36 DigitalY Digital Yacht Ltd
70:B3:D5:BA:80:00/36 Controll Controlled Power Company
@@ -27618,6 +27655,7 @@
70:B3:D5:C4:D0:00/36 RadaElec RADA Electronics Industries Ltd.
70:B3:D5:C4:E0:00/36 ArkrayKy ARKRAY, Inc. Kyoto Laboratory
70:B3:D5:C4:F0:00/36 AeVanDeV AE Van de Vliet BVBA
+70:B3:D5:C5:00:00/36 Combilen Combilent
70:B3:D5:C5:10:00/36 InnotasE Innotas Elektronik GmbH
70:B3:D5:C5:30:00/36 SLabsSpZ S Labs sp. z o.o.
70:B3:D5:C5:40:00/36 Flexsolu Flexsolution APS
@@ -27686,12 +27724,14 @@
70:B3:D5:CA:20:00/36 DeHaardt De Haardt bv
70:B3:D5:CA:30:00/36 Saankhya Saankhya Labs Private Limited
70:B3:D5:CA:40:00/36 Netemera Netemera Sp. z o.o.
+70:B3:D5:CA:70:00/36 I-ViewCo i-View Communication Inc.
70:B3:D5:CA:80:00/36 GrupoEpe Grupo Epelsa S.L.
70:B3:D5:CA:90:00/36 Nxcontro Nxcontrol system Co., Ltd.
70:B3:D5:CA:A0:00/36 BelPower Bel Power Solutions GmbH
70:B3:D5:CA:B0:00/36 Notice NOTICE Co., Ltd.
70:B3:D5:CA:C0:00/36 Crde
70:B3:D5:CA:E0:00/36 Thema
+70:B3:D5:CB:00:00/36 Ossiaco
70:B3:D5:CB:10:00/36 Radar
70:B3:D5:CB:20:00/36 Seclab
70:B3:D5:CB:30:00/36 KstTechn KST technology
@@ -27699,6 +27739,7 @@
70:B3:D5:CB:60:00/36 Kuebrich Kuebrich Ingeniergesellschaft mbh & Co. KG
70:B3:D5:CB:70:00/36 Hkc HKC Limited
70:B3:D5:CB:80:00/36 VertiTec Verti Tecnologia
+70:B3:D5:CB:90:00/36 Jsc«Sati Jsc «Satis-Tl-94»
70:B3:D5:CB:A0:00/36 YuyamaMf YUYAMA MFG Co.,Ltd
70:B3:D5:CB:C0:00/36 ProconEl Procon Electronics Pty Ltd
70:B3:D5:CB:D0:00/36 PreoIndu Preo Industries Far East Limited
@@ -27964,6 +28005,7 @@
70:B3:D5:E0:C0:00/36 Communic Communication Systems Solutions
70:B3:D5:E0:D0:00/36 SigmaCon Sigma Connectivity AB
70:B3:D5:E0:F0:00/36 VtronPty Vtron Pty Ltd
+70:B3:D5:E1:00:00/36 Leidos
70:B3:D5:E1:40:00/36 Automata Automata Spa
70:B3:D5:E1:50:00/36 Benetel
70:B3:D5:E1:60:00/36 ChinaEnt China Entropy Co., Ltd.
@@ -28051,7 +28093,9 @@
70:B3:D5:E8:50:00/36 Explorer Explorer Inc.
70:B3:D5:E8:60:00/36 YuyamaMf YUYAMA MFG Co.,Ltd
70:B3:D5:E8:80:00/36 BreasMed Breas Medical AB
+70:B3:D5:E8:90:00/36 JscKalug JSC Kaluga Astral
70:B3:D5:E8:A0:00/36 MelecsEw Melecs EWS GmbH
+70:B3:D5:E8:B0:00/36 DreamD&S Dream D&S Co.,Ltd
70:B3:D5:E8:C0:00/36 Fracarro Fracarro srl
70:B3:D5:E8:D0:00/36 NatavSer Natav Services Ltd.
70:B3:D5:E8:E0:00/36 MacnicaT Macnica Technology
@@ -28188,6 +28232,7 @@
70:B3:D5:F3:70:00/36 Mitsubis Mitsubishi Electric Micro-Computer Application Software Co.,Ltd.
70:B3:D5:F3:80:00/36 Scanvaeg Scanvaegt Nordic A/S
70:B3:D5:F3:90:00/36 ZenrosAp Zenros ApS
+70:B3:D5:F3:A0:00/36 OooResea OOO Research and Production Center "Computer Technologies"
70:B3:D5:F3:B0:00/36 EpdmPty Epdm Pty Ltd
70:B3:D5:F3:C0:00/36 Gigaray
70:B3:D5:F3:E0:00/36 Ооо"Роне Ооо "Ронекс"
@@ -29066,6 +29111,8 @@
7C:1E:B3 2NTeleko 2N TELEKOMUNIKACE a.s.
7C:20:48 Koamtac
7C:20:64 Alcatel- Alcatel-Lucent IPD
+7C:21:0D Cisco Cisco Systems, Inc
+7C:21:0E Cisco Cisco Systems, Inc
7C:21:D8 Shenzhen Shenzhen Think Will Communication Technology co., LTD.
7C:23:02 SamsungE Samsung Electronics Co.,Ltd
7C:24:0C Telechip Telechips, Inc.
@@ -29213,6 +29260,7 @@
7C:A2:3E HuaweiTe Huawei Technologies Co.,Ltd
7C:A2:9B DSignt D.SignT GmbH & Co. KG
7C:A6:1D MhlLlc Mhl, Llc
+7C:A7:B0 Shenzhen Shenzhen Bilian Electronic Co.,Ltd
7C:A9:7D Objeniou Objenious
7C:AB:25 MesmoTec Mesmo Technology Inc.
7C:AC:B2 BoschSof Bosch Software Innovations GmbH
@@ -29568,6 +29616,7 @@
80:DA:BC Megafone Megafone Limited
80:DB:31 PowerQuo Power Quotient International Co., Ltd.
80:E0:1D Cisco Cisco Systems, Inc
+80:E4:55 NewH3CTe New H3C Technologies Co., Ltd
80:E4:DA IeeeRegi IEEE Registration Authority
80:E4:DA:00:00:00/28 Wheatsto Wheatstone Corporation
80:E4:DA:10:00:00/28 Guangzho Guangzhou Pinzhong Electronic Technology CO., LTD
@@ -30643,6 +30692,7 @@
90:B6:86 MurataMa Murata Manufacturing Co., Ltd.
90:B8:32 Aerohive Aerohive Networks Inc.
90:B8:D0 Joyent Joyent, Inc.
+90:B8:E0 Shenzhen Shenzhen Yanray Technology Co.,Ltd
90:B9:31 Apple Apple, Inc.
90:B9:7D JohnsonO Johnson Outdoors Marine Electronics d/b/a Minnkota
90:BD:E6 QuectelW Quectel Wireless Solutions Co., Ltd.
@@ -31304,6 +31354,7 @@
9C:5D:12 Aerohive Aerohive Networks Inc.
9C:5D:95 VtcElect VTC Electronics Corp.
9C:5E:73 CalibreU Calibre UK LTD
+9C:5F:5A Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
9C:61:1D Omni-IdU Omni-ID USA, Inc.
9C:61:21 SichuanT Sichuan Tianyi Comheart Telecomco.,Ltd
9C:62:AB Sumavisi Sumavision Technologies Co.,Ltd
@@ -31445,6 +31496,7 @@
9C:EF:D5 PandaWir Panda Wireless, Inc.
9C:F3:87 Apple Apple, Inc.
9C:F4:8E Apple Apple, Inc.
+9C:F5:31 Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
9C:F6:1A UtcFireA UTC Fire and Security
9C:F6:7D RicardoP Ricardo Prague, s.r.o.
9C:F6:DD IeeeRegi IEEE Registration Authority
@@ -32409,6 +32461,7 @@ AC:5F:3E SamsungE Samsung Electro-Mechanics(Thailand)
AC:60:B6 Ericsson Ericsson AB
AC:61:23 Drivven Drivven, Inc.
AC:61:75 HuaweiTe Huawei Technologies Co.,Ltd
+AC:61:B9 WamaTech WAMA Technology Limited
AC:61:EA Apple Apple, Inc.
AC:62:0D JabilCir Jabil Circuit(Wuxi) Co.,Ltd
AC:63:BE AmazonTe Amazon Technologies Inc.
@@ -33061,7 +33114,9 @@ B4:E1:EB Private
B4:E6:2A LgInnote LG Innotek
B4:E6:2D Espressi Espressif Inc.
B4:E7:82 Vivalnk
-B4:E9:A3 Port port GmbH
+B4:E8:42 HongKong Hong Kong Bouffalo Lab Limited
+B4:E8:C9 XadaTech XADA Technologies
+B4:E9:A3 PortIndu port industrial automation GmbH
B4:E9:B0 Cisco Cisco Systems, Inc
B4:EC:02 AlpsElec Alps Electric Co., Ltd.
B4:ED:19 PieDigit Pie Digital, Inc.
@@ -34012,6 +34067,7 @@ C4:CD:82 Hangzhou Hangzhou Lowan Information Technology Co., Ltd.
C4:D1:97 VentiaUt Ventia Utility Services
C4:D4:89 JiangsuJ JiangSu Joyque Information Industry Co.,Ltd
C4:D6:55 TercelTe Tercel technology co.,ltd
+C4:D8:F3 Izotope
C4:D9:87 IntelCor Intel Corporate
C4:DA:26 NoblexSa Noblex Sa
C4:DA:7D IviumTec Ivium Technologies B.V.
@@ -34953,6 +35009,7 @@ D4:29:EA Zimory Zimory GmbH
D4:2C:0F ArrisGro ARRIS Group, Inc.
D4:2C:3D SkyLight Sky Light Digital Limited
D4:2C:44 Cisco Cisco Systems, Inc
+D4:2D:C5 Panasoni Panasonic i-PRO Sensing Solutions Co., Ltd.
D4:2F:23 AkenoriP Akenori PTE Ltd
D4:31:9D Sinwatec
D4:32:60 Gopro
@@ -35161,6 +35218,7 @@ D4:F4:6F Apple Apple, Inc.
D4:F4:BE PaloAlto Palo Alto Networks
D4:F5:13 TexasIns Texas Instruments
D4:F5:27 Siemens Siemens Ag
+D4:F5:47 Google Google, Inc.
D4:F5:EF HewlettP Hewlett Packard Enterprise
D4:F6:3F IeaSRL Iea S.R.L.
D4:F7:86 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
@@ -35365,6 +35423,7 @@ D8:C9:9D EaDispla Ea Display Limited
D8:CA:06 TitanDat Titan DataCenters France
D8:CB:8A Micro-St Micro-Star INTL CO., LTD.
D8:CE:3A XiaomiCo Xiaomi Communications Co Ltd
+D8:CF:89 BeijingD Beijing DoSee Science and Technology Co., Ltd.
D8:CF:9C Apple Apple, Inc.
D8:D0:90 Dell Dell Inc.
D8:D1:CB Apple Apple, Inc.
@@ -36325,6 +36384,7 @@ E8:CC:18 D-LinkIn D-Link International
E8:CC:32 Micronet Micronet LTD
E8:CD:2D HuaweiTe Huawei Technologies Co.,Ltd
E8:CE:06 Skyhawke SkyHawke Technologies, LLC.
+E8:D0:3C Shenzhen Shenzhen Jingxun Software Telecommunication Technology Co.,Ltd
E8:D0:99 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
E8:D0:B9 TaicangT Taicang T&W Electronics
E8:D0:FA MksInstr MKS Instruments Deutschland GmbH
@@ -36500,6 +36560,7 @@ EC:9A:74 HewlettP Hewlett Packard
EC:9B:5B Nokia Nokia Corporation
EC:9B:8B HewlettP Hewlett Packard Enterprise
EC:9B:F3 SamsungE Samsung Electro-Mechanics(Thailand)
+EC:9C:32 SichuanA Sichuan AI-Link Technology Co., Ltd.
EC:9E:CD ArtesynE Artesyn Embedded Technologies
EC:9F:0D IeeeRegi IEEE Registration Authority
EC:9F:0D:00:00:00/28 HesaiPho Hesai Photonics Technology Co., Ltd
@@ -36778,6 +36839,7 @@ F0:AF:85 ArrisGro ARRIS Group, Inc.
F0:B0:14 AvmAudio AVM Audiovisuelles Marketing und Computersysteme GmbH
F0:B0:52 RuckusWi Ruckus Wireless
F0:B0:E7 Apple Apple, Inc.
+F0:B1:07 Ericsson Ericsson AB
F0:B2:E5 Cisco Cisco Systems, Inc
F0:B3:1E Universa Universal Electronics, Inc.
F0:B4:29 XiaomiCo Xiaomi Communications Co Ltd
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index d885a0dbf1..9727fd73b4 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -5685,11 +5685,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Profil: %1</translation>
</message>
<message>
- <source>Manage Profiles</source>
- <oldsource>Manage Profiles...</oldsource>
- <translation>Profile verwalten</translation>
- </message>
- <message>
<source>Import</source>
<translation>Importieren</translation>
</message>
@@ -5706,16 +5701,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Exportieren</translation>
</message>
<message>
- <source>New</source>
- <oldsource>New...</oldsource>
- <translation>Neu</translation>
- </message>
- <message>
- <source>Edit</source>
- <oldsource>Edit...</oldsource>
- <translation>Editieren</translation>
- </message>
- <message>
<source>Delete</source>
<translation>Löschen</translation>
</message>
@@ -5796,6 +5781,18 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Keine Pakete</translation>
</message>
<message>
+ <source>Manage Profiles</source>
+ <translation>Profile verwalten</translation>
+ </message>
+ <message>
+ <source>New</source>
+ <translation>Neu</translation>
+ </message>
+ <message>
+ <source>Edit</source>
+ <translation>Editieren</translation>
+ </message>
+ <message>
<source>selected personal profile</source>
<translation>Ausgewähltes persönliches Profil</translation>
</message>
@@ -8597,11 +8594,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Exportieren</translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending</source>
- <oldsource>An import of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished">Solange Änderungen noch anstehen können Profile nicht importiert werden.</translation>
- </message>
- <message>
<source>New profile</source>
<translation>Neues Profil</translation>
</message>
@@ -8635,6 +8627,22 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<numerusform>%Ln ausgewählte persönliche Profile</numerusform>
</translation>
</message>
+ <message>
+ <source>An import of profiles is not allowed, while changes are pending</source>
+ <translation>Solange Änderungen noch anstehen können Profile nicht importiert werden</translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed</source>
+ <translation>Ein Import steht zum sichern aus. Weitere Importe sind nicht erlaubt</translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles</source>
+ <translation>Es können nur persönliche Profile exportiert werden</translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending</source>
+ <translation>Solange Änderungen noch ausstehen dürfen Profile nicht exportiert werden</translation>
+ </message>
<message numerus="yes">
<source>%Ln profile(s) exported</source>
<translation>
@@ -8667,21 +8675,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Alle persönlichen Profile</translation>
</message>
<message>
- <source>An import is pending to be saved. Additional imports are not allowed</source>
- <oldsource>An import is pending to be saved. Additional imports are not allowed.</oldsource>
- <translation type="unfinished">Ein Import steht zum sichern aus. Weitere Importe sind nicht erlaubt.</translation>
- </message>
- <message>
- <source>An export of profiles is only allowed for personal profiles</source>
- <oldsource>An export of profiles is only allowed for personal profiles.</oldsource>
- <translation type="unfinished">Es können nur persönliche Profile exportiert werden.</translation>
- </message>
- <message>
- <source>An export of profiles is not allowed, while changes are pending</source>
- <oldsource>An export of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished">Solange Änderungen noch ausstehen dürfen Profile nicht exportiert werden.</translation>
- </message>
- <message>
<source>Error</source>
<translation>Fehler</translation>
</message>
@@ -8731,27 +8724,27 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>This is a system provided profile</source>
- <translation type="unfinished"></translation>
+ <translation>Dies ist ein vorgegebenes Profil</translation>
</message>
<message>
<source>A profile change for this name is pending</source>
- <translation type="unfinished"></translation>
+ <translation>Eine Namensänderung für dieses Profil ist ausstehend</translation>
</message>
<message>
<source> (See: %1)</source>
- <translation type="unfinished"></translation>
+ <translation>(Siehe: %1)</translation>
</message>
<message>
<source>This is an invalid profile definition</source>
- <translation type="unfinished"></translation>
+ <translation>Profildefinition ist nicht gültig</translation>
</message>
<message>
<source>A profile already exists with this name</source>
- <translation type="unfinished"></translation>
+ <translation>Ein Profil mit diesem Namen existiert bereits</translation>
</message>
<message>
<source>A profile with this name is being deleted</source>
- <translation type="unfinished"></translation>
+ <translation>Ein Profil mit diesem Namen wird gelöscht</translation>
</message>
<message>
<source>Created from default settings</source>
@@ -8788,11 +8781,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>A profile name cannot contain the &apos;/&apos; character</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>A profile name cannot contain the &apos;/&apos; character.</source>
- <translation type="vanished">Ein Profilname darf kein &apos;/&apos; Zeichen enthalten.</translation>
+ <translation>Ein Profilname darf kein &apos;/&apos; Zeichen enthalten</translation>
</message>
<message>
<source>A profile cannot start or end with a period (.)</source>
@@ -8803,10 +8792,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Standard</translation>
</message>
<message>
- <source>This is a system provided profile.</source>
- <translation type="vanished">Dies ist ein vorgegebenes Profil.</translation>
- </message>
- <message>
<source>Global</source>
<translation>Global</translation>
</message>
@@ -8815,10 +8800,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Persönliche</translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
- <translation type="vanished">Ein Profil mit diesem Namen existiert bereits.</translation>
- </message>
- <message>
<source>Renamed from: %1</source>
<translation>Umbenannt von: %1</translation>
</message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 66101b821b..563d2ca4b0 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -5661,11 +5661,6 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
- <source>Manage Profiles</source>
- <oldsource>Manage Profiles...</oldsource>
- <translation>Gérer des Profils</translation>
- </message>
- <message>
<source>Import</source>
<translation type="unfinished">Importer</translation>
</message>
@@ -5682,16 +5677,6 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished">Exporter</translation>
</message>
<message>
- <source>New</source>
- <oldsource>New...</oldsource>
- <translation>Nouveau</translation>
- </message>
- <message>
- <source>Edit</source>
- <oldsource>Edit...</oldsource>
- <translation>Editer</translation>
- </message>
- <message>
<source>Delete</source>
<translation>Supprimer</translation>
</message>
@@ -5772,6 +5757,18 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Pas de paquets</translation>
</message>
<message>
+ <source>Manage Profiles</source>
+ <translation>Gérer des Profils</translation>
+ </message>
+ <message>
+ <source>New</source>
+ <translation>Nouveau</translation>
+ </message>
+ <message>
+ <source>Edit</source>
+ <translation>Editer</translation>
+ </message>
+ <message>
<source>selected personal profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8567,11 +8564,6 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished">Exporter</translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending</source>
- <oldsource>An import of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8598,6 +8590,22 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <source>An import of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
<source>%Ln profile(s) exported</source>
<translation type="unfinished">
@@ -8630,21 +8638,6 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import is pending to be saved. Additional imports are not allowed</source>
- <oldsource>An import is pending to be saved. Additional imports are not allowed.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is only allowed for personal profiles</source>
- <oldsource>An export of profiles is only allowed for personal profiles.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is not allowed, while changes are pending</source>
- <oldsource>An export of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Error</source>
<translation type="unfinished">Erreur</translation>
</message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 95ee64d4cb..cb8af73ca6 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -5685,11 +5685,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Profilo: %1</translation>
</message>
<message>
- <source>Manage Profiles</source>
- <oldsource>Manage Profiles...</oldsource>
- <translation>Gestisci i profili</translation>
- </message>
- <message>
<source>Import</source>
<translation>Importa</translation>
</message>
@@ -5706,16 +5701,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Esporta</translation>
</message>
<message>
- <source>New</source>
- <oldsource>New...</oldsource>
- <translation>Nuovo</translation>
- </message>
- <message>
- <source>Edit</source>
- <oldsource>Edit...</oldsource>
- <translation>Modifica</translation>
- </message>
- <message>
<source>Delete</source>
<translation>Elimina</translation>
</message>
@@ -5796,6 +5781,18 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Nessun pacchetto</translation>
</message>
<message>
+ <source>Manage Profiles</source>
+ <translation>Gestisci i profili</translation>
+ </message>
+ <message>
+ <source>New</source>
+ <translation>Nuovo</translation>
+ </message>
+ <message>
+ <source>Edit</source>
+ <translation>Modifica</translation>
+ </message>
+ <message>
<source>selected personal profile</source>
<translation>profilo personale selezionato</translation>
</message>
@@ -8597,11 +8594,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Esporta</translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending</source>
- <oldsource>An import of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished">Non è consentito importare profili mentre ci sono modifiche in corso.</translation>
- </message>
- <message>
<source>New profile</source>
<translation>Nuon profilo</translation>
</message>
@@ -8635,6 +8627,22 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<numerusform>%Ln profili personali selezionati</numerusform>
</translation>
</message>
+ <message>
+ <source>An import of profiles is not allowed, while changes are pending</source>
+ <translation>Non è consentito importare profili, mentre ci sono modifiche in corso</translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed</source>
+ <translation>Un&apos;importazione è in fase di salvataggio. Non sono consentite importazioni aggiuntive</translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles</source>
+ <translation>Un&apos;esportazione di profili è consentita solo per i profili personali</translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending</source>
+ <translation>Un&apos;esportazione di profili non è consentita, mentre ci sono modifiche in corso</translation>
+ </message>
<message numerus="yes">
<source>%Ln profile(s) exported</source>
<translation>
@@ -8667,21 +8675,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>tutti i profili personali</translation>
</message>
<message>
- <source>An import is pending to be saved. Additional imports are not allowed</source>
- <oldsource>An import is pending to be saved. Additional imports are not allowed.</oldsource>
- <translation type="unfinished">Un&apos;importazione è in fase di salvataggio. Non sono consentite importazioni aggiuntive.</translation>
- </message>
- <message>
- <source>An export of profiles is only allowed for personal profiles</source>
- <oldsource>An export of profiles is only allowed for personal profiles.</oldsource>
- <translation type="unfinished">Un&apos;esportazione di profili è consentita solo per i profili personali.</translation>
- </message>
- <message>
- <source>An export of profiles is not allowed, while changes are pending</source>
- <oldsource>An export of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished">Un&apos;esportazione di profili non è consentita mentre ci sono modifiche in corso.</translation>
- </message>
- <message>
<source>Error</source>
<translation>Errore</translation>
</message>
@@ -8731,27 +8724,27 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>This is a system provided profile</source>
- <translation type="unfinished"></translation>
+ <translation>Questo è un profilo fornito dal sistema</translation>
</message>
<message>
<source>A profile change for this name is pending</source>
- <translation type="unfinished"></translation>
+ <translation>Una modifica al profilo per questo nome è in corso</translation>
</message>
<message>
<source> (See: %1)</source>
- <translation type="unfinished"></translation>
+ <translation> (Vedi: %1)</translation>
</message>
<message>
<source>This is an invalid profile definition</source>
- <translation type="unfinished"></translation>
+ <translation>Questa è una definizione non valida di un profilo</translation>
</message>
<message>
<source>A profile already exists with this name</source>
- <translation type="unfinished"></translation>
+ <translation>Un profilo con questo nome esiste già</translation>
</message>
<message>
<source>A profile with this name is being deleted</source>
- <translation type="unfinished"></translation>
+ <translation>Un profilo con questo nome è in fase di eliminazione</translation>
</message>
<message>
<source>Created from default settings</source>
@@ -8788,11 +8781,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>A profile name cannot contain the &apos;/&apos; character</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>A profile name cannot contain the &apos;/&apos; character.</source>
- <translation type="vanished">Il nome di un profilo non può contenere il carattere &apos;/&apos;. </translation>
+ <translation>Il nome di un profilo non può contenere il carattere &apos;/&apos;</translation>
</message>
<message>
<source>A profile cannot start or end with a period (.)</source>
@@ -8803,10 +8792,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Predefinito</translation>
</message>
<message>
- <source>This is a system provided profile.</source>
- <translation type="vanished">Questo è un profilo fornito dal sistema.</translation>
- </message>
- <message>
<source>Global</source>
<translation>Globale</translation>
</message>
@@ -8815,10 +8800,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Personale</translation>
</message>
<message>
- <source>A profile already exists with this name.</source>
- <translation type="vanished">Un profilo con questo nome esiste già.</translation>
- </message>
- <message>
<source>Renamed from: %1</source>
<translation>Rinominato da: %1</translation>
</message>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 828bc8f74c..8c78811052 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -5672,11 +5672,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Manage Profiles</source>
- <oldsource>Manage Profiles...</oldsource>
- <translation>プロファイルの管理</translation>
- </message>
- <message>
<source>Import</source>
<translation type="unfinished">インポート</translation>
</message>
@@ -5693,16 +5688,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">エクスポート</translation>
</message>
<message>
- <source>New</source>
- <oldsource>New...</oldsource>
- <translation>新規</translation>
- </message>
- <message>
- <source>Edit</source>
- <oldsource>Edit...</oldsource>
- <translation>編集</translation>
- </message>
- <message>
<source>Delete</source>
<translation>削除</translation>
</message>
@@ -5782,6 +5767,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>パケットなし</translation>
</message>
<message>
+ <source>Manage Profiles</source>
+ <translation>プロファイルの管理</translation>
+ </message>
+ <message>
+ <source>New</source>
+ <translation>新規</translation>
+ </message>
+ <message>
+ <source>Edit</source>
+ <translation>編集</translation>
+ </message>
+ <message>
<source>selected personal profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8580,11 +8577,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">エクスポート</translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending</source>
- <oldsource>An import of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8610,6 +8602,22 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <source>An import of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
<source>%Ln profile(s) exported</source>
<translation type="unfinished">
@@ -8641,21 +8649,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import is pending to be saved. Additional imports are not allowed</source>
- <oldsource>An import is pending to be saved. Additional imports are not allowed.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is only allowed for personal profiles</source>
- <oldsource>An export of profiles is only allowed for personal profiles.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is not allowed, while changes are pending</source>
- <oldsource>An export of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Error</source>
<translation type="unfinished">エラー</translation>
</message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 3cd1103ba9..60299f9110 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -5691,11 +5691,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Profil: %1</translation>
</message>
<message>
- <source>Manage Profiles</source>
- <oldsource>Manage Profiles...</oldsource>
- <translation>Zarządzaj profilami</translation>
- </message>
- <message>
<source>Import</source>
<translation type="unfinished">Importuj</translation>
</message>
@@ -5712,16 +5707,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Eksportuj</translation>
</message>
<message>
- <source>New</source>
- <oldsource>New...</oldsource>
- <translation>Nowy</translation>
- </message>
- <message>
- <source>Edit</source>
- <oldsource>Edit...</oldsource>
- <translation>Edytuj</translation>
- </message>
- <message>
<source>Delete</source>
<translation>Usuń</translation>
</message>
@@ -5803,6 +5788,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Brak pakietów</translation>
</message>
<message>
+ <source>Manage Profiles</source>
+ <translation>Zarządzaj profilami</translation>
+ </message>
+ <message>
+ <source>New</source>
+ <translation>Nowy</translation>
+ </message>
+ <message>
+ <source>Edit</source>
+ <translation>Edytuj</translation>
+ </message>
+ <message>
<source>selected personal profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8606,11 +8603,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Eksportuj</translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending</source>
- <oldsource>An import of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8638,6 +8630,22 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <source>An import of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
<source>%Ln profile(s) exported</source>
<translation type="unfinished">
@@ -8671,21 +8679,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import is pending to be saved. Additional imports are not allowed</source>
- <oldsource>An import is pending to be saved. Additional imports are not allowed.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is only allowed for personal profiles</source>
- <oldsource>An export of profiles is only allowed for personal profiles.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is not allowed, while changes are pending</source>
- <oldsource>An export of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts
index 58d7ced8bc..6b60d3d7df 100644
--- a/ui/qt/wireshark_ru.ts
+++ b/ui/qt/wireshark_ru.ts
@@ -5701,11 +5701,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Профиль: %1</translation>
</message>
<message>
- <source>Manage Profiles</source>
- <oldsource>Manage Profiles...</oldsource>
- <translation>Управлять Профилями</translation>
- </message>
- <message>
<source>Import</source>
<translation type="unfinished">Импорт</translation>
</message>
@@ -5722,16 +5717,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Экспорт</translation>
</message>
<message>
- <source>New</source>
- <oldsource>New...</oldsource>
- <translation>Новый</translation>
- </message>
- <message>
- <source>Edit</source>
- <oldsource>Edit...</oldsource>
- <translation>Редактировать</translation>
- </message>
- <message>
<source>Delete</source>
<translation>Удалить</translation>
</message>
@@ -5813,6 +5798,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Нет Пакетов</translation>
</message>
<message>
+ <source>Manage Profiles</source>
+ <translation>Управлять Профилями</translation>
+ </message>
+ <message>
+ <source>New</source>
+ <translation>Новый</translation>
+ </message>
+ <message>
+ <source>Edit</source>
+ <translation>Редактировать</translation>
+ </message>
+ <message>
<source>selected personal profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8617,11 +8614,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Экспорт</translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending</source>
- <oldsource>An import of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8649,6 +8641,22 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <source>An import of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
<source>%Ln profile(s) exported</source>
<translation type="unfinished">
@@ -8682,21 +8690,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import is pending to be saved. Additional imports are not allowed</source>
- <oldsource>An import is pending to be saved. Additional imports are not allowed.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is only allowed for personal profiles</source>
- <oldsource>An export of profiles is only allowed for personal profiles.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is not allowed, while changes are pending</source>
- <oldsource>An export of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Error</source>
<translation type="unfinished">Ошибка</translation>
</message>
diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts
index 3865b08ae0..8625a908a0 100644
--- a/ui/qt/wireshark_sv.ts
+++ b/ui/qt/wireshark_sv.ts
@@ -5685,11 +5685,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Profil: %1</translation>
</message>
<message>
- <source>Manage Profiles</source>
- <oldsource>Manage Profiles...</oldsource>
- <translation>Hantera profiler</translation>
- </message>
- <message>
<source>Import</source>
<translation type="unfinished">Importera</translation>
</message>
@@ -5706,16 +5701,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation type="unfinished">Exportera</translation>
</message>
<message>
- <source>New</source>
- <oldsource>New...</oldsource>
- <translation>Ny</translation>
- </message>
- <message>
- <source>Edit</source>
- <oldsource>Edit...</oldsource>
- <translation>Redigera</translation>
- </message>
- <message>
<source>Delete</source>
<translation>Ta bort</translation>
</message>
@@ -5796,6 +5781,18 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Inga paket</translation>
</message>
<message>
+ <source>Manage Profiles</source>
+ <translation>Hantera profiler</translation>
+ </message>
+ <message>
+ <source>New</source>
+ <translation>Ny</translation>
+ </message>
+ <message>
+ <source>Edit</source>
+ <translation>Redigera</translation>
+ </message>
+ <message>
<source>selected personal profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8597,11 +8594,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation type="unfinished">Exportera</translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending</source>
- <oldsource>An import of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8628,6 +8620,22 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <source>An import of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
<source>%Ln profile(s) exported</source>
<translation type="unfinished">
@@ -8660,21 +8668,6 @@ 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 is pending to be saved. Additional imports are not allowed</source>
- <oldsource>An import is pending to be saved. Additional imports are not allowed.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is only allowed for personal profiles</source>
- <oldsource>An export of profiles is only allowed for personal profiles.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is not allowed, while changes are pending</source>
- <oldsource>An export of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Error</source>
<translation type="unfinished">Fel</translation>
</message>
diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts
index 834adc94b7..c962805593 100644
--- a/ui/qt/wireshark_uk.ts
+++ b/ui/qt/wireshark_uk.ts
@@ -5618,11 +5618,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Manage Profiles</source>
- <oldsource>Manage Profiles...</oldsource>
- <translation>Управління Профілями</translation>
- </message>
- <message>
<source>Import</source>
<translation type="unfinished">Імпортувати</translation>
</message>
@@ -5639,16 +5634,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Експортувати</translation>
</message>
<message>
- <source>New</source>
- <oldsource>New...</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Edit</source>
- <oldsource>Edit...</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Delete</source>
<translation>Видалити</translation>
</message>
@@ -5730,6 +5715,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Пакети відсутні</translation>
</message>
<message>
+ <source>Manage Profiles</source>
+ <translation>Управління Профілями</translation>
+ </message>
+ <message>
+ <source>New</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Edit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>selected personal profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8523,11 +8520,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">Експортувати</translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending</source>
- <oldsource>An import of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8555,6 +8547,22 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <source>An import of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
<source>%Ln profile(s) exported</source>
<translation type="unfinished">
@@ -8588,21 +8596,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import is pending to be saved. Additional imports are not allowed</source>
- <oldsource>An import is pending to be saved. Additional imports are not allowed.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is only allowed for personal profiles</source>
- <oldsource>An export of profiles is only allowed for personal profiles.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is not allowed, while changes are pending</source>
- <oldsource>An export of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Error</source>
<translation type="unfinished">Помилка</translation>
</message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 68c4343755..cfb1baf455 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -5664,11 +5664,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>配置:%1</translation>
</message>
<message>
- <source>Manage Profiles</source>
- <oldsource>Manage Profiles...</oldsource>
- <translation>管理配置文件</translation>
- </message>
- <message>
<source>Import</source>
<translation type="unfinished">导入</translation>
</message>
@@ -5685,16 +5680,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">导出</translation>
</message>
<message>
- <source>New</source>
- <oldsource>New...</oldsource>
- <translation>新建</translation>
- </message>
- <message>
- <source>Edit</source>
- <oldsource>Edit...</oldsource>
- <translation>编辑</translation>
- </message>
- <message>
<source>Delete</source>
<translation>删除</translation>
</message>
@@ -5774,6 +5759,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>无分组</translation>
</message>
<message>
+ <source>Manage Profiles</source>
+ <translation>管理配置文件</translation>
+ </message>
+ <message>
+ <source>New</source>
+ <translation>新建</translation>
+ </message>
+ <message>
+ <source>Edit</source>
+ <translation>编辑</translation>
+ </message>
+ <message>
<source>selected personal profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8571,11 +8568,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished">导出</translation>
</message>
<message>
- <source>An import of profiles is not allowed, while changes are pending</source>
- <oldsource>An import of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>New profile</source>
<translation type="unfinished"></translation>
</message>
@@ -8601,6 +8593,22 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <source>An import of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An import is pending to be saved. Additional imports are not allowed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is only allowed for personal profiles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>An export of profiles is not allowed, while changes are pending</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
<source>%Ln profile(s) exported</source>
<translation type="unfinished">
@@ -8632,21 +8640,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>An import is pending to be saved. Additional imports are not allowed</source>
- <oldsource>An import is pending to be saved. Additional imports are not allowed.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is only allowed for personal profiles</source>
- <oldsource>An export of profiles is only allowed for personal profiles.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>An export of profiles is not allowed, while changes are pending</source>
- <oldsource>An export of profiles is not allowed, while changes are pending.</oldsource>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Error</source>
<translation type="unfinished">错误</translation>
</message>