aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS15
-rw-r--r--debian/po/fr.po4
-rw-r--r--enterprises.tsv35
-rw-r--r--manuf75
-rw-r--r--ui/qt/wireshark_de.ts254
-rw-r--r--ui/qt/wireshark_en.ts194
-rw-r--r--ui/qt/wireshark_fr.ts203
-rw-r--r--ui/qt/wireshark_it.ts254
-rw-r--r--ui/qt/wireshark_ja_JP.ts236
-rw-r--r--ui/qt/wireshark_pl.ts221
-rw-r--r--ui/qt/wireshark_ru.ts223
-rw-r--r--ui/qt/wireshark_sv.ts223
-rw-r--r--ui/qt/wireshark_uk.ts225
-rw-r--r--ui/qt/wireshark_zh_CN.ts251
14 files changed, 1593 insertions, 820 deletions
diff --git a/NEWS b/NEWS
index a9809962c4..1ff76855d8 100644
--- a/NEWS
+++ b/NEWS
@@ -58,7 +58,8 @@ Wireshark 3.1.1 Release Notes
installers are still dual-signed using SHA-1 and SHA-2.
• "Enable Protocols" Dialog now only enables/disables and inverts
- protocols based on the set filter selection
+ protocols based on the set filter selection. Also the protocol
+ type (standard or heuristic) may be choosen as filter value
New Protocol Support
@@ -71,11 +72,11 @@ Wireshark 3.1.1 Release Notes
EERO Protocol (EERO), evolved Common Public Radio Interface (eCPRI),
File Server Remote VSS Protocol (FSRVP), FTDI FT USB Bridging Devices
(FTDI FT), Graylog Extended Log Format over UDP (GELF), GSM/3GPP CBSP
- (Cell Broadcast Service Protocol), MIDI System Exclusive DigiTech
- (SYSEX DigiTech), Network Controller Sideband Interface (NCSI), NR
- Positioning Protocol A (NRPPa) TS 38.455, NVM Express over Fabrics
- for TCP (nvme-tcp), and OsmoTRX Protocol (GSM Transceiver control and
- data)
+ (Cell Broadcast Service Protocol), Linux net_dm (network drop
+ monitor) protocol, MIDI System Exclusive DigiTech (SYSEX DigiTech),
+ Network Controller Sideband Interface (NCSI), NR Positioning Protocol
+ A (NRPPa) TS 38.455, NVM Express over Fabrics for TCP (nvme-tcp), and
+ OsmoTRX Protocol (GSM Transceiver control and data)
Updated Protocol Support
@@ -123,7 +124,7 @@ Wireshark 3.1.1 Release Notes
A complete FAQ is available on the Wireshark web site[10].
- Last updated 2019-09-01 08:06:40 UTC
+ Last updated 2019-09-08 08:10:00 UTC
References
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 40397868c6..b8e14c2eed 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -4,14 +4,14 @@
#
# Translators:
# Simon Paillard <spaillard@debian.org>, 2009
-# Yann Domingo <yann.domingo@gmail.com>, 2019
+# Yann Domingo, 2019
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2019-06-30 23:24+0000\n"
-"Last-Translator: Yann Domingo <yann.domingo@gmail.com>\n"
+"Last-Translator: Yann Domingo\n"
"Language-Team: French (http://www.transifex.com/wireshark/wireshark/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/enterprises.tsv b/enterprises.tsv
index 20daf08d4c..ae64337a13 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-30)
+# (last updated 2019-09-05)
0 Reserved
1 NxNetworks
@@ -54330,3 +54330,36 @@
54521 AP Sensing GmbH
54522 Vanderkooij Telecommunicatie BV
54523 MSS International Group
+54524 Center for Cancer and Blood Disorders
+54525 Montessori College Nijmegen
+54526 NFT Umweltdatensysteme GmbH
+54527 Power Micro Controls America
+54528 Datatrust Solutions
+54529 jbash aka John Bashinski
+54530 Solvequest GmbH
+54531 Rhe-Ma Steuer­beratungs­gesell­schaft mbH
+54532 Sinteck
+54533 上海鼎频通信技术有限公司 (Shanghai Dingpin Communication Technology Co., Ltd.)
+54534 D-Wave Systems, Inc.
+54535 Alcon Vision, LLC
+54536 OSAKIDETZA
+54537 Forestlink AB
+54538 FedEx Services
+54539 Wizkers.io
+54540 Rescale Inc.
+54541 Fuse Integration
+54542 Qoppao LLC
+54543 cumulusone LLC
+54544 Metrodata GmbH
+54545 Companhia de processamento de dados do estado do Rio Grande do Sul
+54546 California Kidney Specialists
+54547 L'Xtreme
+54548 Vereign AG
+54549 TSINGHUA TONGFANG CO., LTD.
+54550 MD Clinics
+54551 北京用友政务软件股份有限公司 (Beijing UF Government Software Co., Ltd.)
+54552 BPSC
+54553 Organización de Estados Iberoamericanos - OEI
+54554 Universität des Saarlandes - Hochschul-IT-Zentrum
+54555 YARUS Networks
+54556 Finko Group
diff --git a/manuf b/manuf
index 9e8e9d1279..f8e6d71fb8 100644
--- a/manuf
+++ b/manuf
@@ -44,24 +44,24 @@
# https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob_plain;f=manuf;hb=HEAD
# http://standards-oui.ieee.org/cid/cid.csv:
-# Content-Length: 7621
-# Last-Modified: Sun, 01 Sep 2019 08:00:18 GMT
+# Content-Length: 7688
+# Last-Modified: Sun, 08 Sep 2019 08:00:18 GMT
# http://standards-oui.ieee.org/iab/iab.csv:
-# Content-Length: 381239
-# Last-Modified: Sun, 01 Sep 2019 08:00:31 GMT
+# Content-Length: 381258
+# Last-Modified: Sun, 08 Sep 2019 08:00:29 GMT
# http://standards-oui.ieee.org/oui/oui.csv:
-# Content-Length: 2408569
-# Last-Modified: Sun, 01 Sep 2019 08:00:58 GMT
+# Content-Length: 2411533
+# Last-Modified: Sun, 08 Sep 2019 08:00:58 GMT
# http://standards-oui.ieee.org/oui28/mam.csv:
-# Content-Length: 291737
-# Last-Modified: Sun, 01 Sep 2019 08:00:37 GMT
+# Content-Length: 293484
+# Last-Modified: Sun, 08 Sep 2019 08:00:36 GMT
# http://standards-oui.ieee.org/oui36/oui36.csv:
-# Content-Length: 304305
-# Last-Modified: Sun, 01 Sep 2019 08:00:52 GMT
+# Content-Length: 305196
+# Last-Modified: Sun, 08 Sep 2019 08:00:52 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
@@ -13768,7 +13768,7 @@
00:50:C2:AC:90:00/36 Steinbei Steinbeis-Transferzentrum Embedded Design und Networking
00:50:C2:AC:A0:00/36 SoftCont Soft & Control Technology s.r.o.
00:50:C2:AC:B0:00/36 U-Care U-Care Inc.
-00:50:C2:AC:C0:00/36 Stockery StockerYale
+00:50:C2:AC:C0:00/36 Prophoto ProPhotonix
00:50:C2:AC:D0:00/36 Meshwork MeshWorks Wireless Oy
00:50:C2:AC:E0:00/36 Chronolo ChronoLogic Pty. Ltd.
00:50:C2:AC:F0:00/36 SpContro SP Controls, Inc
@@ -15454,6 +15454,7 @@
00:64:A6 MaquetCa Maquet CardioVascular
00:66:4B HuaweiTe Huawei Technologies Co.,Ltd
00:67:62 Fiberhom Fiberhome Telecommunication Technologies Co.,LTD
+00:68:EB Hp HP Inc.
00:6B:8E Shanghai Shanghai Feixun Communication Co.,Ltd.
00:6B:9E Vizio Vizio, Inc
00:6B:A0 Shenzhen Shenzhen Universal Intellisys Pte Ltd
@@ -20605,6 +20606,7 @@
30:FC:68 Tp-LinkT Tp-Link Technologies Co.,Ltd.
30:FD:11 Macrotec Macrotech (Usa) Inc.
30:FD:38 Google Google, Inc.
+30:FD:65 HuaweiTe Huawei Technologies Co.,Ltd
30:FE:31 Nokia
30:FF:F6 Hangzhou HangZhou KuoHeng Technology Co.,ltd
34:00:8A IeeeRegi IEEE Registration Authority
@@ -21695,6 +21697,7 @@
40:A5:EF Shenzhen Shenzhen Four Seas Global Link Network Technology Co., Ltd.
40:A6:77 JuniperN Juniper Networks
40:A6:A4 Passivsy PassivSystems Ltd
+40:A6:B7 IntelCor Intel Corporate
40:A6:D9 Apple Apple, Inc.
40:A6:E8 Cisco Cisco Systems, Inc
40:A8:F0 HewlettP Hewlett Packard
@@ -22577,6 +22580,7 @@
48:1A:84 PointerT Pointer Telocation Ltd
48:1B:D2 IntronSc Intron Scientific co., ltd.
48:1D:70 CiscoSpv Cisco SPVTG
+48:21:0B Pegatron Pegatron Corporation
48:21:6C ChinaMob China Mobile IOT Company Limited
48:26:E8 Tek-Air Tek-Air Systems, Inc.
48:27:59 LevvenEl Levven Electronics Ltd.
@@ -22698,6 +22702,7 @@
48:A3:80 GioneeCo Gionee Communication Equipment Co.,Ltd.
48:A4:72 IntelCor Intel Corporate
48:A4:93 TaiyoYud Taiyo Yuden Co.,Ltd
+48:A5:E7 Nintendo Nintendo Co.,Ltd
48:A6:B8 Sonos Sonos, Inc.
48:A6:D2 GjsunOpt GJsun Optical Science and Tech Co.,Ltd.
48:A7:3C SichuanT Sichuan tianyi kanghe communications co., LTD
@@ -22787,6 +22792,7 @@
4A:72:06 Caire CAIRE, Inc.
4A:7F:74 Intec INTEC Inc.
4A:C0:3F WuhanHik Wuhan Hikstorage Technology Co.,Ltd
+4A:CA:3E Zeus
4A:DA:10 EmotivaA Emotiva Audio Corp
4C:00:82 Cisco Cisco Systems, Inc
4C:01:43 Eero eero inc.
@@ -23068,6 +23074,7 @@
4C:F1:9E GroupeAt Groupe Atlantic
4C:F2:BF Cambridg Cambridge Industries(Group) Co.,Ltd.
4C:F4:5B BlueClov Blue Clover Devices
+4C:F5:5B HuaweiTe Huawei Technologies Co.,Ltd
4C:F5:A0 Scalable Scalable Network Technologies Inc
4C:F7:37 SamjiEle SamJi Electronics Co., Ltd
4C:F9:5D HuaweiTe Huawei Technologies Co.,Ltd
@@ -23186,12 +23193,21 @@
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:00:00:00/28 UfanetSc Ufanet SC
+50:62:55:10:00:00/28 Hagiwara Hagiwara Solutions Co., Ltd
+50:62:55:20:00:00/28 Shenzhen ShenZhen ChuangMo Electronics Technology Co., Ltd
50:62:55:30:00:00/28 Hypertec Hypertech Advance Co., LTD
50:62:55:40:00:00/28 Xslab XSLAB Inc.
+50:62:55:50:00:00/28 SuzhouRu Suzhou Ruixinjie Information Technology Co.,Ltd
50:62:55:60:00:00/28 Shenzhen Shenzhen Sinway South Technology Co., Ltd
50:62:55:70:00:00/28 AvtechSo AVTECH Software, Inc.
+50:62:55:80:00:00/28 RodaIndu Roda industrial development Co.,Ltd.
+50:62:55:90:00:00/28 Southern Southern Ground Audio LLC
+50:62:55:A0:00:00/28 CctvManu CCTV Manufacturer
50:62:55:B0:00:00/28 ChengduC Chengdu Cove Technology Co.,Ltd
+50:62:55:C0:00:00/28 AedDistr AED Distribution
50:62:55:D0:00:00/28 CottElec COTT Electronics
+50:62:55:E0:00:00/28 Shinsoft Shinsoft Co., Ltd.
50:63:13 HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
50:64:2B XiaomiEl XIAOMI Electronics,CO.,LTD
50:64:41 Greenlee
@@ -23763,6 +23779,7 @@
58:CF:4B LufkinIn Lufkin Industries
58:D0:71 BwBroadc BW Broadcast
58:D0:8F Ieee1904 IEEE 1904.1 Working Group
+58:D5:0A MurataMa Murata Manufacturing Co., Ltd.
58:D5:6E D-LinkIn D-Link International
58:D6:7A Tcplink
58:D6:D3 DairyChe Dairy Cheq Inc
@@ -23797,6 +23814,7 @@
58:E8:76:C0:00:00/28 KustomSi Kustom Signals Inc
58:E8:76:D0:00:00/28 XiamenCa Xiamen Cacamle Technology Co.,Ltd.
58:E8:76:E0:00:00/28 BaoruhEl Baoruh Electronic Co., Ltd.
+58:EA:FC Ell-Iot ELL-IoT Inc
58:EB:14 ProteusD Proteus Digital Health
58:EC:E1 Newport Newport Corporation
58:EC:ED Integrat Integrated Device Technology (Malaysia) Sdn. Bhd.
@@ -24070,6 +24088,7 @@
60:0B:03 Hangzhou Hangzhou H3C Technologies Co., Limited
60:0F:77 Silverpl SilverPlus, Inc
60:11:99 Siama Siama Systems Inc
+60:12:3C HuaweiTe Huawei Technologies Co.,Ltd
60:12:83 TsbRealT Tsb Real Time Location Systems S.L.
60:12:8B Canon Canon Inc.
60:14:66 Zte zte corporation
@@ -24350,7 +24369,13 @@
64:27:37 HonHaiPr Hon Hai Precision Ind. Co.,Ltd.
64:29:ED Ao"PkkMi AO "PKK Milandr"
64:2B:8A AllBestI ALL BEST Industrial Co., Ltd.
+64:2C:AC HuaweiTe Huawei Technologies Co.,Ltd
64:2D:B7 SeungilE Seungil Electronics
+64:31:39 IeeeRegi IEEE Registration Authority
+64:31:39:00:00:00/28 Shenzhen Shenzhen Emeet Intelligent Technology Co., Ltd.
+64:31:39:50:00:00/28 Shenzhen Shenzhen He&e Technology Co.,Ltd.
+64:31:39:60:00:00/28 HunanVoc Hunan Voc Acoustics Technology Co., Ltd.
+64:31:39:80:00:00/28 Shenzhen Shenzhen Huanyin Electronics Ltd.
64:31:50 HewlettP Hewlett Packard
64:31:7E Dexin Dexin Corporation
64:32:A8 IntelCor Intel Corporate
@@ -24807,6 +24832,7 @@
6C:2E:72 B&BExpor B&B Exporting Limited
6C:2E:85 Sagemcom Sagemcom Broadband SAS
6C:2F:2C SamsungE Samsung Electronics Co.,Ltd
+6C:31:0E Cisco Cisco Systems, Inc
6C:32:DE IndieonT Indieon Technologies Pvt. Ltd.
6C:33:A9 Magicjac Magicjack LP
6C:38:38 MarkingS Marking System Technology Co., Ltd.
@@ -24981,6 +25007,7 @@
6C:E9:07 Nokia Nokia Corporation
6C:E9:83 Gastron Gastron Co., LTD.
6C:EB:B2 Dongguan Dongguan Sen DongLv Electronics Co.,Ltd
+6C:EB:B6 HuaweiTe Huawei Technologies Co.,Ltd
6C:EC:5A HonHaiPr Hon Hai Precision Ind. CO.,Ltd.
6C:EC:A1 Shenzhen Shenzhen Clou Electronics Co. Ltd.
6C:EC:EB TexasIns Texas Instruments
@@ -25581,6 +25608,7 @@
70:B3:D5:1C:D0:00/36 Eleusi ELEUSI GmbH
70:B3:D5:1D:00:00/36 Shenzhen Shenzhen INVT Electric Co.,Ltd
70:B3:D5:1D:10:00/36 EurotekS Eurotek Srl
+70:B3:D5:1D:20:00/36 Xacti Xacti Corporation
70:B3:D5:1D:30:00/36 AirobotO Airobot Oü
70:B3:D5:1D:40:00/36 Brinkman Brinkmann Audio GmbH
70:B3:D5:1D:70:00/36 Private
@@ -26035,6 +26063,7 @@
70:B3:D5:40:A0:00/36 MonroeEl Monroe Electronics, Inc.
70:B3:D5:40:B0:00/36 QuercusT Quercus Technologies, S.L.
70:B3:D5:40:E0:00/36 LiaoyunI Liaoyun Information Technology Co., Ltd.
+70:B3:D5:40:F0:00/36 Nexelec
70:B3:D5:41:00:00/36 AvantTec Avant Technologies, Inc
70:B3:D5:41:20:00/36 TattileS Tattile Srl
70:B3:D5:41:30:00/36 Axess Axess AG
@@ -26049,6 +26078,7 @@
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:20:00/36 Sus SUS Corporation
70:B3:D5:42:60:00/36 ZehnderG Zehnder Group Nederland
70:B3:D5:42:70:00/36 KeyChemi Key Chemical & Equipment Company
70:B3:D5:42:80:00/36 Presenta Presentation Switchers, Inc.
@@ -26305,6 +26335,7 @@
70:B3:D5:56:A0:00/36 HarvardT Harvard Technology Ltd
70:B3:D5:56:B0:00/36 SEI S.E.I. Co.,Ltd.
70:B3:D5:56:C0:00/36 Telensa Telensa Ltd
+70:B3:D5:56:D0:00/36 Pro-Digi Pro-Digital Projetos Eletronicos Ltda
70:B3:D5:56:F0:00/36 RadikalD Radikal d.o.o.
70:B3:D5:57:00:00/36 BayernEn Bayern Engineering GmbH & Co. KG
70:B3:D5:57:10:00/36 Echogear
@@ -26400,6 +26431,7 @@
70:B3:D5:5E:80:00/36 Vitec
70:B3:D5:5E:90:00/36 Zehetner Zehetner-Elektronik GmbH
70:B3:D5:5E:A0:00/36 Kys Kys,Inc
+70:B3:D5:5E:B0:00/36 LomaSRO Loma Systems s.r.o.
70:B3:D5:5E:C0:00/36 Creative Creative Electronics Ltd
70:B3:D5:5E:D0:00/36 EaElektr EA Elektroautomatik GmbH & Co. KG
70:B3:D5:5E:E0:00/36 Mikrotro Mikrotron Mikrocomputer, Digital- und Analogtechnik GmbH
@@ -26512,6 +26544,7 @@
70:B3:D5:67:A0:00/36 Micatu
70:B3:D5:67:B0:00/36 Stesalit Stesalit Systems Ltd
70:B3:D5:67:D0:00/36 Acrodea Acrodea, Inc.
+70:B3:D5:67:E0:00/36 SeasonEl Season Electronics Ltd
70:B3:D5:68:00:00/36 Basf BASF Corporation
70:B3:D5:68:20:00/36 Rosslare Rosslare Enterprises Limited
70:B3:D5:68:40:00/36 Leco LECO Corporation
@@ -27158,7 +27191,7 @@
70:B3:D5:9B:50:00/36 Ideetron Ideetron b.v.
70:B3:D5:9B:60:00/36 Intercom Intercomp S.p.A.
70:B3:D5:9B:70:00/36 Itronics Itronics Ltd
-70:B3:D5:9B:80:00/36 Loma Loma Systems
+70:B3:D5:9B:80:00/36 LomaSRO Loma Systems s.r.o.
70:B3:D5:9B:90:00/36 AetheraT Aethera Technologies
70:B3:D5:9B:A0:00/36 AtimRadi ATIM Radiocommunication
70:B3:D5:9B:D0:00/36 SignalPr Signal Processing Devices Sweden AB
@@ -27347,6 +27380,7 @@
70:B3:D5:A9:50:00/36 Deuta-We DEUTA-WERKE GmbH
70:B3:D5:A9:60:00/36 ÖstlingM Östling Marking Systems GmbH
70:B3:D5:A9:70:00/36 Bizwerks Bizwerks, LLC
+70:B3:D5:A9:80:00/36 Pantec Pantec AG
70:B3:D5:A9:90:00/36 Bandelin Bandelin electronic GmbH & Co. KG
70:B3:D5:A9:A0:00/36 Amphenol Amphenol Advanced Sensors
70:B3:D5:A9:B0:00/36 Osmozis
@@ -27787,6 +27821,7 @@
70:B3:D5:CC:10:00/36 Beecube BEEcube Inc.
70:B3:D5:CC:20:00/36 LscLight LSC Lighting Systems (Aust) Pty Ltd
70:B3:D5:CC:30:00/36 FidaliaN Fidalia Networks Inc
+70:B3:D5:CC:40:00/36 Benchmar Benchmark Electronics BV
70:B3:D5:CC:50:00/36 Intecom
70:B3:D5:CC:60:00/36 MbConnec MB connect line GmbH Fernwartungssysteme
70:B3:D5:CC:80:00/36 ProfenCo Profen Communications
@@ -28174,6 +28209,7 @@
70:B3:D5:EB:40:00/36 RoboticR Robotic Research, LLC
70:B3:D5:EB:50:00/36 Justek Justek Inc
70:B3:D5:EB:70:00/36 Skreens
+70:B3:D5:EB:80:00/36 EmporiaR Emporia Renewable Energy Corp
70:B3:D5:EB:90:00/36 ThielAud Thiel Audio Products Company, LLC
70:B3:D5:EB:A0:00/36 LastMile Last Mile Gear
70:B3:D5:EB:B0:00/36 BeijingW Beijing Wing ICT Technology Co., Ltd.
@@ -28225,6 +28261,7 @@
70:B3:D5:EF:90:00/36 Critical Critical Link LLC
70:B3:D5:EF:A0:00/36 NexteraE NextEra Energy Resources, LLC
70:B3:D5:EF:B0:00/36 PxmSpK PXM sp.k.
+70:B3:D5:EF:D0:00/36 Cambridg Cambridge Technology, Inc.
70:B3:D5:EF:E0:00/36 MeidenSy Meiden System Solutions
70:B3:D5:EF:F0:00/36 CarloGav Carlo Gavazzi Industri
70:B3:D5:F0:00:00/36 AplexTec Aplex Technology Inc.
@@ -28839,6 +28876,7 @@
78:11:DC XiaomiEl XIAOMI Electronics,CO.,LTD
78:12:B8 Orantek Orantek Limited
78:17:35 NokiaSha Nokia Shanghai Bell Co., Ltd.
+78:17:BE HuaweiTe Huawei Technologies Co.,Ltd
78:18:81 Azurewav AzureWave Technology Inc.
78:19:2E NascentT NASCENT Technology
78:19:F7 JuniperN Juniper Networks
@@ -28989,6 +29027,7 @@
78:B2:8D BeijingT Beijing Tengling Technology CO.Ltd
78:B3:B9 Shanghai ShangHai sunup lighting CO.,LTD
78:B3:CE EloTouch Elo touch solutions
+78:B4:6A HuaweiTe Huawei Technologies Co.,Ltd
78:B5:D2 EverTrea Ever Treasure Industrial Limited
78:B6:C1 AoboTele AOBO Telecom Co.,Ltd
78:B6:EC ScufGami Scuf Gaming International LLC
@@ -29172,6 +29211,7 @@
7C:2E:BD Google Google, Inc.
7C:2E:DD SamsungE Samsung Electronics Co.,Ltd
7C:2F:80 GigasetC Gigaset Communications GmbH
+7C:31:0E Cisco Cisco Systems, Inc
7C:33:6E MegElect MEG Electronics Inc.
7C:35:48 Transcen Transcend Information
7C:38:66 TexasIns Texas Instruments
@@ -29992,6 +30032,7 @@
88:10:36 PanodicS Panodic(ShenZhen) Electronics Limted
88:10:8F HuaweiTe Huawei Technologies Co.,Ltd
88:11:96 HuaweiTe Huawei Technologies Co.,Ltd
+88:12:3D SuzhouAq Suzhou Aquila Solutions Inc.
88:12:4E Qualcomm Qualcomm Inc.
88:14:2B Protonic Protonic Holland
88:15:44 CiscoMer Cisco Meraki
@@ -30479,6 +30520,7 @@
8C:B8:2C IpitomyC IPitomy Communications
8C:B8:4A SamsungE Samsung Electro-Mechanics(Thailand)
8C:B8:64 AcsipTec AcSiP Technology Corp.
+8C:BA:25 Unionman Unionman Technology Co.,Ltd
8C:BE:24 TashangS Tashang Semiconductor(Shanghai) Co., Ltd.
8C:BE:BE XiaomiCo Xiaomi Communications Co Ltd
8C:BF:9D Shanghai Shanghai Xinyou Information Technology Ltd. Co.
@@ -30573,6 +30615,7 @@
90:0E:83 MonicoMo Monico Monitoring, Inc.
90:0E:B3 Shenzhen Shenzhen Amediatech Technology Co., Ltd.
90:12:34 Shenzhen Shenzhen YOUHUA Technology Co., Ltd
+90:13:DA AthomBV Athom B.V.
90:17:11 HagenukM Hagenuk Marinekommunikation GmbH
90:17:9B Nanomega Nanomegas
90:17:AC HuaweiTe Huawei Technologies Co.,Ltd
@@ -30734,6 +30777,7 @@
90:AC:3F Brightsi BrightSign LLC
90:AD:F7 VivoMobi vivo Mobile Communication Co., Ltd.
90:AE:1B Tp-LinkT Tp-Link Technologies Co.,Ltd.
+90:AF:D1 Netkti netKTI Co., Ltd
90:B0:ED Apple Apple, Inc.
90:B1:1C Dell Dell Inc.
90:B1:34 ArrisGro ARRIS Group, Inc.
@@ -31617,6 +31661,7 @@ A0:19:B2:D0:00:00/28 RydElect RYD Electronic Technology Co.,Ltd.
A0:19:B2:E0:00:00/28 AhgoraSi Ahgora Sistemas SA
A0:1B:29 Sagemcom Sagemcom Broadband SAS
A0:1C:05 NimaxTel Nimax Telecom Co.,Ltd.
+A0:1C:8D HuaweiTe Huawei Technologies Co.,Ltd
A0:1D:48 HewlettP Hewlett Packard
A0:1E:0B MinixTec MINIX Technology Limited
A0:20:A6 Espressi Espressif Inc.
@@ -32453,6 +32498,7 @@ AC:1D:DF:B0:00:00/28 Fine Fine Inc.
AC:1D:DF:C0:00:00/28 BeijingC Beijing Chunhong Technology Co., Ltd.
AC:1D:DF:D0:00:00/28 Elekon Elekon AG
AC:1D:DF:E0:00:00/28 Duravit Duravit AG
+AC:1E:92 SamsungE Samsung Electronics Co.,LTD
AC:1F:6B SuperMic Super Micro Computer, Inc.
AC:1F:74 Apple Apple, Inc.
AC:1F:D7 RealVisi Real Vision Technology Co.,Ltd.
@@ -35202,6 +35248,7 @@ D4:9C:DD AmpakTec AMPAK Technology,Inc.
D4:9C:F4 PaloAlto Palo Alto Networks
D4:9D:C0 SamsungE Samsung Electronics Co.,Ltd
D4:9E:05 Zte zte corporation
+D4:9E:3B Guangzho Guangzhou Shiyuan Electronic Technology Company Limited
D4:9E:6D WuhanZho Wuhan Zhongyuan Huadian Science & Technology Co.,
D4:A0:2A Cisco Cisco Systems, Inc
D4:A1:48 HuaweiTe Huawei Technologies Co.,Ltd
@@ -35619,6 +35666,7 @@ DC:45:17 ArrisGro ARRIS Group, Inc.
DC:48:B2 BarajaPt Baraja Pty. Ltd.
DC:49:C9 CascoSig Casco Signal Ltd
DC:4A:3E HewlettP Hewlett Packard
+DC:4B:DD Shenzhen Shenzhen SuperElectron Technology Co.,Ltd.
DC:4B:FE Shenzhen Shenzhen Belon Technology CO.,LTD
DC:4D:23 MrvComun MRV Comunications
DC:4E:DE ShinyeiT Shinyei Technology Co., Ltd.
@@ -36389,6 +36437,7 @@ E8:7A:F3 S5TechSR S5 Tech S.r.l.
E8:80:2E Apple Apple, Inc.
E8:80:D8 GntekEle GNTEK Electronics Co.,Ltd.
E8:82:5B ArrisGro ARRIS Group, Inc.
+E8:84:C6 HuaweiTe Huawei Technologies Co.,Ltd
E8:87:A3 LoxleyPu Loxley Public Company Limited
E8:88:6C Shenzhen Shenzhen SC Technologies Co.,LTD
E8:89:2C ArrisGro ARRIS Group, Inc.
@@ -36827,6 +36876,7 @@ F0:6D:78 Guangdon Guangdong Oppo Mobile Telecommunications Corp.,Ltd
F0:6E:0B Microsof Microsoft Corporation
F0:6E:32 Microtel Microtel Innovation S.R.L.
F0:72:8C SamsungE Samsung Electronics Co.,Ltd
+F0:72:EA Google Google, Inc.
F0:73:AE Peak-Sys PEAK-System Technik
F0:74:85 Ngd NGD Systems, Inc.
F0:74:E4 Thunderc Thundercomm Technology Co., Ltd
@@ -37181,6 +37231,7 @@ F4:DC:DA ZhuhaiJi Zhuhai Jiahe Communication Technology Co., limited
F4:DC:F9 HuaweiTe Huawei Technologies Co.,Ltd
F4:DD:9E Gopro
F4:DE:0C Espod ESPOD Ltd.
+F4:DE:AF HuaweiTe Huawei Technologies Co.,Ltd
F4:E1:1E TexasIns Texas Instruments
F4:E1:42 DeltaEle Delta Elektronika BV
F4:E2:04 Traqueur
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 5d01ebd357..3ea56d5c8f 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1605,10 +1605,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Einfärbungsregeln %1</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Kopieren von</translation>
- </message>
- <message>
<source>Copy coloring rules from another profile.</source>
<translation>Einfärbungsregeln von einem anderen Profil kopieren.</translation>
</message>
@@ -1771,22 +1767,15 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<name>CopyFromProfileButton</name>
<message>
<source>Copy from</source>
- <translation type="unfinished">Kopieren von</translation>
+ <translation>Kopieren von</translation>
</message>
<message>
<source>Copy entries from another profile.</source>
- <translation type="unfinished">Einträge von einem anderen Profil kopieren.</translation>
- </message>
- <message>
- <source>System default</source>
- <translation type="unfinished">Standard</translation>
+ <translation>Einträge von einem anderen Profil kopieren.</translation>
</message>
-</context>
-<context>
- <name>CopyFromProfileMenu</name>
<message>
<source>System default</source>
- <translation type="vanished">Standard</translation>
+ <translation>Standard</translation>
</message>
</context>
<context>
@@ -1970,12 +1959,9 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Gespeicherte Lesezeichen verwalten</translation>
</message>
<message>
- <source>Clear display filter</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Apply this filter string to the display.</source>
- <translation>Diesen Filter zur Anzeige anwenden.</translation>
+ <source>Apply display filter</source>
+ <oldsource>Apply this filter string to the display.</oldsource>
+ <translation type="unfinished">Diesen Filter zur Anzeige anwenden.</translation>
</message>
<message>
<source>Apply a display filter %1 &lt;%2/&gt;</source>
@@ -1986,6 +1972,10 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Geben Sie einen Anzeigefilter ein %1</translation>
</message>
<message>
+ <source>Clear display filter</source>
+ <translation>Anzeigefilter zurücksetzen</translation>
+ </message>
+ <message>
<source>Apply a read filter %1</source>
<translation>Lesefilter anwenden %1</translation>
</message>
@@ -2009,14 +1999,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<source>Manage Filter Expressions</source>
<translation>Filterausdrücke verwalten</translation>
</message>
- <message>
- <source>Selected</source>
- <translation type="vanished">Ausgewählt</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">Nicht Ausgewählt</translation>
- </message>
</context>
<context>
<name>DisplayFilterExpressionDialog</name>
@@ -2162,6 +2144,10 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Suchen:</translation>
</message>
<message>
+ <source>in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Enable All</source>
<translation>Alle aktivieren</translation>
</message>
@@ -2179,14 +2165,26 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>Everywhere</source>
- <translation type="unfinished"></translation>
+ <translation>Überall</translation>
</message>
<message>
<source>Only Protocols</source>
- <translation type="unfinished"></translation>
+ <translation>Nur Protokolle</translation>
</message>
<message>
<source>Only Description</source>
+ <translation>Nur Beschreibungen</translation>
+ </message>
+ <message>
+ <source>any protocol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>non-heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>heuristic protocols</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2241,6 +2239,53 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
</context>
<context>
+ <name>EthernetAddressModel</name>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Typ</translation>
+ </message>
+ <message>
+ <source>Mac Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">Name</translation>
+ </message>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hash Table</source>
+ <translation type="unfinished">IPv4 Hashtabelle</translation>
+ </message>
+ <message>
+ <source>IPv6 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hash Table</source>
+ <translation type="unfinished">IPv6 Hashtabelle</translation>
+ </message>
+ <message>
+ <source>Ethernet Addresses</source>
+ <translation type="unfinished">Ethernet Adressen</translation>
+ </message>
+ <message>
+ <source>Ethernet Manufacturers</source>
+ <translation type="unfinished">Ethernet Hersteller</translation>
+ </message>
+ <message>
+ <source>Ethernet Well-Known Addresses</source>
+ <translation type="unfinished">Bekannte Ethernet Adressen</translation>
+ </message>
+</context>
+<context>
<name>ExpertInfoDialog</name>
<message>
<source>Dialog</source>
@@ -2592,11 +2637,11 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<name>FilterAction</name>
<message>
<source>Selected</source>
- <translation type="unfinished">Ausgewählt</translation>
+ <translation>Ausgewählt</translation>
</message>
<message>
<source>Not Selected</source>
- <translation type="unfinished"></translation>
+ <translation>nicht das Ausgewählte</translation>
</message>
</context>
<context>
@@ -3656,10 +3701,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Kopieren</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Kopieren von</translation>
- </message>
- <message>
<source>Copy graphs from another profile.</source>
<translation>Graph von einem anderen Profil kopieren.</translation>
</message>
@@ -5815,6 +5856,10 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>%1 Ignoriert: %2 (%3%)</translation>
</message>
<message>
+ <source> %1 Comments: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source> %1 Load time: %2:%3.%4</source>
<translation>%1 Ladezeit: %2:%3.%4</translation>
</message>
@@ -6249,18 +6294,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Als Filter</translation>
</message>
<message>
- <source>&amp;Selected</source>
- <translation type="vanished">das Au&amp;sgewählte</translation>
- </message>
- <message>
- <source>&amp;Not Selected</source>
- <translation type="vanished">&amp;nicht das Ausgewählte</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">nicht das Ausgewählte</translation>
- </message>
- <message>
<source>Close this capture file</source>
<translation>Diese Mitschnittdatei schließen</translation>
</message>
@@ -7006,38 +7039,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Alle sichtbare ausgewählten Elemente</translation>
</message>
<message>
- <source>…&amp;and Selected</source>
- <translation type="vanished">...und das Ausgewählte</translation>
- </message>
- <message>
- <source>…and Selected</source>
- <translation type="vanished">...und das Ausgewählte</translation>
- </message>
- <message>
- <source>…&amp;or Selected</source>
- <translation type="vanished">...oder das Ausgewählte</translation>
- </message>
- <message>
- <source>…or Selected</source>
- <translation type="vanished">...oder das Ausgewählte</translation>
- </message>
- <message>
- <source>…a&amp;nd not Selected</source>
- <translation type="vanished">...und nicht das Ausgewählte</translation>
- </message>
- <message>
- <source>…and not Selected</source>
- <translation type="vanished">...und nicht das Ausgewählte</translation>
- </message>
- <message>
- <source>…o&amp;r not Selected</source>
- <translation type="vanished">...oder nicht das Ausgewählte</translation>
- </message>
- <message>
- <source>…or not Selected</source>
- <translation type="vanished">...oder nicht das Ausgewählte</translation>
- </message>
- <message>
<source>Display Filter &amp;Macros…</source>
<translation>Anzeigefilter &amp;Makros...</translation>
</message>
@@ -8336,6 +8337,10 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Zusammenfassung als Text</translation>
</message>
<message>
+ <source>Decode As</source>
+ <translation type="unfinished">Dekodieren als</translation>
+ </message>
+ <message>
<source>Frame %1: %2
</source>
@@ -8484,6 +8489,41 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
</context>
<context>
+ <name>PortsModel</name>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>tcp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>udp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>sctp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>dccp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">Name</translation>
+ </message>
+ <message>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Typ</translation>
+ </message>
+</context>
+<context>
<name>PreferenceEditorFrame</name>
<message>
<source>Frame</source>
@@ -9161,7 +9201,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>Prepare as Filter</source>
- <translation type="unfinished"></translation>
+ <translation>Als Filter vorbereiten</translation>
</message>
<message>
<source>Don&apos;t show this message again.</source>
@@ -9564,6 +9604,26 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Dialog</translation>
</message>
<message>
+ <source>Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for entry (min 3 characters)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ports</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for port or name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Capture File Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Comment</source>
<translation>Kommentare</translation>
</message>
@@ -9654,7 +9714,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>Show</source>
- <translation>Zeige</translation>
+ <translation type="vanished">Zeige</translation>
</message>
<message>
<source># Resolved addresses found in %1</source>
@@ -9672,7 +9732,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<source># Hosts
#
# </source>
- <translation># Hosts
+ <translation type="vanished"># Hosts
#
# </translation>
</message>
@@ -9680,7 +9740,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<source># IPv4 Hash Table
#
# </source>
- <translation># IPv4 Hash Table
+ <translation type="vanished"># IPv4 Hash Table
#
# </translation>
</message>
@@ -9688,7 +9748,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<source>
</source>
- <translation>
+ <translation type="vanished">
</translation>
</message>
@@ -9696,7 +9756,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<source># IPv6 Hash Table
#
# </source>
- <translation># IPv6 Hash Table
+ <translation type="vanished"># IPv6 Hash Table
#
# </translation>
</message>
@@ -9704,7 +9764,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<source># Services
#
# </source>
- <translation># Services
+ <translation type="vanished"># Services
#
# </translation>
</message>
@@ -9712,7 +9772,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<source># Ethernet addresses
#
# </source>
- <translation># Ethernet addresses
+ <translation type="vanished"># Ethernet addresses
#
# </translation>
</message>
@@ -9720,7 +9780,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<source># Ethernet manufacturers
#
# </source>
- <translation># Ethernet manufacturers
+ <translation type="vanished"># Ethernet manufacturers
#
# </translation>
</message>
@@ -9728,7 +9788,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<source># Well known Ethernet addresses
#
# </source>
- <translation># Well known Ethernet addresses
+ <translation type="vanished"># Well known Ethernet addresses
#
# </translation>
</message>
@@ -10247,6 +10307,10 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Audio kann nur mit 8000 Hz gespeichert werden</translation>
</message>
<message>
+ <source>Can save audio with PCM u-law or A-law encoding only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save forward stream CSV</source>
<translation>Hinweg Stream als CSV speichern</translation>
</message>
@@ -10384,7 +10448,7 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Jitter Buffer:</source>
@@ -12966,14 +13030,6 @@ Um zum Beispiel eine neue Datei zu jeder vollen Stunde zu haben, 1 Stunde angebe
<translation>Unbekannte User Accessible Table </translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Kopieren von</translation>
- </message>
- <message>
- <source>Copy entries from another profile.</source>
- <translation type="vanished">Einträge von einem anderen Profil kopieren.</translation>
- </message>
- <message>
<source>Open </source>
<translation>Öffnen</translation>
</message>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index de877fa405..e48cb96a7c 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1956,10 +1956,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>Apply this filter string to the display.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Apply a display filter %1 &lt;%2/&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -1972,6 +1968,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>Apply display filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Apply a read filter %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2138,6 +2138,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>in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Enable All</source>
<translation type="unfinished"></translation>
</message>
@@ -2165,6 +2169,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>Only Description</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>any protocol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>non-heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EnabledProtocolsModel</name>
@@ -2217,6 +2233,53 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>EthernetAddressModel</name>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Mac Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hash Table</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hash Table</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ethernet Addresses</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ethernet Manufacturers</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ethernet Well-Known Addresses</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>ExpertInfoDialog</name>
<message>
<source>Dialog</source>
@@ -5733,6 +5796,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> %1 Comments: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source> %1 Load time: %2:%3.%4</source>
<translation type="unfinished"></translation>
</message>
@@ -8210,6 +8277,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>Decode As</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Frame %1: %2
</source>
@@ -8356,6 +8427,41 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>PortsModel</name>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>tcp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>udp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>sctp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>dccp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>PreferenceEditorFrame</name>
<message>
<source>Frame</source>
@@ -9436,6 +9542,26 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for entry (min 3 characters)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ports</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for port or name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Capture File Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Comment</source>
<translation type="unfinished"></translation>
</message>
@@ -9525,10 +9651,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>Show</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source># Resolved addresses found in %1</source>
<translation type="unfinished"></translation>
</message>
@@ -9538,54 +9660,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
# </source>
<translation type="unfinished"></translation>
</message>
- <message>
- <source># Hosts
-#
-# </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source># IPv4 Hash Table
-#
-# </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>
-
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source># IPv6 Hash Table
-#
-# </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source># Services
-#
-# </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source># Ethernet addresses
-#
-# </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source># Ethernet manufacturers
-#
-# </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source># Well known Ethernet addresses
-#
-# </source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>ResponseTimeDelayDialog</name>
@@ -10101,6 +10175,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can save audio with PCM u-law or A-law encoding only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save forward stream CSV</source>
<translation type="unfinished"></translation>
</message>
@@ -10216,10 +10294,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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Jitter Buffer:</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 99228cffb1..381bb92be4 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1935,19 +1935,20 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Clear display filter</source>
+ <source>Apply display filter</source>
+ <oldsource>Apply this filter string to the display.</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Apply this filter string to the display.</source>
+ <source>Apply a display filter %1 &lt;%2/&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Apply a display filter %1 &lt;%2/&gt;</source>
+ <source>Enter a display filter %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Enter a display filter %1</source>
+ <source>Clear display filter</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2117,6 +2118,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Recherche :</translation>
</message>
<message>
+ <source>in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Enable All</source>
<translation>Activer tout</translation>
</message>
@@ -2144,6 +2149,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>Only Description</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>any protocol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>non-heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EnabledProtocolsModel</name>
@@ -2196,6 +2213,53 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>EthernetAddressModel</name>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Type</translation>
+ </message>
+ <message>
+ <source>Mac Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">Nom</translation>
+ </message>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hash Table</source>
+ <translation type="unfinished">Table Hash IPv4</translation>
+ </message>
+ <message>
+ <source>IPv6 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hash Table</source>
+ <translation type="unfinished">Table Hash IPv6</translation>
+ </message>
+ <message>
+ <source>Ethernet Addresses</source>
+ <translation type="unfinished">Adresses Ethernet</translation>
+ </message>
+ <message>
+ <source>Ethernet Manufacturers</source>
+ <translation type="unfinished">Fabricants Ethernet</translation>
+ </message>
+ <message>
+ <source>Ethernet Well-Known Addresses</source>
+ <translation type="unfinished">Adresses Ethernet Bien-Connues</translation>
+ </message>
+</context>
+<context>
<name>ExpertInfoDialog</name>
<message>
<source>Dialog</source>
@@ -5768,6 +5832,10 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>%1 Ignorés: %2 (%3%)</translation>
</message>
<message>
+ <source> %1 Comments: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source> %1 Load time: %2:%3.%4</source>
<translation>%1 Temps de chargement: %2:%3.%4</translation>
</message>
@@ -6202,18 +6270,6 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Comme un Filtre</translation>
</message>
<message>
- <source>&amp;Selected</source>
- <translation type="vanished">&amp;Sélectionné</translation>
- </message>
- <message>
- <source>&amp;Not Selected</source>
- <translation type="vanished">&amp;Non Sélectionné</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">Non Sélectionné</translation>
- </message>
- <message>
<source>Close this capture file</source>
<translation>Fermer ce fichier de capture</translation>
</message>
@@ -6959,38 +7015,6 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
- <source>…&amp;and Selected</source>
- <translation type="vanished">...&amp;et Sélectionné</translation>
- </message>
- <message>
- <source>…and Selected</source>
- <translation type="vanished">...et Sélectionné</translation>
- </message>
- <message>
- <source>…&amp;or Selected</source>
- <translation type="vanished">...&amp;ou Sélectionné</translation>
- </message>
- <message>
- <source>…or Selected</source>
- <translation type="vanished">...ou Sélectionné</translation>
- </message>
- <message>
- <source>…a&amp;nd not Selected</source>
- <translation type="vanished">...e&amp;t non Sélectionné</translation>
- </message>
- <message>
- <source>…and not Selected</source>
- <translation type="vanished">...et non Sélectionné</translation>
- </message>
- <message>
- <source>…o&amp;r not Selected</source>
- <translation type="vanished">...o&amp;u non Sélectionné</translation>
- </message>
- <message>
- <source>…or not Selected</source>
- <translation type="vanished">...ou non Sélectionné</translation>
- </message>
- <message>
<source>Display Filter &amp;Macros…</source>
<translation>Afficher les Filtres &amp;Macros...</translation>
</message>
@@ -8283,6 +8307,10 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Résumé en Texte</translation>
</message>
<message>
+ <source>Decode As</source>
+ <translation type="unfinished">Décoder comme</translation>
+ </message>
+ <message>
<source>Frame %1: %2
</source>
@@ -8431,6 +8459,41 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
</message>
</context>
<context>
+ <name>PortsModel</name>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>tcp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>udp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>sctp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>dccp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">Nom</translation>
+ </message>
+ <message>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Type</translation>
+ </message>
+</context>
+<context>
<name>PreferenceEditorFrame</name>
<message>
<source>Frame</source>
@@ -9506,6 +9569,26 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Dialogue</translation>
</message>
<message>
+ <source>Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for entry (min 3 characters)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ports</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for port or name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Capture File Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Comment</source>
<translation>Commentaire</translation>
</message>
@@ -9596,7 +9679,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
</message>
<message>
<source>Show</source>
- <translation>Afficher</translation>
+ <translation type="vanished">Afficher</translation>
</message>
<message>
<source># Resolved addresses found in %1</source>
@@ -9614,7 +9697,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<source># Hosts
#
# </source>
- <translation># Hôtes
+ <translation type="vanished"># Hôtes
#
# </translation>
</message>
@@ -9622,7 +9705,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<source># IPv4 Hash Table
#
# </source>
- <translation># Table Hash IPv4
+ <translation type="vanished"># Table Hash IPv4
#
#</translation>
</message>
@@ -9630,7 +9713,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<source>
</source>
- <translation>
+ <translation type="vanished">
</translation>
</message>
@@ -9638,7 +9721,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<source># IPv6 Hash Table
#
# </source>
- <translation># Table Hash IPv6
+ <translation type="vanished"># Table Hash IPv6
#
#</translation>
</message>
@@ -9646,7 +9729,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<source># Services
#
# </source>
- <translation># Services
+ <translation type="vanished"># Services
#
#</translation>
</message>
@@ -9654,7 +9737,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<source># Ethernet addresses
#
# </source>
- <translation># Adresses ethernet
+ <translation type="vanished"># Adresses ethernet
#
#</translation>
</message>
@@ -9662,7 +9745,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<source># Ethernet manufacturers
#
# </source>
- <translation># Fabricants ethernet
+ <translation type="vanished"># Fabricants ethernet
#
#</translation>
</message>
@@ -9670,7 +9753,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<source># Well known Ethernet addresses
#
# </source>
- <translation># Adresses Ethernet Bien connues</translation>
+ <translation type="vanished"># Adresses Ethernet Bien connues</translation>
</message>
</context>
<context>
@@ -10187,6 +10270,10 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can save audio with PCM u-law or A-law encoding only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save forward stream CSV</source>
<translation>Sauvegarder CSV flux aller</translation>
</message>
@@ -10324,7 +10411,7 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Jitter Buffer:</source>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 4160703c78..3e7137f022 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1605,10 +1605,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Regole di colorazione %1</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Copia da</translation>
- </message>
- <message>
<source>Copy coloring rules from another profile.</source>
<translation>Copia regole di colorazione da un altro profilo.</translation>
</message>
@@ -1771,22 +1767,15 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<name>CopyFromProfileButton</name>
<message>
<source>Copy from</source>
- <translation type="unfinished">Copia da</translation>
+ <translation>Copia da</translation>
</message>
<message>
<source>Copy entries from another profile.</source>
- <translation type="unfinished">Copia voci da un altro profilo.</translation>
- </message>
- <message>
- <source>System default</source>
- <translation type="unfinished">Predefinito di sistema</translation>
+ <translation>Copia voci da un altro profilo.</translation>
</message>
-</context>
-<context>
- <name>CopyFromProfileMenu</name>
<message>
<source>System default</source>
- <translation type="vanished">Predefinito di sistema</translation>
+ <translation>Predefinito di sistema</translation>
</message>
</context>
<context>
@@ -1970,12 +1959,9 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Gestisci i segnalibri salvati.</translation>
</message>
<message>
- <source>Clear display filter</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Apply this filter string to the display.</source>
- <translation>Applica questa stringa di filtro alla visualizzazione.</translation>
+ <source>Apply display filter</source>
+ <oldsource>Apply this filter string to the display.</oldsource>
+ <translation type="unfinished">Applica questa stringa di filtro alla visualizzazione.</translation>
</message>
<message>
<source>Apply a display filter %1 &lt;%2/&gt;</source>
@@ -1986,6 +1972,10 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Digita un filtro di visualizzazione %1</translation>
</message>
<message>
+ <source>Clear display filter</source>
+ <translation>Cancella filtro di visualizzazione</translation>
+ </message>
+ <message>
<source>Apply a read filter %1</source>
<translation>Applica un filtro di lettura %1</translation>
</message>
@@ -2009,14 +1999,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<source>Manage Filter Expressions</source>
<translation>Gestisci espressioni di filtro</translation>
</message>
- <message>
- <source>Selected</source>
- <translation type="vanished">Selezionati</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">Non selezionati</translation>
- </message>
</context>
<context>
<name>DisplayFilterExpressionDialog</name>
@@ -2162,6 +2144,10 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Cerca:</translation>
</message>
<message>
+ <source>in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Enable All</source>
<translation>Abilita tutto</translation>
</message>
@@ -2179,14 +2165,26 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>Everywhere</source>
- <translation type="unfinished"></translation>
+ <translation>Ovunque</translation>
</message>
<message>
<source>Only Protocols</source>
- <translation type="unfinished"></translation>
+ <translation>Solo protocolli</translation>
</message>
<message>
<source>Only Description</source>
+ <translation>Solo descrizione</translation>
+ </message>
+ <message>
+ <source>any protocol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>non-heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>heuristic protocols</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2241,6 +2239,53 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
</context>
<context>
+ <name>EthernetAddressModel</name>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Tipo</translation>
+ </message>
+ <message>
+ <source>Mac Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hash Table</source>
+ <translation type="unfinished">Tabella hash IPv4</translation>
+ </message>
+ <message>
+ <source>IPv6 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hash Table</source>
+ <translation type="unfinished">Tabella hash IPv6</translation>
+ </message>
+ <message>
+ <source>Ethernet Addresses</source>
+ <translation type="unfinished">Indirizzi Ethernet</translation>
+ </message>
+ <message>
+ <source>Ethernet Manufacturers</source>
+ <translation type="unfinished">Produttori Ethernet</translation>
+ </message>
+ <message>
+ <source>Ethernet Well-Known Addresses</source>
+ <translation type="unfinished">Indirizzi Ethernet conosciuti</translation>
+ </message>
+</context>
+<context>
<name>ExpertInfoDialog</name>
<message>
<source>Dialog</source>
@@ -2592,11 +2637,11 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<name>FilterAction</name>
<message>
<source>Selected</source>
- <translation type="unfinished">Selezionati</translation>
+ <translation>Selezionati</translation>
</message>
<message>
<source>Not Selected</source>
- <translation type="unfinished">Non selezionati</translation>
+ <translation>Non selezionati</translation>
</message>
</context>
<context>
@@ -3656,10 +3701,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Copia</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Copia da</translation>
- </message>
- <message>
<source>Copy graphs from another profile.</source>
<translation>Copia grafici da un altro profilo.</translation>
</message>
@@ -5815,6 +5856,10 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation> %1 ignorati: %2 (%3%)</translation>
</message>
<message>
+ <source> %1 Comments: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source> %1 Load time: %2:%3.%4</source>
<translation> %1 Tempo di caricamento: %2:%3.%4</translation>
</message>
@@ -6249,18 +6294,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Come filtro</translation>
</message>
<message>
- <source>&amp;Selected</source>
- <translation type="vanished">&amp;Selezionati</translation>
- </message>
- <message>
- <source>&amp;Not Selected</source>
- <translation type="vanished">&amp;Non selezionati</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">Non selezionati</translation>
- </message>
- <message>
<source>Close this capture file</source>
<translation>Chiudi questo file di cattura</translation>
</message>
@@ -7006,38 +7039,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Tutti gli elementi visibili dell&apos;albero selezionato</translation>
</message>
<message>
- <source>…&amp;and Selected</source>
- <translation type="vanished">... &amp;e selezionati</translation>
- </message>
- <message>
- <source>…and Selected</source>
- <translation type="vanished">... e selezionati</translation>
- </message>
- <message>
- <source>…&amp;or Selected</source>
- <translation type="vanished">... &amp;o selezionati</translation>
- </message>
- <message>
- <source>…or Selected</source>
- <translation type="vanished">... o selezionati</translation>
- </message>
- <message>
- <source>…a&amp;nd not Selected</source>
- <translation type="vanished">... &amp;e non selezionati</translation>
- </message>
- <message>
- <source>…and not Selected</source>
- <translation type="vanished">... e non selezionati</translation>
- </message>
- <message>
- <source>…o&amp;r not Selected</source>
- <translation type="vanished">... &amp;o non selezionati</translation>
- </message>
- <message>
- <source>…or not Selected</source>
- <translation type="vanished">... o non selezionati</translation>
- </message>
- <message>
<source>Display Filter &amp;Macros…</source>
<translation>Visualizza &amp;macro dei filtri...</translation>
</message>
@@ -8336,6 +8337,10 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Riepilogo come testo</translation>
</message>
<message>
+ <source>Decode As</source>
+ <translation type="unfinished">Decodifica come</translation>
+ </message>
+ <message>
<source>Frame %1: %2
</source>
@@ -8484,6 +8489,41 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
</context>
<context>
+ <name>PortsModel</name>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>tcp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>udp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>sctp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>dccp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Tipo</translation>
+ </message>
+</context>
+<context>
<name>PreferenceEditorFrame</name>
<message>
<source>Frame</source>
@@ -9161,7 +9201,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>Prepare as Filter</source>
- <translation type="unfinished"></translation>
+ <translation>Prepara come filtro</translation>
</message>
<message>
<source>Don&apos;t show this message again.</source>
@@ -9564,6 +9604,26 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Finestra</translation>
</message>
<message>
+ <source>Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for entry (min 3 characters)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ports</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for port or name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Capture File Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Comment</source>
<translation>Commento</translation>
</message>
@@ -9654,7 +9714,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>Show</source>
- <translation>Mostra</translation>
+ <translation type="vanished">Mostra</translation>
</message>
<message>
<source># Resolved addresses found in %1</source>
@@ -9672,7 +9732,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<source># Hosts
#
# </source>
- <translation># Host
+ <translation type="vanished"># Host
#
# </translation>
</message>
@@ -9680,7 +9740,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<source># IPv4 Hash Table
#
# </source>
- <translation># Tabella hash IPv4
+ <translation type="vanished"># Tabella hash IPv4
#
# </translation>
</message>
@@ -9688,7 +9748,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<source>
</source>
- <translation>
+ <translation type="vanished">
</translation>
</message>
@@ -9696,7 +9756,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<source># IPv6 Hash Table
#
# </source>
- <translation># Tabella hash IPv6
+ <translation type="vanished"># Tabella hash IPv6
#
# </translation>
</message>
@@ -9704,7 +9764,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<source># Services
#
# </source>
- <translation># Servizi
+ <translation type="vanished"># Servizi
#
# </translation>
</message>
@@ -9712,7 +9772,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<source># Ethernet addresses
#
# </source>
- <translation># Indirizzi Ethernet
+ <translation type="vanished"># Indirizzi Ethernet
#
# </translation>
</message>
@@ -9720,7 +9780,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<source># Ethernet manufacturers
#
# </source>
- <translation># Produttori Ethernet
+ <translation type="vanished"># Produttori Ethernet
#
# </translation>
</message>
@@ -9728,7 +9788,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<source># Well known Ethernet addresses
#
# </source>
- <translation># Indirizzi Ethernet conosciuti
+ <translation type="vanished"># Indirizzi Ethernet conosciuti
#
# </translation>
</message>
@@ -10247,6 +10307,10 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Puoi salvare audio solo con una frequenza di clock di 8000 Hz</translation>
</message>
<message>
+ <source>Can save audio with PCM u-law or A-law encoding only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save forward stream CSV</source>
<translation>Salva CSV del flusso diretto</translation>
</message>
@@ -10384,7 +10448,7 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Jitter Buffer:</source>
@@ -12961,14 +13025,6 @@ Ad esempio, usa 1 ora per fare in modo che un nuovo file sia creato ogni ora.</t
<translation>Tabella accessibile dall&apos;utente sconosciuta</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Copia da</translation>
- </message>
- <message>
- <source>Copy entries from another profile.</source>
- <translation type="vanished">Copia voci da un altro profilo.</translation>
- </message>
- <message>
<source>Open </source>
<translation>Apri </translation>
</message>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index eb121dcc94..ca2dea3b8c 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1597,10 +1597,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>色付けルール %1</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">からコピー</translation>
- </message>
- <message>
<source>Copy coloring rules from another profile.</source>
<translation>別のプロファイルから色付けルールをコピーします</translation>
</message>
@@ -1763,7 +1759,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<name>CopyFromProfileButton</name>
<message>
<source>Copy from</source>
- <translation type="unfinished">からコピー</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>Copy entries from another profile.</source>
@@ -1771,14 +1767,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>System default</source>
- <translation type="unfinished">システム デフォルト</translation>
- </message>
-</context>
-<context>
- <name>CopyFromProfileMenu</name>
- <message>
- <source>System default</source>
- <translation type="vanished">システム デフォルト</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -1962,12 +1951,9 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>保存したブックマークを管理</translation>
</message>
<message>
- <source>Clear display filter</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Apply this filter string to the display.</source>
- <translation>このフィルタ文字列を表示に適用</translation>
+ <source>Apply display filter</source>
+ <oldsource>Apply this filter string to the display.</oldsource>
+ <translation type="unfinished">このフィルタ文字列を表示に適用</translation>
</message>
<message>
<source>Apply a display filter %1 &lt;%2/&gt;</source>
@@ -1978,6 +1964,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>表示フィルタ %1 を入力</translation>
</message>
<message>
+ <source>Clear display filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Apply a read filter %1</source>
<translation>読込フィルタ %1 を適用</translation>
</message>
@@ -2001,14 +1991,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>Manage Filter Expressions</source>
<translation>フィルタ書式を管理</translation>
</message>
- <message>
- <source>Selected</source>
- <translation type="vanished">選択済</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">未選択</translation>
- </message>
</context>
<context>
<name>DisplayFilterExpressionDialog</name>
@@ -2154,6 +2136,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>検索:</translation>
</message>
<message>
+ <source>in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Enable All</source>
<translation>すべて有効</translation>
</message>
@@ -2181,6 +2167,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>Only Description</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>any protocol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>non-heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EnabledProtocolsModel</name>
@@ -2233,6 +2231,53 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>EthernetAddressModel</name>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">種別</translation>
+ </message>
+ <message>
+ <source>Mac Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">名前</translation>
+ </message>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hash Table</source>
+ <translation type="unfinished">IPv4ハッシュ表</translation>
+ </message>
+ <message>
+ <source>IPv6 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hash Table</source>
+ <translation type="unfinished">IPv6ハッシュ表</translation>
+ </message>
+ <message>
+ <source>Ethernet Addresses</source>
+ <translation type="unfinished">Ethernetアドレス</translation>
+ </message>
+ <message>
+ <source>Ethernet Manufacturers</source>
+ <translation type="unfinished">Ethernet製造元</translation>
+ </message>
+ <message>
+ <source>Ethernet Well-Known Addresses</source>
+ <translation type="unfinished">Ethernet既知のアドレス</translation>
+ </message>
+</context>
+<context>
<name>ExpertInfoDialog</name>
<message>
<source>Dialog</source>
@@ -2583,11 +2628,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<name>FilterAction</name>
<message>
<source>Selected</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">選択済み</translation>
</message>
<message>
<source>Not Selected</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">選択されていません</translation>
</message>
</context>
<context>
@@ -5797,6 +5842,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation> %1 無視: %2 (%3%)</translation>
</message>
<message>
+ <source> %1 Comments: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source> %1 Load time: %2:%3.%4</source>
<translation> %1 読込時間: %2:%3.%4</translation>
</message>
@@ -6230,18 +6279,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>フィルタとして</translation>
</message>
<message>
- <source>&amp;Selected</source>
- <translation type="vanished">選択済(&amp;S)</translation>
- </message>
- <message>
- <source>&amp;Not Selected</source>
- <translation type="vanished">未選択(&amp;N)</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">選択されていません</translation>
- </message>
- <message>
<source>Close this capture file</source>
<translation>このキャプチャファイルを閉じます</translation>
</message>
@@ -6987,38 +7024,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>すべての見えている選択されたツリー項目</translation>
</message>
<message>
- <source>…&amp;and Selected</source>
- <translation type="vanished">…かつ選択内容と一致(&amp;a)</translation>
- </message>
- <message>
- <source>…and Selected</source>
- <translation type="vanished">…かつ選択内容と一致</translation>
- </message>
- <message>
- <source>…&amp;or Selected</source>
- <translation type="vanished">…または選択内容と一致(&amp;o)</translation>
- </message>
- <message>
- <source>…or Selected</source>
- <translation type="vanished">…または選択内容と一致</translation>
- </message>
- <message>
- <source>…a&amp;nd not Selected</source>
- <translation type="vanished">…かつ選択内容と不一致(&amp;n)</translation>
- </message>
- <message>
- <source>…and not Selected</source>
- <translation type="vanished">…かつ選択内容と不一致</translation>
- </message>
- <message>
- <source>…o&amp;r not Selected</source>
- <translation type="vanished">…または選択内容と不一致(&amp;r)</translation>
- </message>
- <message>
- <source>…or not Selected</source>
- <translation type="vanished">…または選択内容と不一致</translation>
- </message>
- <message>
<source>Display Filter &amp;Macros…</source>
<translation>表示フィルタマクロ…(&amp;M)</translation>
</message>
@@ -8315,6 +8320,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>テキストとしての概要</translation>
</message>
<message>
+ <source>Decode As</source>
+ <translation type="unfinished">としてデコード</translation>
+ </message>
+ <message>
<source>Frame %1: %2
</source>
@@ -8463,6 +8472,41 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>PortsModel</name>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>tcp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>udp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>sctp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>dccp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">名前</translation>
+ </message>
+ <message>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">種別</translation>
+ </message>
+</context>
+<context>
<name>PreferenceEditorFrame</name>
<message>
<source>Frame</source>
@@ -9531,6 +9575,26 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>ダイアログ</translation>
</message>
<message>
+ <source>Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for entry (min 3 characters)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ports</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for port or name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Capture File Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Comment</source>
<translation>コメント</translation>
</message>
@@ -9621,7 +9685,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Show</source>
- <translation>表示</translation>
+ <translation type="vanished">表示</translation>
</message>
<message>
<source># Resolved addresses found in %1</source>
@@ -9639,7 +9703,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Hosts
#
# </source>
- <translation># ホスト
+ <translation type="vanished"># ホスト
#
# </translation>
</message>
@@ -9647,7 +9711,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># IPv4 Hash Table
#
# </source>
- <translation>IPv4 ハッシュ表
+ <translation type="vanished">IPv4 ハッシュ表
#
# </translation>
</message>
@@ -9655,7 +9719,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>
</source>
- <translation>
+ <translation type="vanished">
</translation>
</message>
@@ -9663,7 +9727,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># IPv6 Hash Table
#
# </source>
- <translation># IPv6 ハッシュ表
+ <translation type="vanished"># IPv6 ハッシュ表
#
# </translation>
</message>
@@ -9671,7 +9735,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Services
#
# </source>
- <translation># サービス
+ <translation type="vanished"># サービス
#
# </translation>
</message>
@@ -9679,7 +9743,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Ethernet addresses
#
# </source>
- <translation># Ethernet アドレス
+ <translation type="vanished"># Ethernet アドレス
#
# </translation>
</message>
@@ -9687,7 +9751,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Ethernet manufacturers
#
# </source>
- <translation># Ethernet 製造元
+ <translation type="vanished"># Ethernet 製造元
#
# </translation>
</message>
@@ -9695,7 +9759,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Well known Ethernet addresses
#
# </source>
- <translation># 既知のEthernetアドレス
+ <translation type="vanished"># 既知のEthernetアドレス
#
# </translation>
</message>
@@ -10214,6 +10278,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can save audio with PCM u-law or A-law encoding only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save forward stream CSV</source>
<translation>順方向ストリームをCSVで保存</translation>
</message>
@@ -10351,7 +10419,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Jitter Buffer:</source>
@@ -12946,7 +13014,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>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index e5741f67aa..6f3aa65938 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1609,10 +1609,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Reguły kolorowania %1</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Kopiuj z</translation>
- </message>
- <message>
<source>Copy coloring rules from another profile.</source>
<translation>Kopiuj reguły kolorowania z innego profilu.</translation>
</message>
@@ -1967,12 +1963,9 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Zarządzaj zapisanymi zakładkami.</translation>
</message>
<message>
- <source>Clear display filter</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Apply this filter string to the display.</source>
- <translation>Zastosuj filtr.</translation>
+ <source>Apply display filter</source>
+ <oldsource>Apply this filter string to the display.</oldsource>
+ <translation type="unfinished">Zastosuj filtr.</translation>
</message>
<message>
<source>Apply a display filter %1 &lt;%2/&gt;</source>
@@ -1983,6 +1976,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Wpisz filtr wyświetlania %1</translation>
</message>
<message>
+ <source>Clear display filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Apply a read filter %1</source>
<translation>Zastosuj filtr wczytania %1</translation>
</message>
@@ -2151,6 +2148,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Szukaj:</translation>
</message>
<message>
+ <source>in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Enable All</source>
<translation>Włącz wszystkie</translation>
</message>
@@ -2178,6 +2179,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>Only Description</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>any protocol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>non-heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EnabledProtocolsModel</name>
@@ -2230,6 +2243,53 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>EthernetAddressModel</name>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Mac Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hash Table</source>
+ <translation type="unfinished">Tablica mieszająca IPv4</translation>
+ </message>
+ <message>
+ <source>IPv6 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hash Table</source>
+ <translation type="unfinished">Tablica mieszająca IPv6</translation>
+ </message>
+ <message>
+ <source>Ethernet Addresses</source>
+ <translation type="unfinished">Adresy Ethernet</translation>
+ </message>
+ <message>
+ <source>Ethernet Manufacturers</source>
+ <translation type="unfinished">Producenci Ethernet</translation>
+ </message>
+ <message>
+ <source>Ethernet Well-Known Addresses</source>
+ <translation type="unfinished">Dobrze znane adresy Ethernet</translation>
+ </message>
+</context>
+<context>
<name>ExpertInfoDialog</name>
<message>
<source>Dialog</source>
@@ -2586,7 +2646,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Not Selected</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Nie wybrany</translation>
</message>
</context>
<context>
@@ -5803,6 +5863,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation> %1 Ignorowanych: %2 (%3%)</translation>
</message>
<message>
+ <source> %1 Comments: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source> %1 Load time: %2:%3.%4</source>
<translation> %1 Czas ładowania: %2:%3.%4</translation>
</message>
@@ -6238,18 +6302,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Jako filtr</translation>
</message>
<message>
- <source>&amp;Selected</source>
- <translation type="vanished">&amp;Wybrane</translation>
- </message>
- <message>
- <source>&amp;Not Selected</source>
- <translation type="vanished">&amp;Nie wybrane</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">Nie wybrane</translation>
- </message>
- <message>
<source>Close this capture file</source>
<translation>Zamknij ten plik</translation>
</message>
@@ -6995,38 +7047,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Wszystkie widoczne pozycje wybranego poddrzewa</translation>
</message>
<message>
- <source>…&amp;and Selected</source>
- <translation type="vanished">…i wybrane</translation>
- </message>
- <message>
- <source>…and Selected</source>
- <translation type="vanished">…i wybrane</translation>
- </message>
- <message>
- <source>…&amp;or Selected</source>
- <translation type="vanished">…lub wybrane</translation>
- </message>
- <message>
- <source>…or Selected</source>
- <translation type="vanished">…lub wybrane</translation>
- </message>
- <message>
- <source>…a&amp;nd not Selected</source>
- <translation type="vanished">…i nie wybrane</translation>
- </message>
- <message>
- <source>…and not Selected</source>
- <translation type="vanished">…i nie wybrane</translation>
- </message>
- <message>
- <source>…o&amp;r not Selected</source>
- <translation type="vanished">…lub nie wybrane</translation>
- </message>
- <message>
- <source>…or not Selected</source>
- <translation type="vanished">…lub nie wybrane</translation>
- </message>
- <message>
<source>Display Filter &amp;Macros…</source>
<translation>Makra filtrów wyświetlania…</translation>
</message>
@@ -8327,6 +8347,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Podsumowanie jako tekst</translation>
</message>
<message>
+ <source>Decode As</source>
+ <translation type="unfinished">Dekoduj jako</translation>
+ </message>
+ <message>
<source>Frame %1: %2
</source>
@@ -8474,6 +8498,41 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>PortsModel</name>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>tcp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>udp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>sctp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>dccp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>PreferenceEditorFrame</name>
<message>
<source>Frame</source>
@@ -9552,6 +9611,26 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Okno</translation>
</message>
<message>
+ <source>Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for entry (min 3 characters)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ports</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for port or name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Capture File Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Comment</source>
<translation>Komentarz</translation>
</message>
@@ -9642,7 +9721,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Show</source>
- <translation>Pokaż</translation>
+ <translation type="vanished">Pokaż</translation>
</message>
<message>
<source># Resolved addresses found in %1</source>
@@ -9660,7 +9739,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Hosts
#
# </source>
- <translation># Gospodarze
+ <translation type="vanished"># Gospodarze
#
#</translation>
</message>
@@ -9668,7 +9747,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># IPv4 Hash Table
#
# </source>
- <translation># Tablica mieszająca IPv4
+ <translation type="vanished"># Tablica mieszająca IPv4
#
#</translation>
</message>
@@ -9676,7 +9755,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>
</source>
- <translation>
+ <translation type="vanished">
</translation>
</message>
@@ -9684,7 +9763,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># IPv6 Hash Table
#
# </source>
- <translation># Tablica mieszająca IPv6
+ <translation type="vanished"># Tablica mieszająca IPv6
#
#</translation>
</message>
@@ -9692,7 +9771,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Services
#
# </source>
- <translation># Usługi
+ <translation type="vanished"># Usługi
#
# </translation>
</message>
@@ -9700,7 +9779,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Ethernet addresses
#
# </source>
- <translation># Adresy Ethernet
+ <translation type="vanished"># Adresy Ethernet
#
# </translation>
</message>
@@ -9708,7 +9787,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Ethernet manufacturers
#
# </source>
- <translation># Producenci Ethernet
+ <translation type="vanished"># Producenci Ethernet
#
#</translation>
</message>
@@ -9716,7 +9795,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Well known Ethernet addresses
#
# </source>
- <translation># Dobrze znane adresy Ethernet
+ <translation type="vanished"># Dobrze znane adresy Ethernet
#
# </translation>
</message>
@@ -10235,6 +10314,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Może zapisać audio tylko z próbkowaniem 8000 Hz</translation>
</message>
<message>
+ <source>Can save audio with PCM u-law or A-law encoding only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save forward stream CSV</source>
<translation>Zapisz przewodni strumień jako CSV</translation>
</message>
@@ -10372,7 +10455,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Jitter Buffer:</source>
@@ -12953,14 +13036,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Nieznana Tabela Użytkownika</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Kopiuj z</translation>
- </message>
- <message>
- <source>Copy entries from another profile.</source>
- <translation type="vanished">Kopiuj z innego profilu.</translation>
- </message>
- <message>
<source>Open </source>
<translation>Otwórz</translation>
</message>
diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts
index fbcf9c7cb6..15d00b0ef4 100644
--- a/ui/qt/wireshark_ru.ts
+++ b/ui/qt/wireshark_ru.ts
@@ -1612,10 +1612,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Цветовые Правила %1</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Копировать из</translation>
- </message>
- <message>
<source>Copy coloring rules from another profile.</source>
<translation>Копировать цветовые правила из другого профиля.</translation>
</message>
@@ -1970,12 +1966,9 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Управлять сохранёнными закладками.</translation>
</message>
<message>
- <source>Clear display filter</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Apply this filter string to the display.</source>
- <translation>Применить эту строку фильтра к отображённому на экране.</translation>
+ <source>Apply display filter</source>
+ <oldsource>Apply this filter string to the display.</oldsource>
+ <translation type="unfinished">Применить эту строку фильтра к отображённому на экране.</translation>
</message>
<message>
<source>Apply a display filter %1 &lt;%2/&gt;</source>
@@ -1986,6 +1979,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Введите дисплейный фильтр %1</translation>
</message>
<message>
+ <source>Clear display filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Apply a read filter %1</source>
<translation>Применить фильтр чтения %1</translation>
</message>
@@ -2154,6 +2151,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Поиск:</translation>
</message>
<message>
+ <source>in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Enable All</source>
<translation>Включить Все</translation>
</message>
@@ -2181,6 +2182,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>Only Description</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>any protocol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>non-heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EnabledProtocolsModel</name>
@@ -2233,6 +2246,53 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>EthernetAddressModel</name>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Тип</translation>
+ </message>
+ <message>
+ <source>Mac Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">Имя</translation>
+ </message>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hash Table</source>
+ <translation type="unfinished">Хэш-таблица IPv4</translation>
+ </message>
+ <message>
+ <source>IPv6 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hash Table</source>
+ <translation type="unfinished">Хэш-таблица IPv6</translation>
+ </message>
+ <message>
+ <source>Ethernet Addresses</source>
+ <translation type="unfinished">Адреса Ethernet</translation>
+ </message>
+ <message>
+ <source>Ethernet Manufacturers</source>
+ <translation type="unfinished">Производители Ethernet</translation>
+ </message>
+ <message>
+ <source>Ethernet Well-Known Addresses</source>
+ <translation type="unfinished">Широко известные Ethernet-адреса</translation>
+ </message>
+</context>
+<context>
<name>ExpertInfoDialog</name>
<message>
<source>Dialog</source>
@@ -3655,10 +3715,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Копировать</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Копировать из</translation>
- </message>
- <message>
<source>Copy graphs from another profile.</source>
<translation>Копировать графы из другого профиля.</translation>
</message>
@@ -5817,6 +5873,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation> %1 Игнорировано: %2 (%3%)</translation>
</message>
<message>
+ <source> %1 Comments: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source> %1 Load time: %2:%3.%4</source>
<translation> %1 Время загрузки: %2:%3.%4</translation>
</message>
@@ -6252,18 +6312,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Как Фильтр</translation>
</message>
<message>
- <source>&amp;Selected</source>
- <translation type="vanished">&amp;Выбрано</translation>
- </message>
- <message>
- <source>&amp;Not Selected</source>
- <translation type="vanished">&amp;Не Выбрано</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">Не Выбрано</translation>
- </message>
- <message>
<source>Close this capture file</source>
<translation>Закрыть этот файл захвата</translation>
</message>
@@ -7009,38 +7057,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Все Видимые Пункты Выбранного Дерева</translation>
</message>
<message>
- <source>…&amp;and Selected</source>
- <translation type="vanished">…&amp;и Выбранное</translation>
- </message>
- <message>
- <source>…and Selected</source>
- <translation type="vanished">…и Выбранное</translation>
- </message>
- <message>
- <source>…&amp;or Selected</source>
- <translation type="vanished">…&amp;или Выбранное</translation>
- </message>
- <message>
- <source>…or Selected</source>
- <translation type="vanished">…или Выбранное</translation>
- </message>
- <message>
- <source>…a&amp;nd not Selected</source>
- <translation type="vanished">…&amp;и не Выбранное</translation>
- </message>
- <message>
- <source>…and not Selected</source>
- <translation type="vanished">…и не Выбранное</translation>
- </message>
- <message>
- <source>…o&amp;r not Selected</source>
- <translation type="vanished">…&amp;или не Выбранное</translation>
- </message>
- <message>
- <source>…or not Selected</source>
- <translation type="vanished">…или не Выбранное</translation>
- </message>
- <message>
<source>Display Filter &amp;Macros…</source>
<translation> &amp;Макросы Дисплейного Фильтра…</translation>
</message>
@@ -8341,6 +8357,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Итоги как Текст</translation>
</message>
<message>
+ <source>Decode As</source>
+ <translation type="unfinished">Декодировать Как</translation>
+ </message>
+ <message>
<source>Frame %1: %2
</source>
@@ -8489,6 +8509,41 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>PortsModel</name>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>tcp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>udp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>sctp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>dccp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">Имя</translation>
+ </message>
+ <message>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Тип</translation>
+ </message>
+</context>
+<context>
<name>PreferenceEditorFrame</name>
<message>
<source>Frame</source>
@@ -9567,6 +9622,26 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Диалог</translation>
</message>
<message>
+ <source>Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for entry (min 3 characters)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ports</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for port or name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Capture File Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Comment</source>
<translation>Комментарий</translation>
</message>
@@ -9657,7 +9732,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Show</source>
- <translation>Показать</translation>
+ <translation type="vanished">Показать</translation>
</message>
<message>
<source># Resolved addresses found in %1</source>
@@ -9675,7 +9750,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Hosts
#
# </source>
- <translation># Хосты
+ <translation type="vanished"># Хосты
#
# </translation>
</message>
@@ -9683,7 +9758,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># IPv4 Hash Table
#
# </source>
- <translation># Хэш-таблица IPv4
+ <translation type="vanished"># Хэш-таблица IPv4
#
# </translation>
</message>
@@ -9691,7 +9766,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>
</source>
- <translation>
+ <translation type="vanished">
</translation>
</message>
@@ -9699,7 +9774,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># IPv6 Hash Table
#
# </source>
- <translation># Хэш-таблица IPv6
+ <translation type="vanished"># Хэш-таблица IPv6
#
# </translation>
</message>
@@ -9707,7 +9782,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Services
#
# </source>
- <translation># Службы
+ <translation type="vanished"># Службы
#
# </translation>
</message>
@@ -9715,7 +9790,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Ethernet addresses
#
# </source>
- <translation># Адреса Ethernet
+ <translation type="vanished"># Адреса Ethernet
#
# </translation>
</message>
@@ -9723,7 +9798,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Ethernet manufacturers
#
# </source>
- <translation># Производители Ethernet
+ <translation type="vanished"># Производители Ethernet
#
# </translation>
</message>
@@ -9731,7 +9806,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Well known Ethernet addresses
#
# </source>
- <translation># Широко известные Ethernet-адреса
+ <translation type="vanished"># Широко известные Ethernet-адреса
#
# </translation>
</message>
@@ -10250,6 +10325,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Возможно сохранение аудио только с тактовой частотой 8000 Гц</translation>
</message>
<message>
+ <source>Can save audio with PCM u-law or A-law encoding only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save forward stream CSV</source>
<translation>Сохранить прямой поток CSV</translation>
</message>
@@ -10387,7 +10466,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Jitter Buffer:</source>
@@ -12973,14 +13052,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Неизвестная Таблица Доступа Пользователей</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Копировать из</translation>
- </message>
- <message>
- <source>Copy entries from another profile.</source>
- <translation type="vanished">Копировать записи из другого профиля.</translation>
- </message>
- <message>
<source>Open </source>
<translation>Открыть</translation>
</message>
diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts
index 6eacf25b1c..9a3ccc8e66 100644
--- a/ui/qt/wireshark_sv.ts
+++ b/ui/qt/wireshark_sv.ts
@@ -1605,10 +1605,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Färgläggningsregler %1</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Kopiera ifrån</translation>
- </message>
- <message>
<source>Copy coloring rules from another profile.</source>
<translation>Kopiera färgläggningsregler från en annan profil.</translation>
</message>
@@ -1963,12 +1959,9 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Hantera sparade bokmärken.</translation>
</message>
<message>
- <source>Clear display filter</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Apply this filter string to the display.</source>
- <translation>Använd denna filtersträng på det visade.</translation>
+ <source>Apply display filter</source>
+ <oldsource>Apply this filter string to the display.</oldsource>
+ <translation type="unfinished">Använd denna filtersträng på det visade.</translation>
</message>
<message>
<source>Apply a display filter %1 &lt;%2/&gt;</source>
@@ -1979,6 +1972,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Skriv in ett visningsfilter %1</translation>
</message>
<message>
+ <source>Clear display filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Apply a read filter %1</source>
<translation>Använd ett läsningsfilter %1</translation>
</message>
@@ -2147,6 +2144,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Sök:</translation>
</message>
<message>
+ <source>in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Enable All</source>
<translation>Aktivera allt</translation>
</message>
@@ -2174,6 +2175,18 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<source>Only Description</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>any protocol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>non-heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EnabledProtocolsModel</name>
@@ -2226,6 +2239,53 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
</message>
</context>
<context>
+ <name>EthernetAddressModel</name>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Typ</translation>
+ </message>
+ <message>
+ <source>Mac Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">Namn</translation>
+ </message>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hash Table</source>
+ <translation type="unfinished">IPv4-hashtabell</translation>
+ </message>
+ <message>
+ <source>IPv6 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hash Table</source>
+ <translation type="unfinished">IPv6-hashtabell</translation>
+ </message>
+ <message>
+ <source>Ethernet Addresses</source>
+ <translation type="unfinished">Ethernet-adresser</translation>
+ </message>
+ <message>
+ <source>Ethernet Manufacturers</source>
+ <translation type="unfinished">Ethernet-tillverkare</translation>
+ </message>
+ <message>
+ <source>Ethernet Well-Known Addresses</source>
+ <translation type="unfinished">Välkända Ethernet-adresser</translation>
+ </message>
+</context>
+<context>
<name>ExpertInfoDialog</name>
<message>
<source>Dialog</source>
@@ -3641,10 +3701,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Kopiera</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Kopiera ifrån</translation>
- </message>
- <message>
<source>Copy graphs from another profile.</source>
<translation>Kopiera grafer från en annan profil.</translation>
</message>
@@ -5800,6 +5856,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation> %1 ignorerade: %2 (%3 %)</translation>
</message>
<message>
+ <source> %1 Comments: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source> %1 Load time: %2:%3.%4</source>
<translation> %1 inläsningstid: %2.%3.%4</translation>
</message>
@@ -6234,18 +6294,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Som filter</translation>
</message>
<message>
- <source>&amp;Selected</source>
- <translation type="vanished">&amp;Vald</translation>
- </message>
- <message>
- <source>&amp;Not Selected</source>
- <translation type="vanished">&amp;Ej vald</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">Ej vald</translation>
- </message>
- <message>
<source>Close this capture file</source>
<translation>Stäng denna fångstfil</translation>
</message>
@@ -6991,38 +7039,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Alla synliga valda trädobjekt</translation>
</message>
<message>
- <source>…&amp;and Selected</source>
- <translation type="vanished">… &amp;och valda</translation>
- </message>
- <message>
- <source>…and Selected</source>
- <translation type="vanished">… och valda</translation>
- </message>
- <message>
- <source>…&amp;or Selected</source>
- <translation type="vanished">… &amp;eller valda</translation>
- </message>
- <message>
- <source>…or Selected</source>
- <translation type="vanished">… eller valda</translation>
- </message>
- <message>
- <source>…a&amp;nd not Selected</source>
- <translation type="vanished">… o&amp;ch inte valda</translation>
- </message>
- <message>
- <source>…and not Selected</source>
- <translation type="vanished">… och inte valda</translation>
- </message>
- <message>
- <source>…o&amp;r not Selected</source>
- <translation type="vanished">… e&amp;ller inte valda</translation>
- </message>
- <message>
- <source>…or not Selected</source>
- <translation type="vanished">… eller inte valda</translation>
- </message>
- <message>
<source>Display Filter &amp;Macros…</source>
<translation>Visningsfilter&amp;makron …</translation>
</message>
@@ -8321,6 +8337,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Sammanfattning som text</translation>
</message>
<message>
+ <source>Decode As</source>
+ <translation type="unfinished">Avkoda som</translation>
+ </message>
+ <message>
<source>Frame %1: %2
</source>
@@ -8469,6 +8489,41 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
</message>
</context>
<context>
+ <name>PortsModel</name>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>tcp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>udp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>sctp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>dccp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">Namn</translation>
+ </message>
+ <message>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Typ</translation>
+ </message>
+</context>
+<context>
<name>PreferenceEditorFrame</name>
<message>
<source>Frame</source>
@@ -9542,6 +9597,26 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Dialog</translation>
</message>
<message>
+ <source>Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for entry (min 3 characters)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ports</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for port or name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Capture File Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Comment</source>
<translation>Kommentar</translation>
</message>
@@ -9632,7 +9707,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
</message>
<message>
<source>Show</source>
- <translation>Visa</translation>
+ <translation type="vanished">Visa</translation>
</message>
<message>
<source># Resolved addresses found in %1</source>
@@ -9650,7 +9725,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<source># Hosts
#
# </source>
- <translation># Värdar
+ <translation type="vanished"># Värdar
#
#</translation>
</message>
@@ -9658,7 +9733,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<source># IPv4 Hash Table
#
# </source>
- <translation># IPv4-hashtabell
+ <translation type="vanished"># IPv4-hashtabell
#
#</translation>
</message>
@@ -9666,7 +9741,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<source>
</source>
- <translation>
+ <translation type="vanished">
</translation>
</message>
@@ -9674,7 +9749,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<source># IPv6 Hash Table
#
# </source>
- <translation># IPv6-hashtabell
+ <translation type="vanished"># IPv6-hashtabell
#
#</translation>
</message>
@@ -9682,7 +9757,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<source># Services
#
# </source>
- <translation># Tjänster
+ <translation type="vanished"># Tjänster
#
#</translation>
</message>
@@ -9690,7 +9765,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<source># Ethernet addresses
#
# </source>
- <translation># Ethernet-adresser
+ <translation type="vanished"># Ethernet-adresser
#
#</translation>
</message>
@@ -9698,7 +9773,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<source># Ethernet manufacturers
#
# </source>
- <translation># Ethernet-tillverkare
+ <translation type="vanished"># Ethernet-tillverkare
#
#</translation>
</message>
@@ -9706,7 +9781,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<source># Well known Ethernet addresses
#
# </source>
- <translation># Välkända Ethernet-adresser
+ <translation type="vanished"># Välkända Ethernet-adresser
#
#</translation>
</message>
@@ -10225,6 +10300,10 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Kan endast spara ljud med 8000 Hz klockhastighet</translation>
</message>
<message>
+ <source>Can save audio with PCM u-law or A-law encoding only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save forward stream CSV</source>
<translation>Spara framåtströms-CSV</translation>
</message>
@@ -10362,7 +10441,7 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Jitter Buffer:</source>
@@ -12944,14 +13023,6 @@ Till exempel, använd 1 timma för att en ny fil skall skapas varje timma vid he
<translation>Okänd användaråtkomlig tabell</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">Kopiera ifrån</translation>
- </message>
- <message>
- <source>Copy entries from another profile.</source>
- <translation type="vanished">Kopiera poster från en annan profil.</translation>
- </message>
- <message>
<source>Open </source>
<translation>Öppna </translation>
</message>
diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts
index bdf29b4c5c..2631d4d17b 100644
--- a/ui/qt/wireshark_uk.ts
+++ b/ui/qt/wireshark_uk.ts
@@ -1939,19 +1939,20 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
- <source>Clear display filter</source>
+ <source>Apply display filter</source>
+ <oldsource>Apply this filter string to the display.</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Apply this filter string to the display.</source>
+ <source>Apply a display filter %1 &lt;%2/&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Apply a display filter %1 &lt;%2/&gt;</source>
+ <source>Enter a display filter %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Enter a display filter %1</source>
+ <source>Clear display filter</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2121,6 +2122,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Пошук:</translation>
</message>
<message>
+ <source>in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Enable All</source>
<translation>Включити Всі</translation>
</message>
@@ -2148,6 +2153,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>Only Description</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>any protocol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>non-heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EnabledProtocolsModel</name>
@@ -2200,6 +2217,53 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>EthernetAddressModel</name>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Тип</translation>
+ </message>
+ <message>
+ <source>Mac Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hash Table</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hash Table</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ethernet Addresses</source>
+ <translation type="unfinished">Адреси Ethernet</translation>
+ </message>
+ <message>
+ <source>Ethernet Manufacturers</source>
+ <translation type="unfinished">Виробники Ethernet</translation>
+ </message>
+ <message>
+ <source>Ethernet Well-Known Addresses</source>
+ <translation type="unfinished">Відомі Адреси Ethernet</translation>
+ </message>
+</context>
+<context>
<name>ExpertInfoDialog</name>
<message>
<source>Dialog</source>
@@ -2556,7 +2620,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Not Selected</source>
- <translation type="unfinished">Не Вибрані</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -5726,6 +5790,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> %1 Comments: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source> %1 Load time: %2:%3.%4</source>
<translation>%1 Час завантаження: %2:%3.%4</translation>
</message>
@@ -6161,18 +6229,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>Як Фільтр</translation>
</message>
<message>
- <source>&amp;Selected</source>
- <translation type="vanished">&amp;Вибрані</translation>
- </message>
- <message>
- <source>&amp;Not Selected</source>
- <translation type="vanished">&amp;Не Вибрані</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">Не Вибрані</translation>
- </message>
- <message>
<source>Close this capture file</source>
<translation>Закрити цей файл захоплення</translation>
</message>
@@ -6918,38 +6974,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>…&amp;and Selected</source>
- <translation type="vanished">...&amp;і Вибрані</translation>
- </message>
- <message>
- <source>…and Selected</source>
- <translation type="vanished">...і Вибрані</translation>
- </message>
- <message>
- <source>…&amp;or Selected</source>
- <translation type="vanished">...&amp;або Вибрані</translation>
- </message>
- <message>
- <source>…or Selected</source>
- <translation type="vanished">...або Вибрані</translation>
- </message>
- <message>
- <source>…a&amp;nd not Selected</source>
- <translation type="vanished">...і не &amp;Вибрані</translation>
- </message>
- <message>
- <source>…and not Selected</source>
- <translation type="vanished">...і не Вибрані</translation>
- </message>
- <message>
- <source>…o&amp;r not Selected</source>
- <translation type="vanished">...аб&amp;о не Вибрані</translation>
- </message>
- <message>
- <source>…or not Selected</source>
- <translation type="vanished">...або не Вибрані</translation>
- </message>
- <message>
<source>Display Filter &amp;Macros…</source>
<translation>&amp;Макроси Фільтру Відображення...</translation>
</message>
@@ -8241,6 +8265,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>Decode As</source>
+ <translation type="unfinished">Декодувати Як</translation>
+ </message>
+ <message>
<source>Frame %1: %2
</source>
@@ -8387,6 +8415,41 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>PortsModel</name>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>tcp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>udp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>sctp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>dccp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">Тип</translation>
+ </message>
+</context>
+<context>
<name>PreferenceEditorFrame</name>
<message>
<source>Frame</source>
@@ -9046,7 +9109,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Not Selected</source>
- <translation type="unfinished">Не Вибрані</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<source>A </source>
@@ -9465,6 +9528,26 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for entry (min 3 characters)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ports</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for port or name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Capture File Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Comment</source>
<translation type="unfinished">Коментар</translation>
</message>
@@ -9555,7 +9638,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Show</source>
- <translation>Показати</translation>
+ <translation type="vanished">Показати</translation>
</message>
<message>
<source># Resolved addresses found in %1</source>
@@ -9568,34 +9651,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># Hosts
-#
-# </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source># IPv4 Hash Table
-#
-# </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>
-
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source># IPv6 Hash Table
-#
-# </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source># Services
#
# </source>
- <translation># Сервіси
+ <translation type="vanished"># Сервіси
#
#</translation>
</message>
@@ -9603,7 +9662,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Ethernet addresses
#
# </source>
- <translation># Адреси Ethernet
+ <translation type="vanished"># Адреси Ethernet
#
#</translation>
</message>
@@ -9611,7 +9670,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Ethernet manufacturers
#
# </source>
- <translation># Виробники Ethernet
+ <translation type="vanished"># Виробники Ethernet
#
#</translation>
</message>
@@ -9619,7 +9678,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Well known Ethernet addresses
#
# </source>
- <translation># Добре відомі Ethernet-адреси
+ <translation type="vanished"># Добре відомі Ethernet-адреси
#
#</translation>
</message>
@@ -10138,6 +10197,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation type="unfinished"></translation>
</message>
<message>
+ <source>Can save audio with PCM u-law or A-law encoding only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save forward stream CSV</source>
<translation type="unfinished"></translation>
</message>
@@ -10253,10 +10316,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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Jitter Buffer:</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index b1f86a8941..8efe8bfc19 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1595,10 +1595,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>着色规则 %1</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">复制自</translation>
- </message>
- <message>
<source>Copy coloring rules from another profile.</source>
<translation>从另一个配置文件复制着色规则。</translation>
</message>
@@ -1953,12 +1949,9 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>管理保存的书签。</translation>
</message>
<message>
- <source>Clear display filter</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Apply this filter string to the display.</source>
- <translation>将此过滤字符串应用于显示。</translation>
+ <source>Apply display filter</source>
+ <oldsource>Apply this filter string to the display.</oldsource>
+ <translation type="unfinished">将此过滤字符串应用于显示。</translation>
</message>
<message>
<source>Apply a display filter %1 &lt;%2/&gt;</source>
@@ -1969,6 +1962,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>输入显示过滤器 %1</translation>
</message>
<message>
+ <source>Clear display filter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Apply a read filter %1</source>
<translation>应用读取过滤器 %1</translation>
</message>
@@ -2135,6 +2132,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>搜索:</translation>
</message>
<message>
+ <source>in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Enable All</source>
<translation>全部启用</translation>
</message>
@@ -2162,6 +2163,18 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>Only Description</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>any protocol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>non-heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>heuristic protocols</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EnabledProtocolsModel</name>
@@ -2214,6 +2227,53 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>EthernetAddressModel</name>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">类型</translation>
+ </message>
+ <message>
+ <source>Mac Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">名称</translation>
+ </message>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv4 Hash Table</source>
+ <translation type="unfinished">IPv4 哈希表</translation>
+ </message>
+ <message>
+ <source>IPv6 Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>IPv6 Hash Table</source>
+ <translation type="unfinished">IPv6 哈希表</translation>
+ </message>
+ <message>
+ <source>Ethernet Addresses</source>
+ <translation type="unfinished">以太网地址簿</translation>
+ </message>
+ <message>
+ <source>Ethernet Manufacturers</source>
+ <translation type="unfinished">以太网制造商</translation>
+ </message>
+ <message>
+ <source>Ethernet Well-Known Addresses</source>
+ <translation type="unfinished">以太网著名地址簿</translation>
+ </message>
+</context>
+<context>
<name>ExpertInfoDialog</name>
<message>
<source>Dialog</source>
@@ -3622,10 +3682,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>复制</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">复制自</translation>
- </message>
- <message>
<source>Copy graphs from another profile.</source>
<translation>从另一个配置文件复制图形。</translation>
</message>
@@ -5778,6 +5834,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation> %1 已忽略: %2 (%3%)</translation>
</message>
<message>
+ <source> %1 Comments: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source> %1 Load time: %2:%3.%4</source>
<translation> %1 加载时间: %2:%3.%4</translation>
</message>
@@ -6211,18 +6271,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>作为过滤器</translation>
</message>
<message>
- <source>&amp;Selected</source>
- <translation type="vanished">选中(&amp;S)</translation>
- </message>
- <message>
- <source>&amp;Not Selected</source>
- <translation type="vanished">非选中(&amp;N)</translation>
- </message>
- <message>
- <source>Not Selected</source>
- <translation type="vanished">非选中</translation>
- </message>
- <message>
<source>Close this capture file</source>
<translation>关闭捕获文件</translation>
</message>
@@ -6968,38 +7016,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>选中树的所有可见项目</translation>
</message>
<message>
- <source>…&amp;and Selected</source>
- <translation type="vanished">…与选中(&amp;A)</translation>
- </message>
- <message>
- <source>…and Selected</source>
- <translation type="vanished">…与选中</translation>
- </message>
- <message>
- <source>…&amp;or Selected</source>
- <translation type="vanished">…或选中(&amp;O)</translation>
- </message>
- <message>
- <source>…or Selected</source>
- <translation type="vanished">…或选中</translation>
- </message>
- <message>
- <source>…a&amp;nd not Selected</source>
- <translation type="vanished">…与非选中(&amp;N)</translation>
- </message>
- <message>
- <source>…and not Selected</source>
- <translation type="vanished">…与非选中</translation>
- </message>
- <message>
- <source>…o&amp;r not Selected</source>
- <translation type="vanished">…或非选中(&amp;R)</translation>
- </message>
- <message>
- <source>…or not Selected</source>
- <translation type="vanished">…或非选中</translation>
- </message>
- <message>
<source>Display Filter &amp;Macros…</source>
<translation>显示过滤器宏(&amp;M)…</translation>
</message>
@@ -8296,6 +8312,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>摘要为文本</translation>
</message>
<message>
+ <source>Decode As</source>
+ <translation type="unfinished">解码</translation>
+ </message>
+ <message>
<source>Frame %1: %2
</source>
@@ -8443,6 +8463,41 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
</context>
<context>
+ <name>PortsModel</name>
+ <message>
+ <source>All entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>tcp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>udp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>sctp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>dccp</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation type="unfinished">名称</translation>
+ </message>
+ <message>
+ <source>Port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation type="unfinished">类型</translation>
+ </message>
+</context>
+<context>
<name>PreferenceEditorFrame</name>
<message>
<source>Frame</source>
@@ -8512,7 +8567,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>RSA Keys</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">RSA 密钥</translation>
</message>
</context>
<context>
@@ -9511,6 +9566,26 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>对话框</translation>
</message>
<message>
+ <source>Hosts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for entry (min 3 characters)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Ports</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Search for port or name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Capture File Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Comment</source>
<translation>注释</translation>
</message>
@@ -9601,7 +9676,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Show</source>
- <translation>显示</translation>
+ <translation type="vanished">显示</translation>
</message>
<message>
<source># Resolved addresses found in %1</source>
@@ -9619,7 +9694,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Hosts
#
# </source>
- <translation># Hosts
+ <translation type="vanished"># Hosts
#
# </translation>
</message>
@@ -9627,7 +9702,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># IPv4 Hash Table
#
# </source>
- <translation># IPv4 哈希表
+ <translation type="vanished"># IPv4 哈希表
#
# </translation>
</message>
@@ -9635,7 +9710,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source>
</source>
- <translation>
+ <translation type="vanished">
</translation>
</message>
@@ -9643,7 +9718,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># IPv6 Hash Table
#
# </source>
- <translation># IPv6 哈希表
+ <translation type="vanished"># IPv6 哈希表
#
# </translation>
</message>
@@ -9651,7 +9726,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Services
#
# </source>
- <translation># 服务
+ <translation type="vanished"># 服务
#
# </translation>
</message>
@@ -9659,7 +9734,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Ethernet addresses
#
# </source>
- <translation># 以太网地址簿
+ <translation type="vanished"># 以太网地址簿
#
# </translation>
</message>
@@ -9667,7 +9742,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Ethernet manufacturers
#
# </source>
- <translation># 以太网制造商
+ <translation type="vanished"># 以太网制造商
#
# </translation>
</message>
@@ -9675,7 +9750,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<source># Well known Ethernet addresses
#
# </source>
- <translation># 以太网著名地址簿
+ <translation type="vanished"># 以太网著名地址簿
#
# </translation>
</message>
@@ -9758,7 +9833,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<name>RsaKeysFrame</name>
<message>
<source>RSA Keys</source>
- <translation type="unfinished"></translation>
+ <translation>RSA 密钥</translation>
</message>
<message>
<source>RSA private keys are loaded from a file or PKCS #11 token.</source>
@@ -9774,7 +9849,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Remove key</source>
- <translation type="unfinished"></translation>
+ <translation>移除密钥</translation>
</message>
<message>
<source>PKCS #11 provider libraries.</source>
@@ -9798,11 +9873,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Select a new PKCS #11 token or key</source>
- <translation type="unfinished"></translation>
+ <translation>选择一个新的 PKCS #11 令牌或密钥</translation>
</message>
<message>
<source>PKCS #11 token or key</source>
- <translation type="unfinished"></translation>
+ <translation>PKCS #11 令牌或密钥</translation>
</message>
<message>
<source>Enter PIN or password for %1 (it will be stored unencrypted)</source>
@@ -9814,7 +9889,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Key could not be added: %1</source>
- <translation type="unfinished"></translation>
+ <translation>密钥未能添加:%1</translation>
</message>
<message>
<source>RSA private key (*.pem *.p12 *.pfx *.key);;All Files (</source>
@@ -9826,11 +9901,11 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Libraries (*.dll)</source>
- <translation type="unfinished"></translation>
+ <translation>程序库 (*.dll)</translation>
</message>
<message>
<source>Libraries (*.so)</source>
- <translation type="unfinished"></translation>
+ <translation>程序库 (*.so)</translation>
</message>
<message>
<source>Select PKCS #11 Provider Library</source>
@@ -9838,7 +9913,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Changes will apply after a restart</source>
- <translation type="unfinished"></translation>
+ <translation>更改将在软件重启后应用</translation>
</message>
<message>
<source>PKCS #11 provider %1 will be removed after the next restart.</source>
@@ -10194,6 +10269,10 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>只能用 8000 Hz 时钟频率保存音频</translation>
</message>
<message>
+ <source>Can save audio with PCM u-law or A-law encoding only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save forward stream CSV</source>
<translation>保存正向流 CSV</translation>
</message>
@@ -10331,7 +10410,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Jitter Buffer:</source>
@@ -11298,7 +11377,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>Relative TSNs</source>
- <translation type="unfinished"></translation>
+ <translation>相对 TSN</translation>
</message>
<message>
<source>Only SACKs</source>
@@ -11954,7 +12033,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>UTF-16</source>
- <translation type="unfinished">UTF-16</translation>
+ <translation>UTF-16</translation>
</message>
<message>
<source>YAML</source>
@@ -12244,7 +12323,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source>MA Window (s)</source>
- <translation type="unfinished"></translation>
+ <translation>MA 窗口</translation>
</message>
<message>
<source>Allow SACK segments as well as data packets to be selected by clicking on the graph</source>
@@ -12638,7 +12717,7 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
</message>
<message>
<source> (MA)</source>
- <translation type="unfinished"></translation>
+ <translation> (MA)</translation>
</message>
<message>
<source> (%1 Segment MA)</source>
@@ -12905,14 +12984,6 @@ For example, use 1 hour to have a new file created every hour on the hour.</sour
<translation>未知用户可访问表</translation>
</message>
<message>
- <source>Copy from</source>
- <translation type="vanished">复制自</translation>
- </message>
- <message>
- <source>Copy entries from another profile.</source>
- <translation type="vanished">从其他配置文件复制条目。</translation>
- </message>
- <message>
<source>Open </source>
<translation>打开</translation>
</message>
@@ -13218,7 +13289,7 @@ a:hover {
</message>
<message>
<source>Remove from list</source>
- <translation type="unfinished"></translation>
+ <translation>从列表中移除</translation>
</message>
</context>
<context>