[Automatic update for 2023-10-15]

Update manuf, services enterprise numbers, translations, and other items.

19 files changed, 159 insertions, 43 deletions

diff --git a/AUTHORS b/AUTHORS
index bf43aab6ec..0cf4cc6801 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4408,6 +4408,7 @@ Francois-Xavier Le Bail	<fx.lebail[AT]yahoo.com>
 Frank Carpenter		<frank.carpenter[AT]spectralink.com>
 Frank Gorgas-Waller	<frank.gorgas-waller[AT]auerswald.de>
 Franklin Mathieu	<franklinmathieu[AT]gmail.com>
+Frans Meulenbroeks	<fransmeulenbroeks[AT]yahoo.com>
 Frédéric Perrin		<fred[AT]fperrin.net>
 GBLCA\amrobles		<amrobles[AT]gblsys.com>
 Gabor Vaszkun		<vaszkun[AT]gmail.com>
@@ -4432,6 +4433,7 @@ Gian Lorenzo Meocci	<gianlorenzo.meocci[AT]athonet.com>
 Gianluca Borello	<g.borello[AT]gmail.com>
 Gilbert Ramirez		<gilbertr[AT]gmail.com>
 Gilles Dufour		<dufour.gilles[AT]gmail.com>
+Giovanni Musto		<giovanni.musto[AT]partner.italdesign.it>
 Gisle Vanem		<gvanem[AT]online.no>
 Gizem Yurdagul		<gizemnuryurdagul[AT]gmail.com>
 Glenden Lee		<thornhillextreme[AT]gmail.com>
@@ -5288,6 +5290,7 @@ m.kaldenbach		<m.kaldenbach[AT]wearetriple.com>
 mGhony99		<mGhony99[AT]gmail.com>
 mbutkereit		<marvin.butkereit[AT]haw-hamburg.de>
 mirkodeckert		<mirko.deckert[AT]adtran.com>
+mistral13		<mistral[AT]gmx.ch>
 mivens			<mark.ivens[AT]vitrifi.net>
 mkg20001		<mkg20001[AT]gmail.com>
 naesten			<naesten[AT]gmail.com>
diff --git a/NEWS b/NEWS
index 52abe5be4b..a1a68445c9 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,11 @@ Wireshark 4.3.0 Release Notes
         • Fields with value strings now support regular expression
        matching.
 
+     • Binary plugins can be placed on the root of the versioned
+       personal plugins folder or any subfolder one level below that.
+       The global and personal binary plugins folder no longer have to
+       obey to any particular hierarchical structure.
+
   New Protocol Support
 
   Updated Protocol Support
diff --git a/docbook/wsug_src/rawshark-h.txt b/docbook/wsug_src/rawshark-h.txt
index 189821a275..10bf0787c5 100644
--- a/docbook/wsug_src/rawshark-h.txt
+++ b/docbook/wsug_src/rawshark-h.txt
@@ -1,11 +1,12 @@
-Rawshark (Wireshark) 4.3.0 (v4.3.0rc0-87-g9c90105c365a)
+Rawshark (Wireshark) 4.3.0 (v4.3.0rc0-215-gf1f6c1369d12)
 Dump and analyze network traffic.
 See https://www.wireshark.org for more information.
 
 Usage: rawshark [options] ...
 
 Input file:
-  -r <infile>              set the pipe or file name to read from
+  -r <infile>, --read-file <infile>
+                            set the pipe or file name to read from
 
 Processing:
   -d <encap:linktype>|<proto:protoname>
@@ -17,8 +18,11 @@ Processing:
   -N <name resolve flags>  enable specific name resolution(s): "mnNtdv"
   -p                       use the system's packet header format
                            (which may have 64-bit timestamps)
-  -R <read filter>         packet filter in Wireshark display filter syntax
+  -R <read filter>, --read-filter <read filter>
+                           packet filter in Wireshark display filter syntax
   -s                       skip PCAP header on input
+  -Y <display filter>, --display-filter <display filter>
+                           packet filter in Wireshark display filter syntax
   --enable-protocol <proto_name>
                            enable dissection of proto_name
   --disable-protocol <proto_name>
