aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-11-16 02:15:47 -0800
committerGuy Harris <guy@alum.mit.edu>2018-11-16 12:21:00 +0000
commitb894c53d5ea1395e042bb05e471d651af486dfab (patch)
tree9bd6a6c5168fe4c4594508c912765a342ab9afe0 /ui
parenteea4997f7e52e0126448225dfd04da840f73ec0c (diff)
Add an API to get a description of a compression type, and use it.
Add wtap_compression_type_description(), which returns NULL for WTAP_UNCOMPRESSED and a descriptive string for other compression types. Instead of checking for WTAP_GZIP_COMPRESSED and appending "(gzip compressed)", just pass the compression type to wtap_compression_type_description() and, if the result is non-null, append its result, wrapped in parentheses, with a space before the left parenthesis. Change-Id: I79a999c7838a883953795d5cbab009966e14b65e Reviewed-on: https://code.wireshark.org/review/30666 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/capture_file_properties_dialog.cpp5
-rw-r--r--ui/qt/gsm_map_summary_dialog.cpp5
-rw-r--r--ui/qt/mtp3_summary_dialog.cpp5
-rw-r--r--ui/qt/wireshark_de.ts12
-rw-r--r--ui/qt/wireshark_en.ts12
-rw-r--r--ui/qt/wireshark_fr.ts12
-rw-r--r--ui/qt/wireshark_it.ts12
-rw-r--r--ui/qt/wireshark_ja_JP.ts12
-rw-r--r--ui/qt/wireshark_pl.ts12
-rw-r--r--ui/qt/wireshark_zh_CN.ts12
10 files changed, 9 insertions, 90 deletions
diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp
index a1fb3df5ca..701366260a 100644
--- a/ui/qt/capture_file_properties_dialog.cpp
+++ b/ui/qt/capture_file_properties_dialog.cpp
@@ -177,8 +177,9 @@ QString CaptureFilePropertiesDialog::summaryToHtml()
<< table_row_end;
QString format_str = wtap_file_type_subtype_string(summary.file_type);
- if (summary.compression_type == WTAP_GZIP_COMPRESSED) {
- format_str.append(tr(" (gzip compressed)"));
+ const char *compression_type_description = wtap_compression_type_description(summary.compression_type);
+ if (compression_type_description != NULL) {
+ format_str += QString::asprintf(" (%s)", compression_type_description);
}
out << table_row_begin
<< table_vheader_tmpl.arg(tr("Format"))
diff --git a/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp
index ecc6be98c2..11992f41ef 100644
--- a/ui/qt/gsm_map_summary_dialog.cpp
+++ b/ui/qt/gsm_map_summary_dialog.cpp
@@ -107,8 +107,9 @@ QString GsmMapSummaryDialog::summaryToHtml()
<< table_row_end;
QString format_str = wtap_file_type_subtype_string(summary.file_type);
- if (summary.compression_type == WTAP_GZIP_COMPRESSED) {
- format_str.append(tr(" (gzip compressed)"));
+ const char *compression_type_description = wtap_compression_type_description(summary.compression_type);
+ if (compression_type_description != NULL) {
+ format_str += QString::asprintf(" (%s)", compression_type_description);
}
out << table_row_begin
<< table_vheader_tmpl.arg(tr("Format"))
diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp
index 412a0cb82f..acf7e6d10c 100644
--- a/ui/qt/mtp3_summary_dialog.cpp
+++ b/ui/qt/mtp3_summary_dialog.cpp
@@ -111,8 +111,9 @@ QString Mtp3SummaryDialog::summaryToHtml()
<< table_row_end;
QString format_str = wtap_file_type_subtype_string(summary.file_type);
- if (summary.compression_type == WTAP_GZIP_COMPRESSED) {
- format_str.append(tr(" (gzip compressed)"));
+ const char *compression_type_description = wtap_compression_type_description(summary.compression_type);
+ if (compression_type_description != NULL) {
+ format_str += QString::asprintf(" (%s)", compression_type_description);
}
out << table_row_begin
<< table_vheader_tmpl.arg(tr("Format"))
diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts
index 8aee4371c6..a0ec303b21 100644
--- a/ui/qt/wireshark_de.ts
+++ b/ui/qt/wireshark_de.ts
@@ -937,10 +937,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (gzip-komprimiert)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -3069,10 +3065,6 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>Länge</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (gzip komprimiert)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -7885,10 +7877,6 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation>
<translation>Länge</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (gzip-komprimiert)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Format</translation>
</message>
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index 9c019f696c..8aa629d737 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -937,10 +937,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Format</source>
<translation type="unfinished"></translation>
</message>
@@ -3057,10 +3053,6 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Format</source>
<translation type="unfinished"></translation>
</message>
@@ -7819,10 +7811,6 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Format</source>
<translation type="unfinished"></translation>
</message>
diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts
index 6321e386dc..2849fae41d 100644
--- a/ui/qt/wireshark_fr.ts
+++ b/ui/qt/wireshark_fr.ts
@@ -914,10 +914,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation>(compressé gzip)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -3037,10 +3033,6 @@ NOTE: Une option DOIT être sélectionnée.</translation>
<translation>Longueur</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation>(compressé gzip)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -7849,10 +7841,6 @@ Changer la direction de la connexion (voir le flux inverse).&lt;/p&gt;&lt;/body&
<translation>Longueur</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation>(compressé gzip)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Format</translation>
</message>
diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts
index 8ac3b7d174..3d2bb5cf9a 100644
--- a/ui/qt/wireshark_it.ts
+++ b/ui/qt/wireshark_it.ts
@@ -937,10 +937,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (compresso con gzip)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Formato</translation>
</message>
@@ -3069,10 +3065,6 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>Lunghezza</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (compresso con gzip)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Formato</translation>
</message>
@@ -7885,10 +7877,6 @@ NOTA: un&apos;opzione DEVE essere selezionata.</translation>
<translation>Lunghezza</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (compresso con gzip)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Formato</translation>
</message>
diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts
index 755babb039..958ae122ba 100644
--- a/ui/qt/wireshark_ja_JP.ts
+++ b/ui/qt/wireshark_ja_JP.ts
@@ -911,10 +911,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (gzip圧縮)</translation>
- </message>
- <message>
<source>Format</source>
<translation>形式</translation>
</message>
@@ -3025,10 +3021,6 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>長さ</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (gzip圧縮)</translation>
- </message>
- <message>
<source>Format</source>
<translation>フォーマット</translation>
</message>
@@ -7840,10 +7832,6 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>長さ</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (gzip圧縮)</translation>
- </message>
- <message>
<source>Format</source>
<translation>フォーマット</translation>
</message>
diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts
index ad54c40dd0..af3080532b 100644
--- a/ui/qt/wireshark_pl.ts
+++ b/ui/qt/wireshark_pl.ts
@@ -917,10 +917,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (skompresowany gzip)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -3045,10 +3041,6 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
<translation>Długość</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (skompresowany gzip)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -7859,10 +7851,6 @@ UWAGA: Przynajmniej jedna opcja MUSI zostać zaznaczona.</translation>
<translation>Długość</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation>(skompresowany gzip)</translation>
- </message>
- <message>
<source>Format</source>
<translation>Format</translation>
</message>
diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts
index 75ef15f2f4..d24accfc19 100644
--- a/ui/qt/wireshark_zh_CN.ts
+++ b/ui/qt/wireshark_zh_CN.ts
@@ -931,10 +931,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation>(gzip 压缩)</translation>
- </message>
- <message>
<source>Format</source>
<translation>格式</translation>
</message>
@@ -3046,10 +3042,6 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>长度</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation> (gzip 压缩)</translation>
- </message>
- <message>
<source>Format</source>
<translation>格式</translation>
</message>
@@ -7857,10 +7849,6 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation>长度</translation>
</message>
<message>
- <source> (gzip compressed)</source>
- <translation>(gzip 压缩)</translation>
- </message>
- <message>
<source>Format</source>
<translation>格式</translation>
</message>