diff options
author | Guy Harris <guy@alum.mit.edu> | 2015-11-16 11:00:32 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2015-11-16 19:01:12 +0000 |
commit | e9dd7c8bd42cbb25ca92dde3cee0383db6c20705 (patch) | |
tree | 11d493ea7b67e728c41632bcb6d0163bbae59f2b | |
parent | 92d487a461414c9b797130e5b845488164c984cd (diff) |
Label the filter in the file open dialog as a "read filter".
This matches what the Windows file open dialog says, and also should
help prevent people thinking that it's a display filter, so that you can
clear it and see all the packets in the file.
I leave translations to native speakers.
Bug: 11708
Change-Id: I060816357bf7958d516429d09708a7ce16d609c5
Reviewed-on: https://code.wireshark.org/review/11877
Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r-- | ui/qt/capture_file_dialog.cpp | 4 | ||||
-rw-r--r-- | ui/qt/display_filter_combo.cpp | 2 | ||||
-rw-r--r-- | ui/qt/display_filter_edit.cpp | 55 | ||||
-rw-r--r-- | ui/qt/display_filter_edit.h | 11 | ||||
-rw-r--r-- | ui/qt/filter_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/wireshark_de.ts | 31 | ||||
-rw-r--r-- | ui/qt/wireshark_en.ts | 29 | ||||
-rw-r--r-- | ui/qt/wireshark_fr.ts | 31 | ||||
-rw-r--r-- | ui/qt/wireshark_it.ts | 31 | ||||
-rw-r--r-- | ui/qt/wireshark_ja_JP.ts | 33 | ||||
-rw-r--r-- | ui/qt/wireshark_pl.ts | 29 | ||||
-rw-r--r-- | ui/qt/wireshark_zh_CN.ts | 31 |
12 files changed, 161 insertions, 128 deletions
diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp index afdb1bf745..c4a838abeb 100644 --- a/ui/qt/capture_file_dialog.cpp +++ b/ui/qt/capture_file_dialog.cpp @@ -488,9 +488,9 @@ bool CaptureFileDialog::isCompressed() { void CaptureFileDialog::addDisplayFilterEdit() { QGridLayout *fd_grid = qobject_cast<QGridLayout*>(layout()); - fd_grid->addWidget(new QLabel(tr("Display Filter:")), last_row_, 0); + fd_grid->addWidget(new QLabel(tr("Read filter:")), last_row_, 0); - display_filter_edit_ = new DisplayFilterEdit(this); + display_filter_edit_ = new DisplayFilterEdit(this, ReadFilterToApply); display_filter_edit_->setText(display_filter_); fd_grid->addWidget(display_filter_edit_, last_row_, 1); last_row_++; diff --git a/ui/qt/display_filter_combo.cpp b/ui/qt/display_filter_combo.cpp index 020766d7e7..03b7a12d6a 100644 --- a/ui/qt/display_filter_combo.cpp +++ b/ui/qt/display_filter_combo.cpp @@ -45,7 +45,7 @@ DisplayFilterCombo::DisplayFilterCombo(QWidget *parent) : // Inline (highlighted text) for entire filters, handled here and popup // completion for fields handled by DisplayFilterEdit. setAutoCompletion(false); - setLineEdit(new DisplayFilterEdit(this, false)); + setLineEdit(new DisplayFilterEdit(this, DisplayFilterToApply)); setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); setAccessibleName(tr("Display filter selector")); cur_display_filter_combo = this; diff --git a/ui/qt/display_filter_edit.cpp b/ui/qt/display_filter_edit.cpp index 16360856cb..4d55502571 100644 --- a/ui/qt/display_filter_edit.cpp +++ b/ui/qt/display_filter_edit.cpp @@ -95,9 +95,9 @@ UIMiniCancelButton::UIMiniCancelButton(QWidget *pParent /* = 0 */) // proto.c:fld_abbrev_chars static const QString fld_abbrev_chars_ = "-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"; -DisplayFilterEdit::DisplayFilterEdit(QWidget *parent, bool plain) : +DisplayFilterEdit::DisplayFilterEdit(QWidget *parent, DisplayFilterEditType type) : SyntaxLineEdit(parent), - plain_(plain), + type_(type), bookmark_button_(NULL), clear_button_(NULL), apply_button_(NULL) @@ -108,24 +108,16 @@ DisplayFilterEdit::DisplayFilterEdit(QWidget *parent, bool plain) : setCompleter(new QCompleter(completion_model_, this)); setCompletionTokenChars(fld_abbrev_chars_); - if (plain_) { - placeholder_text_ = QString(tr("Enter a display filter %1")).arg(UTF8_HORIZONTAL_ELLIPSIS); - } else { - placeholder_text_ = QString(tr("Apply a display filter %1 <%2/>")).arg(UTF8_HORIZONTAL_ELLIPSIS) - .arg(DEFAULT_MODIFIER); - } -#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) - setPlaceholderText(placeholder_text_); -#endif + setDefaultPlaceholderText(); // DFCombo // Bookmark - // DispalyFilterEdit + // DisplayFilterEdit // Clear button // Apply (right arrow) // Combo drop-down - if (!plain_) { + if (type_ == DisplayFilterToApply) { bookmark_button_ = new StockIconToolButton(this, "x-filter-bookmark"); bookmark_button_->setCursor(Qt::ArrowCursor); bookmark_button_->setMenu(new QMenu()); @@ -142,7 +134,7 @@ DisplayFilterEdit::DisplayFilterEdit(QWidget *parent, bool plain) : ); } - if (!plain_) { + if (type_ == DisplayFilterToApply) { clear_button_ = new StockIconToolButton(this, "x-filter-clear"); clear_button_->setCursor(Qt::ArrowCursor); clear_button_->setToolTip(QString()); @@ -160,7 +152,7 @@ DisplayFilterEdit::DisplayFilterEdit(QWidget *parent, bool plain) : connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(checkFilter(const QString&))); - if (!plain_) { + if (type_ == DisplayFilterToApply) { apply_button_ = new StockIconToolButton(this, "x-filter-apply"); apply_button_->setCursor(Qt::ArrowCursor); apply_button_->setEnabled(false); @@ -204,6 +196,28 @@ DisplayFilterEdit::DisplayFilterEdit(QWidget *parent, bool plain) : checkFilter(); } +void DisplayFilterEdit::setDefaultPlaceholderText() +{ + switch (type_) { + + case DisplayFilterToApply: + placeholder_text_ = QString(tr("Apply a display filter %1 <%2/>")).arg(UTF8_HORIZONTAL_ELLIPSIS) + .arg(DEFAULT_MODIFIER); + break; + + case DisplayFilterToEnter: + placeholder_text_ = QString(tr("Enter a display filter %1")).arg(UTF8_HORIZONTAL_ELLIPSIS); + break; + + case ReadFilterToApply: + placeholder_text_ = QString(tr("Apply a read filter %1")).arg(UTF8_HORIZONTAL_ELLIPSIS); + break; + } +#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) + setPlaceholderText(placeholder_text_); +#endif +} + void DisplayFilterEdit::paintEvent(QPaintEvent *evt) { SyntaxLineEdit::paintEvent(evt); @@ -498,16 +512,7 @@ void DisplayFilterEdit::changeEvent(QEvent* event) switch (event->type()) { case QEvent::LanguageChange: - if (plain_) { - placeholder_text_ = QString(tr("Enter a display filter %1")). - arg(UTF8_HORIZONTAL_ELLIPSIS); - } else { - placeholder_text_ = QString(tr("Apply a display filter %1 <%2/>")) - .arg(UTF8_HORIZONTAL_ELLIPSIS).arg(DEFAULT_MODIFIER); - } -#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) - setPlaceholderText(placeholder_text_); -#endif + setDefaultPlaceholderText(); break; default: break; diff --git a/ui/qt/display_filter_edit.h b/ui/qt/display_filter_edit.h index dd1fbca62a..9c893f0789 100644 --- a/ui/qt/display_filter_edit.h +++ b/ui/qt/display_filter_edit.h @@ -28,11 +28,17 @@ class QEvent; class StockIconToolButton; +typedef enum { + DisplayFilterToApply, + DisplayFilterToEnter, + ReadFilterToApply, +} DisplayFilterEditType; + class DisplayFilterEdit : public SyntaxLineEdit { Q_OBJECT public: - explicit DisplayFilterEdit(QWidget *parent = 0, bool plain = true); + explicit DisplayFilterEdit(QWidget *parent = 0, DisplayFilterEditType type = DisplayFilterToEnter); protected: void paintEvent(QPaintEvent *evt); @@ -58,12 +64,13 @@ private slots: void prepareFilter(); private: - bool plain_; + DisplayFilterEditType type_; QString placeholder_text_; StockIconToolButton *bookmark_button_; StockIconToolButton *clear_button_; StockIconToolButton *apply_button_; + void setDefaultPlaceholderText(); void buildCompletionList(const QString& field_word); signals: diff --git a/ui/qt/filter_dialog.cpp b/ui/qt/filter_dialog.cpp index 938303d5ce..c19fce8823 100644 --- a/ui/qt/filter_dialog.cpp +++ b/ui/qt/filter_dialog.cpp @@ -265,7 +265,7 @@ QWidget *FilterTreeDelegate::createEditor(QWidget *parent, const QStyleOptionVie if (filter_type_ == FilterDialog::CaptureFilter) { w = new CaptureFilterEdit(parent, true); } else { - w = new DisplayFilterEdit(parent, true); + w = new DisplayFilterEdit(parent, DisplayFilterToEnter); } return w; diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index a3006f6288..4d2961d85a 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -640,8 +640,8 @@ </message> <message> <location filename="capture_file_dialog.cpp" line="491"/> - <source>Display Filter:</source> - <translation>Anzeige Filter:</translation> + <source>Read filter:</source> + <translation type="unfinished"></translation> </message> <message> <location filename="capture_file_dialog.cpp" line="500"/> @@ -1850,54 +1850,57 @@ Achtung: Eine Option MUSS ausgewählt sein.</translation> <translation>Anzeigefiltereintrag</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="112"/> - <location filename="display_filter_edit.cpp" line="502"/> + <location filename="display_filter_edit.cpp" line="204"/> <source>Enter a display filter %1</source> <translation>Geben Sie einen Anzeigefilter ein %1</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="114"/> - <location filename="display_filter_edit.cpp" line="505"/> + <location filename="display_filter_edit.cpp" line="208"/> <source>Apply a display filter %1 <%2/></source> <translation>Anzeigefilter anwenden %1 <%2/></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="133"/> + <location filename="display_filter_edit.cpp" line="213"/> + <source>Apply a read filter %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="display_filter_edit.cpp" line="125"/> <source>Manage saved bookmarks.</source> <translation>Gespeicherte Lesezeichen verwalten</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="167"/> + <location filename="display_filter_edit.cpp" line="159"/> <source>Apply this filter string to the display.</source> <translation>Diesen Filter zur Anzeige anwenden.</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="333"/> + <location filename="display_filter_edit.cpp" line="347"/> <source>Save this filter</source> <translation>Disen Filter speichern</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="335"/> + <location filename="display_filter_edit.cpp" line="349"/> <source>Manage Display Filters</source> <translation>Anzeigefilter verwalten</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="337"/> + <location filename="display_filter_edit.cpp" line="351"/> <source>Manage Filter Expressions</source> <translation>Filterausdrücke verwalten</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="363"/> + <location filename="display_filter_edit.cpp" line="377"/> <source>Remove this filter</source> <translation>Diesen Filter entfernen</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="311"/> + <location filename="display_filter_edit.cpp" line="325"/> <source>"%1" may have unexpected results (see the User's Guide)</source> <translation>"%1" kann zu einem unerwarteten Ergebnis führen (s. Benutzerhandbuch)</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="318"/> + <location filename="display_filter_edit.cpp" line="332"/> <source>Invalid filter: </source> <oldsource>Invalid filter</oldsource> <translation>Ungültiger Filter: </translation> diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index f7ef7e72f1..eed638f508 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -640,7 +640,7 @@ </message> <message> <location filename="capture_file_dialog.cpp" line="491"/> - <source>Display Filter:</source> + <source>Read filter:</source> <translation type="unfinished"></translation> </message> <message> @@ -1847,54 +1847,57 @@ PLEASE NOTE: One option MUST be selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="112"/> - <location filename="display_filter_edit.cpp" line="502"/> + <location filename="display_filter_edit.cpp" line="204"/> <source>Enter a display filter %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="114"/> - <location filename="display_filter_edit.cpp" line="505"/> + <location filename="display_filter_edit.cpp" line="208"/> <source>Apply a display filter %1 <%2/></source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="133"/> + <location filename="display_filter_edit.cpp" line="213"/> + <source>Apply a read filter %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="display_filter_edit.cpp" line="125"/> <source>Manage saved bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="167"/> + <location filename="display_filter_edit.cpp" line="159"/> <source>Apply this filter string to the display.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="333"/> + <location filename="display_filter_edit.cpp" line="347"/> <source>Save this filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="335"/> + <location filename="display_filter_edit.cpp" line="349"/> <source>Manage Display Filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="337"/> + <location filename="display_filter_edit.cpp" line="351"/> <source>Manage Filter Expressions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="363"/> + <location filename="display_filter_edit.cpp" line="377"/> <source>Remove this filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="311"/> + <location filename="display_filter_edit.cpp" line="325"/> <source>"%1" may have unexpected results (see the User's Guide)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="318"/> + <location filename="display_filter_edit.cpp" line="332"/> <source>Invalid filter: </source> <oldsource>Invalid filter</oldsource> <translation type="unfinished"></translation> diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index c090fa48d4..ea9ef3e9f4 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -640,8 +640,8 @@ </message> <message> <location filename="capture_file_dialog.cpp" line="491"/> - <source>Display Filter:</source> - <translation>Filtre d'affichage:</translation> + <source>Read filter:</source> + <translation type="unfinished"></translation> </message> <message> <location filename="capture_file_dialog.cpp" line="500"/> @@ -1849,54 +1849,57 @@ PLEASE NOTE: One option MUST be selected.</source> <translation>Filtre d'entrée</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="112"/> - <location filename="display_filter_edit.cpp" line="502"/> + <location filename="display_filter_edit.cpp" line="204"/> <source>Enter a display filter %1</source> <translation>Entrer a filtrage d'affichage %1</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="114"/> - <location filename="display_filter_edit.cpp" line="505"/> + <location filename="display_filter_edit.cpp" line="208"/> <source>Apply a display filter %1 <%2/></source> <translation>Appliquer un filtre d'affichage %1 <%2/></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="133"/> + <location filename="display_filter_edit.cpp" line="213"/> + <source>Apply a read filter %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="display_filter_edit.cpp" line="125"/> <source>Manage saved bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="167"/> + <location filename="display_filter_edit.cpp" line="159"/> <source>Apply this filter string to the display.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="333"/> + <location filename="display_filter_edit.cpp" line="347"/> <source>Save this filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="335"/> + <location filename="display_filter_edit.cpp" line="349"/> <source>Manage Display Filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="337"/> + <location filename="display_filter_edit.cpp" line="351"/> <source>Manage Filter Expressions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="363"/> + <location filename="display_filter_edit.cpp" line="377"/> <source>Remove this filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="311"/> + <location filename="display_filter_edit.cpp" line="325"/> <source>"%1" may have unexpected results (see the User's Guide)</source> <translation>"%1" peut avoir des résultats inattendus (voir le Guide de l'utilisateur)</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="318"/> + <location filename="display_filter_edit.cpp" line="332"/> <source>Invalid filter: </source> <oldsource>Invalid filter</oldsource> <translation>Filtre invalide :</translation> diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 0ab5976463..bee5b3586e 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -640,8 +640,8 @@ </message> <message> <location filename="capture_file_dialog.cpp" line="491"/> - <source>Display Filter:</source> - <translation>Filtro di visualizzazione:</translation> + <source>Read filter:</source> + <translation type="unfinished"></translation> </message> <message> <location filename="capture_file_dialog.cpp" line="500"/> @@ -1850,54 +1850,57 @@ NOTA: un'opzione DEVE essere selezionata.</translation> <translation>Mostra la voce del filtro</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="112"/> - <location filename="display_filter_edit.cpp" line="502"/> + <location filename="display_filter_edit.cpp" line="204"/> <source>Enter a display filter %1</source> <translation>Inserisci un filtro di visualizzazione %1</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="114"/> - <location filename="display_filter_edit.cpp" line="505"/> + <location filename="display_filter_edit.cpp" line="208"/> <source>Apply a display filter %1 <%2/></source> <translation>Applica un filtro di visualizzazione %1 <%2/></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="133"/> + <location filename="display_filter_edit.cpp" line="213"/> + <source>Apply a read filter %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="display_filter_edit.cpp" line="125"/> <source>Manage saved bookmarks.</source> <translation>Gestisci i segnalibri salvati.</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="167"/> + <location filename="display_filter_edit.cpp" line="159"/> <source>Apply this filter string to the display.</source> <translation>Applica questa stringa di filtro alla visualizzazione.</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="333"/> + <location filename="display_filter_edit.cpp" line="347"/> <source>Save this filter</source> <translation>Salva questo filtro</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="335"/> + <location filename="display_filter_edit.cpp" line="349"/> <source>Manage Display Filters</source> <translation>Gestisci filtri di visualizzazione</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="337"/> + <location filename="display_filter_edit.cpp" line="351"/> <source>Manage Filter Expressions</source> <translation>Gestisci espressioni di filtro</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="363"/> + <location filename="display_filter_edit.cpp" line="377"/> <source>Remove this filter</source> <translation>Rimuovi questo filtro</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="311"/> + <location filename="display_filter_edit.cpp" line="325"/> <source>"%1" may have unexpected results (see the User's Guide)</source> <translation>"%1" potrebbe avere dei comportamenti inattesi (vedi il Manuale utente)</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="318"/> + <location filename="display_filter_edit.cpp" line="332"/> <source>Invalid filter: </source> <oldsource>Invalid filter</oldsource> <translation>Filtro non valido: </translation> diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index 0525be3e23..9337d5797b 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -640,8 +640,8 @@ </message> <message> <location filename="capture_file_dialog.cpp" line="491"/> - <source>Display Filter:</source> - <translation>表示フィルタ:</translation> + <source>Read filter:</source> + <translation type="unfinished"></translation> </message> <message> <location filename="capture_file_dialog.cpp" line="500"/> @@ -1845,57 +1845,60 @@ PLEASE NOTE: One option MUST be selected.</source> <message> <location filename="display_filter_edit.cpp" line="105"/> <source>Display filter entry</source> - <translation>表示フィルタ入力</translation> + <translation>表示フィルタ入力</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="112"/> - <location filename="display_filter_edit.cpp" line="502"/> + <location filename="display_filter_edit.cpp" line="204"/> <source>Enter a display filter %1</source> <translation>表示フィルタを入力します %1</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="114"/> - <location filename="display_filter_edit.cpp" line="505"/> + <location filename="display_filter_edit.cpp" line="208"/> <source>Apply a display filter %1 <%2/></source> <translation>表示フィルタを適用します %1 <%2/></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="133"/> + <location filename="display_filter_edit.cpp" line="213"/> + <source>Apply a read filter %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="display_filter_edit.cpp" line="125"/> <source>Manage saved bookmarks.</source> <translation>保存したブックマークを管理</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="167"/> + <location filename="display_filter_edit.cpp" line="159"/> <source>Apply this filter string to the display.</source> <translation>このフィルタ文字列を表示に適用</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="333"/> + <location filename="display_filter_edit.cpp" line="347"/> <source>Save this filter</source> <translation>このフィルタを保存</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="335"/> + <location filename="display_filter_edit.cpp" line="349"/> <source>Manage Display Filters</source> <translation>表示フィルタの管理</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="337"/> + <location filename="display_filter_edit.cpp" line="351"/> <source>Manage Filter Expressions</source> <translation>フィルタ表示式の管理</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="363"/> + <location filename="display_filter_edit.cpp" line="377"/> <source>Remove this filter</source> <translation>このフィルタを削除</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="311"/> + <location filename="display_filter_edit.cpp" line="325"/> <source>"%1" may have unexpected results (see the User's Guide)</source> <translation>"%1" は期待しない結果になったかもしれません。(ユーザーズガイドを参照ください)</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="318"/> + <location filename="display_filter_edit.cpp" line="332"/> <source>Invalid filter: </source> <oldsource>Invalid filter</oldsource> <translation>無効なフィルタ:</translation> diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index 72c46fc8a3..43061e42ff 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -640,7 +640,7 @@ </message> <message> <location filename="capture_file_dialog.cpp" line="491"/> - <source>Display Filter:</source> + <source>Read filter:</source> <translation>Filtr:</translation> </message> <message> @@ -1849,54 +1849,57 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać <translation>Wpis filtru wyświetlania</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="112"/> - <location filename="display_filter_edit.cpp" line="502"/> + <location filename="display_filter_edit.cpp" line="204"/> <source>Enter a display filter %1</source> <translation>Wpisz filtr wyświetlania %1</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="114"/> - <location filename="display_filter_edit.cpp" line="505"/> + <location filename="display_filter_edit.cpp" line="208"/> <source>Apply a display filter %1 <%2/></source> <translation>Zastosuj filtr wyświetlania %1 <%2/></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="133"/> + <location filename="display_filter_edit.cpp" line="213"/> + <source>Apply a read filter %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="display_filter_edit.cpp" line="125"/> <source>Manage saved bookmarks.</source> <translation>Zarządzaj zapisanymi zakładkami.</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="167"/> + <location filename="display_filter_edit.cpp" line="159"/> <source>Apply this filter string to the display.</source> <translation>Zastosuj filtr.</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="333"/> + <location filename="display_filter_edit.cpp" line="347"/> <source>Save this filter</source> <translation>Zapisz filtr</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="335"/> + <location filename="display_filter_edit.cpp" line="349"/> <source>Manage Display Filters</source> <translation>Zarządzaj filtrami wyświetlania</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="337"/> + <location filename="display_filter_edit.cpp" line="351"/> <source>Manage Filter Expressions</source> <translation>Zarządzaj wyrażeniami filtrów</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="363"/> + <location filename="display_filter_edit.cpp" line="377"/> <source>Remove this filter</source> <translation>Usuń filtr</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="311"/> + <location filename="display_filter_edit.cpp" line="325"/> <source>"%1" may have unexpected results (see the User's Guide)</source> <translation>"%1" może mieć nieoczekiwany rezultat (zobacz Podręcznik Użytkownika)</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="318"/> + <location filename="display_filter_edit.cpp" line="332"/> <source>Invalid filter: </source> <oldsource>Invalid filter</oldsource> <translation>Błądny filtr: </translation> diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index e14a8fb419..82304f7036 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -640,8 +640,8 @@ </message> <message> <location filename="capture_file_dialog.cpp" line="491"/> - <source>Display Filter:</source> - <translation>显示筛选器:</translation> + <source>Read filter:</source> + <translation type="unfinished"></translation> </message> <message> <location filename="capture_file_dialog.cpp" line="500"/> @@ -1849,54 +1849,57 @@ PLEASE NOTE: One option MUST be selected.</source> <translation>显示筛选器条目</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="112"/> - <location filename="display_filter_edit.cpp" line="502"/> + <location filename="display_filter_edit.cpp" line="204"/> <source>Enter a display filter %1</source> <translation>输入显示筛选器 %1</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="114"/> - <location filename="display_filter_edit.cpp" line="505"/> + <location filename="display_filter_edit.cpp" line="208"/> <source>Apply a display filter %1 <%2/></source> <translation>应用显示筛选器 %1 <%2/></translation> </message> <message> - <location filename="display_filter_edit.cpp" line="133"/> + <location filename="display_filter_edit.cpp" line="213"/> + <source>Apply a read filter %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="display_filter_edit.cpp" line="125"/> <source>Manage saved bookmarks.</source> <translation>管理保存的书签。</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="167"/> + <location filename="display_filter_edit.cpp" line="159"/> <source>Apply this filter string to the display.</source> <translation>应用此筛选器字符串进行显示。</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="333"/> + <location filename="display_filter_edit.cpp" line="347"/> <source>Save this filter</source> <translation>保存该过滤器</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="335"/> + <location filename="display_filter_edit.cpp" line="349"/> <source>Manage Display Filters</source> <translation>管理显示过滤器</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="337"/> + <location filename="display_filter_edit.cpp" line="351"/> <source>Manage Filter Expressions</source> <translation>管理筛选器表达式</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="363"/> + <location filename="display_filter_edit.cpp" line="377"/> <source>Remove this filter</source> <translation>删除该过滤器</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="311"/> + <location filename="display_filter_edit.cpp" line="325"/> <source>"%1" may have unexpected results (see the User's Guide)</source> <translation>"%1"可能遇到意外的结果(参考用户手册)</translation> </message> <message> - <location filename="display_filter_edit.cpp" line="318"/> + <location filename="display_filter_edit.cpp" line="332"/> <source>Invalid filter: </source> <oldsource>Invalid filter</oldsource> <translation>无效筛选器:</translation> |