diff --git a/docbook/wsug_src/reordercap-h.txt b/docbook/wsug_src/reordercap-h.txt
index 7bd14e5586..e8a9304105 100644
--- a/docbook/wsug_src/reordercap-h.txt
+++ b/docbook/wsug_src/reordercap-h.txt
@@ -1,10 +1,10 @@
-Reordercap (Wireshark) 4.3.0 (v4.3.0rc0-87-g9c90105c365a)
+Reordercap (Wireshark) 4.3.0 (v4.3.0rc0-215-gf1f6c1369d12)
 Reorder timestamps of input file frames into output file.
 See https://www.wireshark.org for more information.
 
 Usage: reordercap [options] <infile> <outfile>
 
 Options:
-  -n        don't write to output file if the input file is ordered.
-  -h        display this help and exit.
-  -v        print version information and exit.
+  -n                don't write to output file if the input file is ordered.
+  -h, --help        display this help and exit.
+  -v, --version     print version information and exit.
diff --git a/docbook/wsug_src/text2pcap-h.txt b/docbook/wsug_src/text2pcap-h.txt
index d88c3416ed..3e17241632 100644
--- a/docbook/wsug_src/text2pcap-h.txt
+++ b/docbook/wsug_src/text2pcap-h.txt
@@ -1,4 +1,4 @@
-Text2pcap (Wireshark) 4.3.0 (v4.3.0rc0-87-g9c90105c365a)
+Text2pcap (Wireshark) 4.3.0 (v4.3.0rc0-215-gf1f6c1369d12)
 Generate a capture file from an ASCII hexdump of packets.
 See https://www.wireshark.org for more information.
 
@@ -103,6 +103,6 @@ Diagnostic output:
   --log-file <path>        file to output messages to (in addition to stderr)
 
 Miscellaneous:
