aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS3
-rw-r--r--NEWS2
-rw-r--r--enterprises.tsv16
-rw-r--r--ui/qt/wireshark_de.ts5
-rw-r--r--ui/qt/wireshark_en.ts2
-rw-r--r--ui/qt/wireshark_fr.ts3
-rw-r--r--ui/qt/wireshark_it.ts5
-rw-r--r--ui/qt/wireshark_ja_JP.ts5
-rw-r--r--ui/qt/wireshark_pl.ts5
-rw-r--r--ui/qt/wireshark_ru.ts5
-rw-r--r--ui/qt/wireshark_sv.ts5
-rw-r--r--ui/qt/wireshark_uk.ts3
-rw-r--r--ui/qt/wireshark_zh_CN.ts5
13 files changed, 45 insertions, 19 deletions
diff --git a/AUTHORS b/AUTHORS
index ba49a0cac7..7fd85183d3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4006,6 +4006,7 @@ AlexL <loginov.alex.valer[AT]gmail.com>
Alexander Couzens <lynxis[AT]fe80.eu>
Alexander Gryanko <xpahos[AT]gmail.com>
Alexander Gärtner <sphinxs1988[AT]googlemail.com>
+Alexander Meier <MeierAPunkt[AT]googlemail.com>
Alexander Nogikh <wp32pw[AT]gmail.com>
Alexander Stein <alexanders83[AT]web.de>
Alexander Wetzel <alexander.wetzel[AT]web.de>
@@ -4686,6 +4687,7 @@ Tobias Stoeckmann <tobias[AT]stoeckmann.org>
Tom <tom916[AT]qq.com>
Tom Haynes <loghyr[AT]hammerspace.com>
Tom Haynes <loghyr[AT]primarydata.com>
+Tom Nisbet <t.talk[AT]nisbethome.com>
Tomas Konecny <tomas.konecny[AT]eldis.cz>
Tomas Kukosa <tomas.kukosa[AT]ixperta.com>
Tomas Liscak <tomas.liscak[AT]nokia.com>
@@ -4748,6 +4750,7 @@ akuchekar <akuchekar[AT]empirix.com>
anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
cheloftus <cheloftus[AT]gmail.com>
+dennisschagt <dennisschagt[AT]gmail.com>
jfp_martin <john[AT]purplemeanie.co.uk>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
diff --git a/NEWS b/NEWS
index 1ddba221c6..3cdff6d49a 100644
--- a/NEWS
+++ b/NEWS
@@ -79,7 +79,7 @@ Wireshark 3.3.0 Release Notes
A complete FAQ is available on the Wireshark web site[6].
- Last updated 2019-12-22 08:06:49 UTC
+ Last updated 2019-12-29 08:07:47 UTC
References
diff --git a/enterprises.tsv b/enterprises.tsv
index bf82cee446..57274a9dbf 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-12-21)
+# (last updated 2019-12-26)
0 Reserved
1 NxNetworks
@@ -54838,3 +54838,17 @@
55029 GARDENA GmbH
55030 Michael W Lucas
55031 netadvance Kft.
+55032 South West London and St George's Mental Health NHS Trust
+55033 BItBoxUSA
+55034 Apstra
+55035 OuterShadows Group
+55036 SentrId
+55037 Walker Information
+55038 PlusClouds
+55039 Farktronix
+55040 Heissler Informatik
+55041 Dept of Chemistry, University of Oxford
+55042 Hutchison 3G UK Limited
+55043 Gruber Schanksysteme
+55044 Japan Communications Inc.
+55045 One Network
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 0fe581650c..0dcf575448 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -92,8 +92,9 @@
<translation>Das Verzeichnis konnte nicht erstellt werden</translation>
</message>
<message>
- <source>The directory %1 could not be created!</source>
- <translation>Das Verzeichnis %1 konnte nicht erstellt werden!</translation>
+ <source>The directory %1 could not be created.</source>
+ <oldsource>The directory %1 could not be created!</oldsource>
+ <translation type="unfinished">Das Verzeichnis %1 konnte nicht erstellt werden!</translation>
</message>
<message>
<source>Show in Finder</source>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index f7cce11393..60b214661d 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -92,7 +92,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>The directory %1 could not be created!</source>
+ <source>The directory %1 could not be created.</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 1b79a7df12..b7d566ef0b 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -92,7 +92,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>The directory %1 could not be created!</source>
+ <source>The directory %1 could not be created.</source>
+ <oldsource>The directory %1 could not be created!</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index a562ac1558..c95ade5c61 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -92,8 +92,9 @@
<translation>La cartella non può essere creata</translation>
</message>
<message>
- <source>The directory %1 could not be created!</source>
- <translation>La cartella %1 non può essere creata!</translation>
+ <source>The directory %1 could not be created.</source>
+ <oldsource>The directory %1 could not be created!</oldsource>
+ <translation type="unfinished">La cartella %1 non può essere creata!</translation>
</message>
<message>
<source>Show in Finder</source>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index df612489fa..c8118ffbc7 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -92,8 +92,9 @@
<translation>ディレクトリを作成できませんでした</translation>
</message>
<message>
- <source>The directory %1 could not be created!</source>
- <translation>ディレクトリ %1 を作成出来ませんでした</translation>
+ <source>The directory %1 could not be created.</source>
+ <oldsource>The directory %1 could not be created!</oldsource>
+ <translation type="unfinished">ディレクトリ %1 を作成出来ませんでした</translation>
</message>
<message>
<source>Show in Finder</source>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index f675558d90..b69647dfe9 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -92,8 +92,9 @@
<translation>Nie można utworzyć katalogu.</translation>
</message>
<message>
- <source>The directory %1 could not be created!</source>
- <translation>Nie można utworzyć katalogu %1!</translation>
+ <source>The directory %1 could not be created.</source>
+ <oldsource>The directory %1 could not be created!</oldsource>
+ <translation type="unfinished">Nie można utworzyć katalogu %1!</translation>
</message>
<message>
<source>Show in Finder</source>
diff --git a/ui/qt/wireshark_ru.ts b/ui/qt/wireshark_ru.ts
index 95ec8be691..c0de595232 100644
--- a/ui/qt/wireshark_ru.ts
+++ b/ui/qt/wireshark_ru.ts
@@ -92,8 +92,9 @@
<translation>Каталог не может быть создан</translation>
</message>
<message>
- <source>The directory %1 could not be created!</source>
- <translation>Каталог %1 не может быть создан!</translation>
+ <source>The directory %1 could not be created.</source>
+ <oldsource>The directory %1 could not be created!</oldsource>
+ <translation type="unfinished">Каталог %1 не может быть создан!</translation>
</message>
<message>
<source>Show in Finder</source>
diff --git a/ui/qt/wireshark_sv.ts b/ui/qt/wireshark_sv.ts
index e206516808..d181802558 100644
--- a/ui/qt/wireshark_sv.ts
+++ b/ui/qt/wireshark_sv.ts
@@ -92,8 +92,9 @@
<translation>Katalogen kunde inte skapas</translation>
</message>
<message>
- <source>The directory %1 could not be created!</source>
- <translation>Katalogen %1 kunde inte skapas!</translation>
+ <source>The directory %1 could not be created.</source>
+ <oldsource>The directory %1 could not be created!</oldsource>
+ <translation type="unfinished">Katalogen %1 kunde inte skapas!</translation>
</message>
<message>
<source>Show in Finder</source>
diff --git a/ui/qt/wireshark_uk.ts b/ui/qt/wireshark_uk.ts
index 73d41638fe..8b9f2d131a 100644
--- a/ui/qt/wireshark_uk.ts
+++ b/ui/qt/wireshark_uk.ts
@@ -92,7 +92,8 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>The directory %1 could not be created!</source>
+ <source>The directory %1 could not be created.</source>
+ <oldsource>The directory %1 could not be created!</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index bf8b2407fb..771f48891a 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -92,8 +92,9 @@
<translation>无法创建目录</translation>
</message>
<message>
- <source>The directory %1 could not be created!</source>
- <translation>无法创建目录 %1!</translation>
+ <source>The directory %1 could not be created.</source>
+ <oldsource>The directory %1 could not be created!</oldsource>
+ <translation type="unfinished">无法创建目录 %1!</translation>
</message>
<message>
<source>Show in Finder</source>