-  -h                     display this help and exit
-  -v                     print version information and exit
+  -h, --help             display this help and exit
+  -v, --version          print version information and exit
   -q                     don't report processed packet counts
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index d5a7df5438..f1cabf0152 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -7956,6 +7956,7 @@ static const value_string usb_products_vals[] = {
     { 0x04a93302, "SELPHY CP1500" },
     { 0x04a93303, "Canon EOS R5 C" },
     { 0x04a9330b, "Canon EOS R6m2" },
+    { 0x04a9330d, "Canon EOS R50" },
     { 0x04a93312, "Canon EOS R100" },
     { 0x04ad2501, "Bluetooth Device" },
     { 0x04b00102, "Coolpix 990" },
diff --git a/epan/enterprises.c b/epan/enterprises.c
index ec939802b8..26d663fa0f 100644
--- a/epan/enterprises.c
+++ b/epan/enterprises.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-/* (last updated 2023-10-07) */
+/* (last updated 2023-10-13) */
 
 #include "config.h"
 
@@ -19,12 +19,12 @@
 typedef struct
 {
     uint32_t max_idx;
-    const char* values[61044];
+    const char* values[61067];
 } global_enterprises_table_t;
 
 static global_enterprises_table_t table =
 {
-    61043,
+    61066,
     {
         "Reserved",                                                                       // 0
         "NxNetworks",                                                                     // 1
@@ -12313,7 +12313,7 @@ static global_enterprises_table_t table =
         "IMAX NETWORKS (SHENZHEN) Ltd.",                                                  // 12284
         "Acclamation Systems, Inc",                                                       // 12285
         "Issaqua",                                                                        // 12286
-        "Globecomm Systems, Inc.",                                                        // 12287
+        "UltiSat, Inc.",                                                                  // 12287
         "Andern Research Labs",                                                           // 12288
         "Beeweeb Srl",                                                                    // 12289
         "Celestica International Inc.",                                                   // 12290
@@ -41387,7 +41387,7 @@ static global_enterprises_table_t table =
         "JSC «AMB Bank»",                                                                 // 41358
         "Triax AS",                                                                       // 41359
         "Prodrive Technologies Group B.V.",                                               // 41360
-        "KYOS SARL",                                                                      // 41361
+        "KYOS SA",                                                                        // 41361
         "Transport Department, HKSARG",                                                   // 41362
         "Naunet Corporation",                                                             // 41363
         "MIRACLE Information Systems GmbH",                                               // 41364
@@ -60801,7 +60801,7 @@ static global_enterprises_table_t table =
         "School District of Milton",                                                      // 60772
         "All4Conn Tecnologia",                                                            // 60773
         "Woven by Toyota, Inc.",                                                          // 60774
-        "Inspur (Shandong) Computer Technology Co.,Ltd",                                  // 60775
+        "Inspur Computer Technology Co.,Ltd",                                             // 60775
         "NEOROS LLC",                                                                     // 60776
         "OneCloud",                                                                       // 60777
         "XCoreSec",                                                                       // 60778
@@ -61008,7 +61008,7 @@ static global_enterprises_table_t table =
         "SolarisBus&Coach Sp. z o.o.",                                                    // 60979
         "C-Labs Srl",                                                                     // 60980
         "Anker Innovations Limited",                                                      // 60981
-        "Icaza, Gonzalez-Ruiz & Aleman",                                                  // 60982
+        "IGRA, S.A.",                                                                     // 60982
         "Mike Bondzio",                                                                   // 60983
         "Cedar County Memorial Hospital",                                                 // 60984
         "Komcept Solutions",                                                              // 60985
@@ -61051,7 +61051,7 @@ static global_enterprises_table_t table =
         "Alf Ringkowski",                                                                 // 61022
         "Fulton-Montgomery Community College",                                            // 61023
         "GlobalBases.com GmbH",                                                           // 61024
-        "David Verba",                                                                    // 61025
+        "Avid Systems",                                                                   // 61025
         "BRAINSAIT LTD",                                                                  // 61026
         "Pannasastra University of Cambodia, Siem Reap Campus",                           // 61027
         "Omega Power",                                                                    // 61028
@@ -61069,7 +61069,30 @@ static global_enterprises_table_t table =
         "Ocala Family Medical Center, Inc.",                                              // 61040
         "Modular, Inc.",                                                                  // 61041
         "Secure Bits",                                                                    // 61042
-        "Clinical Research Services Management GmbH CRS"                                  // 61043
+        "Clinical Research Services Management GmbH CRS",                                 // 61043
+        "Persist Technologies",                                                           // 61044
+        "TdE-CTIC",                                                                       // 61045
+        "Kernelkit",                                                                      // 61046
+        "Zscaler Information Security",                                                   // 61047
+        "QFence IT security Zrt.",                                                        // 61048
+        "JOKER TELEVISION SL",                                                            // 61049
+        "Lindner IT",                                                                     // 61050
+        "Pierrot",                                                                        // 61051
+        "Maclinker Intelligence Information",                                             // 61052
+        "TePS'EG Inc.",                                                                   // 61053
+        "KREBS+KIEFER",                                                                   // 61054
+        "ATAYA",                                                                          // 61055
+        "Tianjin Optoelectronic Group Xin An Advanced Technology (Jiangsu) Co., LTD",     // 61056
+        "Infraknit Technologies Private Limited",                                         // 61057
+        "J. Wagner GmbH",                                                                 // 61058
+        "esko-systems GmbH & Co. KG",                                                     // 61059
+        "Bayvrio, Inc",                                                                   // 61060
+        "Echo Global Logistics",                                                          // 61061
+        "Object First",                                                                   // 61062
+        "Axalon GmbH",                                                                    // 61063
+        "Atielo Networks",                                                                // 61064
+        "Suzhou Bytewatt Technology Co., Ltd.",                                           // 61065
+        "DataRemote Inc."                                                                 // 61066
     }
 };
 
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 541a878853..58ab3b17b1 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -1076,6 +1076,14 @@
         <translation>%1 Byte</translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished">Kommentare</translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
@@ -1125,7 +1133,7 @@
     </message>
     <message>
         <source>Section Comment</source>
-        <translation>Kommentar Bereich</translation>
+        <translation type="vanished">Kommentar Bereich</translation>
     </message>
     <message>
         <source>Packet Comments</source>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index a4eb251d83..f0082aae19 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1072,6 +1072,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1120,10 +1128,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Section Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Packet Comments</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/ui/qt/wireshark_es.ts b/ui/qt/wireshark_es.ts
index 25215bba80..296789e5d6 100644
--- a/ui/qt/wireshark_es.ts
+++ b/ui/qt/wireshark_es.ts
@@ -1053,6 +1053,14 @@
         <translation>%1 bytes</translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished">Comentarios</translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation>Estadísticas</translation>
     </message>
@@ -1102,7 +1110,7 @@
     </message>
     <message>
         <source>Section Comment</source>
-        <translation>Sección de comentarios</translation>
+        <translation type="vanished">Sección de comentarios</translation>
     </message>
     <message>
         <source>Packet Comments</source>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 556a7ac01b..f929400600 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -1076,6 +1076,14 @@
         <translation>%1 octets</translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished">Commentaires</translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation>Statistiques</translation>
     </message>
@@ -1125,7 +1133,7 @@
     </message>
     <message>
         <source>Section Comment</source>
-        <translation>Commentaire de la Section</translation>
+        <translation type="vanished">Commentaire de la Section</translation>
     </message>
     <message>
         <source>Packet Comments</source>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index c24ea1e06e..9dfb1fb5fb 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -1076,6 +1076,14 @@
         <translation>%1 byte</translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished">Commenti</translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation>Statistiche</translation>
     </message>
@@ -1125,7 +1133,7 @@
     </message>
     <message>
         <source>Section Comment</source>
-        <translation>Commento sezione</translation>
+        <translation type="vanished">Commento sezione</translation>
     </message>
     <message>
         <source>Packet Comments</source>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 61e9abc5be..3f3ba28ec6 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -1069,6 +1069,14 @@
         <translation>%1 バイト</translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished">コメント</translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation>統計</translation>
     </message>
@@ -1118,7 +1126,7 @@
     </message>
     <message>
         <source>Section Comment</source>
-        <translation>セクション コメント</translation>
+        <translation type="vanished">セクション コメント</translation>
     </message>
     <message>
         <source>Packet Comments</source>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index 2ce9017068..0336c558da 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -1083,6 +1083,14 @@
         <translation>%1 bajtów</translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished">Komentarze</translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation>Statystyki</translation>
     </message>
@@ -1131,10 +1139,6 @@
         <translation>Średnio bitów/s</translation>
     </message>
     <message>
-        <source>Section Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Packet Comments</source>
         <translation>Komentarze pakietu</translation>
     </message>
diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts
index cb4cf4324d..56255c3bee 100644
--- a/ui/qt/wireshark_ru.ts
+++ b/ui/qt/wireshark_ru.ts
@@ -1083,6 +1083,14 @@
         <translation>%1 Б</translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished">Комментарии</translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation>Статистика</translation>
     </message>
@@ -1132,7 +1140,7 @@
     </message>
     <message>
         <source>Section Comment</source>
-        <translation>Комментарий к разделу</translation>
+        <translation type="vanished">Комментарий к разделу</translation>
     </message>
     <message>
         <source>Packet Comments</source>
diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts
index 4883568160..5aa2b8d0b5 100644
--- a/ui/qt/wireshark_sv.ts
+++ b/ui/qt/wireshark_sv.ts
@@ -1076,6 +1076,14 @@
         <translation>%1 byte</translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished">Kommentarer</translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
@@ -1125,7 +1133,7 @@
     </message>
     <message>
         <source>Section Comment</source>
-        <translation>Avsnittskommentar</translation>
+        <translation type="vanished">Avsnittskommentar</translation>
     </message>
     <message>
         <source>Packet Comments</source>
diff --git a/ui/qt/wireshark_tr_TR.ts b/ui/qt/wireshark_tr_TR.ts
index 086073a83f..664bb1c5b1 100644
--- a/ui/qt/wireshark_tr_TR.ts
+++ b/ui/qt/wireshark_tr_TR.ts
@@ -1069,6 +1069,14 @@
         <translation>%1 bayt</translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished">Yorumlar</translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation>İstatistikler</translation>
     </message>
@@ -1118,7 +1126,7 @@
     </message>
     <message>
         <source>Section Comment</source>
-        <translation>Bölüm Yorumu</translation>
+        <translation type="vanished">Bölüm Yorumu</translation>
     </message>
     <message>
         <source>Packet Comments</source>
diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts
index f2d8c20f7d..926cad8ec9 100644
--- a/ui/qt/wireshark_uk.ts
+++ b/ui/qt/wireshark_uk.ts
@@ -1053,6 +1053,14 @@
         <translation>%1 байтів</translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation>Статистика</translation>
     </message>
@@ -1101,10 +1109,6 @@
         <translation>біт/с (середнє значення)</translation>
     </message>
     <message>
-        <source>Section Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Packet Comments</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 45f3bdc918..87a756f90b 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -1069,6 +1069,14 @@
         <translation>%1 字节</translation>
     </message>
     <message>
+        <source>Comments</source>
+        <translation type="unfinished">注释</translation>
+    </message>
+    <message>
+        <source>Comment %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Statistics</source>
         <translation>统计</translation>
     </message>
@@ -1117,10 +1125,6 @@
         <translation>平均 比特/秒</translation>
     </message>
     <message>
-        <source>Section Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Packet Comments</source>
         <translation>分组注释</translation>
     </message>