diff options
33 files changed, 70 insertions, 70 deletions
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index c18a75b51c..773acc7b2a 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -199,13 +199,13 @@ FolderListModel::FolderListModel(QObject * parent): /* pers conf */ appendRow(QStringList() << tr("Personal configuration") << gchar_free_to_qstring(get_persconffile_path("", FALSE)) - << tr("dfilters, preferences, ethers, " UTF8_HORIZONTAL_ELLIPSIS)); + << tr("dfilters, preferences, ethers, …")); /* global conf */ QString dirPath = get_datafile_dir(); if (! dirPath.isEmpty()) { appendRow (QStringList() << tr("Global configuration") << dirPath - << tr("dfilters, preferences, manuf, " UTF8_HORIZONTAL_ELLIPSIS)); + << tr("dfilters, preferences, manuf, …")); } /* system */ diff --git a/ui/qt/coloring_rules_dialog.cpp b/ui/qt/coloring_rules_dialog.cpp index 16f2ab8df9..3c1c147708 100644 --- a/ui/qt/coloring_rules_dialog.cpp +++ b/ui/qt/coloring_rules_dialog.cpp @@ -86,9 +86,9 @@ ColoringRulesDialog::ColoringRulesDialog(QWidget *parent, QString add_filter) : rowCountChanged(); - import_button_ = ui->buttonBox->addButton(tr("Import" UTF8_HORIZONTAL_ELLIPSIS), QDialogButtonBox::ApplyRole); + import_button_ = ui->buttonBox->addButton(tr("Import…"), QDialogButtonBox::ApplyRole); import_button_->setToolTip(tr("Select a file and add its filters to the end of the list.")); - export_button_ = ui->buttonBox->addButton(tr("Export" UTF8_HORIZONTAL_ELLIPSIS), QDialogButtonBox::ApplyRole); + export_button_ = ui->buttonBox->addButton(tr("Export…"), QDialogButtonBox::ApplyRole); export_button_->setToolTip(tr("Save filters in a file.")); CopyFromProfileButton * copy_button = new CopyFromProfileButton(this, COLORFILTERS_FILE_NAME, tr("Copy coloring rules from another profile.")); diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp index 8dfe9d1385..024ad53d76 100644 --- a/ui/qt/conversation_dialog.cpp +++ b/ui/qt/conversation_dialog.cpp @@ -56,11 +56,11 @@ ConversationDialog::ConversationDialog(QWidget &parent, CaptureFile &cf, int cli TrafficTableDialog(parent, cf, filter, table_name_), tcp_graph_requested_(false) { - follow_bt_ = buttonBox()->addButton(tr("Follow Stream" UTF8_HORIZONTAL_ELLIPSIS), QDialogButtonBox::ActionRole); + follow_bt_ = buttonBox()->addButton(tr("Follow Stream…"), QDialogButtonBox::ActionRole); follow_bt_->setToolTip(tr("Follow a TCP or UDP stream.")); connect(follow_bt_, SIGNAL(clicked()), this, SLOT(followStream())); - graph_bt_ = buttonBox()->addButton(tr("Graph" UTF8_HORIZONTAL_ELLIPSIS), QDialogButtonBox::ActionRole); + graph_bt_ = buttonBox()->addButton(tr("Graph…"), QDialogButtonBox::ActionRole); graph_bt_->setToolTip(tr("Graph a TCP conversation.")); connect(graph_bt_, SIGNAL(clicked()), this, SLOT(graphTcp())); diff --git a/ui/qt/decode_as_dialog.cpp b/ui/qt/decode_as_dialog.cpp index ef91d5ffd8..488cdab1f5 100644 --- a/ui/qt/decode_as_dialog.cpp +++ b/ui/qt/decode_as_dialog.cpp @@ -63,7 +63,7 @@ DecodeAsDialog::DecodeAsDialog(QWidget *parent, capture_file *cf, bool create_ne ui->pathLabel->setAttribute(Qt::WA_MacSmallSize, true); #endif - setWindowTitle(wsApp->windowTitleString(tr("Decode As" UTF8_HORIZONTAL_ELLIPSIS))); + setWindowTitle(wsApp->windowTitleString(tr("Decode As…"))); QString abs_path = gchar_free_to_qstring(get_persconffile_path(DECODE_AS_ENTRIES_FILE_NAME, TRUE)); if (file_exists(abs_path.toUtf8().constData())) { diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp index 2a65ada89a..1fae3477ae 100644 --- a/ui/qt/endpoint_dialog.cpp +++ b/ui/qt/endpoint_dialog.cpp @@ -47,7 +47,7 @@ EndpointDialog::EndpointDialog(QWidget &parent, CaptureFile &cf, int cli_proto_i QAction *action; action = map_menu_->addAction(tr("Open in browser")); connect(action, &QAction::triggered, this, &EndpointDialog::openMap); - action = map_menu_->addAction(tr("Save As" UTF8_HORIZONTAL_ELLIPSIS)); + action = map_menu_->addAction(tr("Save As…")); connect(action, &QAction::triggered, this, &EndpointDialog::saveMap); map_bt_->setMenu(map_menu_); #endif diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp index 5409fb23f7..b9cd423ecb 100644 --- a/ui/qt/export_object_dialog.cpp +++ b/ui/qt/export_object_dialog.cpp @@ -235,7 +235,7 @@ void ExportObjectDialog::saveCurrentEntry(QString *tempFile) if (!tempFile) { GString *safe_filename = eo_massage_str(entry_filename.toUtf8().constData(), EXPORT_OBJECT_MAXFILELEN, 0); - file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Object As" UTF8_HORIZONTAL_ELLIPSIS)), + file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Object As…")), safe_filename->str); g_string_free(safe_filename, TRUE); } else { @@ -265,7 +265,7 @@ void ExportObjectDialog::saveAllEntries() // as the native dialog is used, and it supports that; does // that also work on Windows and with Qt's own dialog? // - save_in_path = WiresharkFileDialog::getExistingDirectory(this, wsApp->windowTitleString(tr("Save All Objects In" UTF8_HORIZONTAL_ELLIPSIS)), + save_in_path = WiresharkFileDialog::getExistingDirectory(this, wsApp->windowTitleString(tr("Save All Objects In…")), save_in_dir.canonicalPath(), QFileDialog::ShowDirsOnly); diff --git a/ui/qt/filter_action.cpp b/ui/qt/filter_action.cpp index d724a88237..9beab08061 100644 --- a/ui/qt/filter_action.cpp +++ b/ui/qt/filter_action.cpp @@ -113,16 +113,16 @@ const QString FilterAction::actionTypeName(ActionType type) { return QObject::tr("Not Selected"); break; case ActionTypeAnd: - return QObject::tr(UTF8_HORIZONTAL_ELLIPSIS "and Selected"); + return QObject::tr("…and Selected"); break; case ActionTypeOr: - return QObject::tr(UTF8_HORIZONTAL_ELLIPSIS "or Selected"); + return QObject::tr("…or Selected"); break; case ActionTypeAndNot: - return QObject::tr(UTF8_HORIZONTAL_ELLIPSIS "and not Selected"); + return QObject::tr("…and not Selected"); break; case ActionTypeOrNot: - return QObject::tr(UTF8_HORIZONTAL_ELLIPSIS "or not Selected"); + return QObject::tr("…or not Selected"); break; default: return QObject::tr("UNKNOWN"); @@ -203,16 +203,16 @@ QActionGroup * FilterAction::createFilterGroup(QString filter, bool prepare, boo action->setProperty("filterType", FilterAction::ActionTypePlain); action = group->addAction(tr("Not Selected")); action->setProperty("filterType", FilterAction::ActionTypeNot); - action = group->addAction(tr(UTF8_HORIZONTAL_ELLIPSIS "and Selected")); + action = group->addAction(tr("…and Selected")); action->setProperty("filterType", FilterAction::ActionTypeAnd); action->setEnabled(!filterEmpty); - action = group->addAction(tr(UTF8_HORIZONTAL_ELLIPSIS "or Selected")); + action = group->addAction(tr("…or Selected")); action->setProperty("filterType", FilterAction::ActionTypeOr); action->setEnabled(!filterEmpty); - action = group->addAction(tr(UTF8_HORIZONTAL_ELLIPSIS "and not Selected")); + action = group->addAction(tr("…and not Selected")); action->setProperty("filterType", FilterAction::ActionTypeAndNot); action->setEnabled(!filterEmpty); - action = group->addAction(tr(UTF8_HORIZONTAL_ELLIPSIS "or not Selected")); + action = group->addAction(tr("…or not Selected")); action->setProperty("filterType", FilterAction::ActionTypeOrNot); action->setEnabled(!filterEmpty); group->setEnabled(enabled); diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp index a5c5a77069..ef2846d61e 100644 --- a/ui/qt/follow_stream_dialog.cpp +++ b/ui/qt/follow_stream_dialog.cpp @@ -131,7 +131,7 @@ FollowStreamDialog::FollowStreamDialog(QWidget &parent, CaptureFile &cf, follow_ b_print_ = ui->buttonBox->addButton(tr("Print"), QDialogButtonBox::ActionRole); connect(b_print_, SIGNAL(clicked()), this, SLOT(printStream())); - b_save_ = ui->buttonBox->addButton(tr("Save as" UTF8_HORIZONTAL_ELLIPSIS), QDialogButtonBox::ActionRole); + b_save_ = ui->buttonBox->addButton(tr("Save as…"), QDialogButtonBox::ActionRole); connect(b_save_, SIGNAL(clicked()), this, SLOT(saveAs())); b_back_ = ui->buttonBox->addButton(tr("Back"), QDialogButtonBox::ActionRole); @@ -285,7 +285,7 @@ void FollowStreamDialog::findText(bool go_back) void FollowStreamDialog::saveAs() { - QString file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Stream Content As" UTF8_HORIZONTAL_ELLIPSIS))); + QString file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Stream Content As…"))); if (file_name.isEmpty()) { return; } diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index 6755bcbd86..098b43e942 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp @@ -578,7 +578,7 @@ void Iax2AnalysisDialog::on_actionSaveGraph_triggered() if (!file_closed_) { save_file += QString("/%1").arg(cap_file_.fileBaseName()); } - file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), + file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As…")), save_file, filter, &extension); if (!file_name.isEmpty()) { @@ -921,7 +921,7 @@ void Iax2AnalysisDialog::saveAudio(Iax2AnalysisDialog::StreamDirection direction return; } - ui->hintLabel->setText(tr("Saving %1" UTF8_HORIZONTAL_ELLIPSIS).arg(save_file.fileName())); + ui->hintLabel->setText(tr("Saving %1…").arg(save_file.fileName())); ui->progressFrame->showProgress(tr("Analyzing IAX2"), true, true, &stop_flag); if (save_format == save_audio_au_) { /* au format; https://pubs.opengroup.org/external/auformat.html */ diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp index e5c6c73efe..f8a6a16642 100644 --- a/ui/qt/io_graph_dialog.cpp +++ b/ui/qt/io_graph_dialog.cpp @@ -329,7 +329,7 @@ IOGraphDialog::IOGraphDialog(QWidget &parent, CaptureFile &cf, QString displayFi #endif QPushButton *save_bt = ui->buttonBox->button(QDialogButtonBox::Save); - save_bt->setText(tr("Save As" UTF8_HORIZONTAL_ELLIPSIS)); + save_bt->setText(tr("Save As…")); QPushButton *copy_bt = ui->buttonBox->addButton(tr("Copy"), QDialogButtonBox::ActionRole); connect (copy_bt, SIGNAL(clicked()), this, SLOT(copyAsCsvClicked())); @@ -1484,7 +1484,7 @@ void IOGraphDialog::on_buttonBox_accepted() if (!file_closed_) { save_file += QString("/%1").arg(cap_file_.fileBaseName()); } - file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), + file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As…")), save_file, filter, &extension); if (file_name.length() > 0) { diff --git a/ui/qt/lte_rlc_graph_dialog.cpp b/ui/qt/lte_rlc_graph_dialog.cpp index 055002fdb6..75543a3390 100644 --- a/ui/qt/lte_rlc_graph_dialog.cpp +++ b/ui/qt/lte_rlc_graph_dialog.cpp @@ -168,7 +168,7 @@ void LteRlcGraphDialog::completeGraph(bool may_be_empty) // Change label on save/export button. QPushButton *save_bt = ui->buttonBox->button(QDialogButtonBox::Save); - save_bt->setText(tr("Save As" UTF8_HORIZONTAL_ELLIPSIS)); + save_bt->setText(tr("Save As…")); // Don't want to connect again after first time. - causes mouse handlers to get called // multiple times. @@ -856,7 +856,7 @@ void LteRlcGraphDialog::on_buttonBox_accepted() .arg(bmp_filter) .arg(jpeg_filter); - file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), + file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As…")), path.canonicalPath(), filter, &extension); if (file_name.length() > 0) { diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp index 1ab84ac00d..0ecd509d23 100644 --- a/ui/qt/main_status_bar.cpp +++ b/ui/qt/main_status_bar.cpp @@ -543,13 +543,13 @@ void MainStatusBar::showProfileMenu(const QPoint &global_pos, Qt::MouseButton bu profile_menu_.setTitle(tr("Switch to")); QMenu ctx_menu_; - QAction * action = ctx_menu_.addAction(tr("Manage Profiles" UTF8_HORIZONTAL_ELLIPSIS), this, SLOT(manageProfile())); + QAction * action = ctx_menu_.addAction(tr("Manage Profiles…"), this, SLOT(manageProfile())); action->setProperty("dialog_action_", (int)ProfileDialog::ShowProfiles); ctx_menu_.addSeparator(); - action = ctx_menu_.addAction(tr("New" UTF8_HORIZONTAL_ELLIPSIS), this, SLOT(manageProfile())); + action = ctx_menu_.addAction(tr("New…"), this, SLOT(manageProfile())); action->setProperty("dialog_action_", (int)ProfileDialog::NewProfile); - action = ctx_menu_.addAction(tr("Edit" UTF8_HORIZONTAL_ELLIPSIS), this, SLOT(manageProfile())); + action = ctx_menu_.addAction(tr("Edit…"), this, SLOT(manageProfile())); action->setProperty("dialog_action_", (int)ProfileDialog::EditCurrentProfile); action->setEnabled(enable_edit); action = ctx_menu_.addAction(tr("Delete"), this, SLOT(manageProfile())); diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index edbdeb635f..0af5047d2a 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -360,7 +360,7 @@ MainWindow::MainWindow(QWidget *parent) : // The fewer children we have at this point the better. main_ui_->setupUi(this); #ifdef HAVE_SOFTWARE_UPDATE - update_action_ = new QAction(tr("Check for Updates" UTF8_HORIZONTAL_ELLIPSIS), main_ui_->menuHelp); + update_action_ = new QAction(tr("Check for Updates…"), main_ui_->menuHelp); #endif #if defined(HAVE_LIBNL) && defined(HAVE_NL80211) wireless_frame_ = new WirelessFrame(this); diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index a0d3250cf3..db9be1db94 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -682,7 +682,7 @@ void MainWindow::captureEventHandler(CaptureEvent ev) { QFileInfo file_info(ev.filePath()); wsApp->popStatus(WiresharkApplication::FileStatus); - wsApp->pushStatus(WiresharkApplication::FileStatus, tr("Saving %1" UTF8_HORIZONTAL_ELLIPSIS).arg(file_info.fileName())); + wsApp->pushStatus(WiresharkApplication::FileStatus, tr("Saving %1…").arg(file_info.fileName())); break; } default: @@ -1602,7 +1602,7 @@ void MainWindow::setFeaturesEnabled(bool enabled) } else { - main_ui_->statusBar->showMessage(tr("Please wait while Wireshark is initializing" UTF8_HORIZONTAL_ELLIPSIS)); + main_ui_->statusBar->showMessage(tr("Please wait while Wireshark is initializing…")); } } diff --git a/ui/qt/models/packet_list_model.cpp b/ui/qt/models/packet_list_model.cpp index 7e1a6da30a..50d929d569 100644 --- a/ui/qt/models/packet_list_model.cpp +++ b/ui/qt/models/packet_list_model.cpp @@ -357,7 +357,7 @@ void PacketListModel::sort(int column, Qt::SortOrder order) // XXX Use updateProgress instead. We'd have to switch from std::sort to // something we can interrupt. if (!col_title.isEmpty()) { - QString busy_msg = tr("Sorting \"%1\"" UTF8_HORIZONTAL_ELLIPSIS).arg(col_title); + QString busy_msg = tr("Sorting \"%1\"…").arg(col_title); wsApp->pushStatus(WiresharkApplication::BusyStatus, busy_msg); } diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp index df823aad76..dd6cb79c1e 100644 --- a/ui/qt/module_preferences_scroll_area.cpp +++ b/ui/qt/module_preferences_scroll_area.cpp @@ -172,7 +172,7 @@ pref_show(pref_t *pref, gpointer layout_ptr) QLabel *label = new QLabel(prefs_get_title(pref)); label->setToolTip(tooltip); hb->addWidget(label); - QPushButton *uat_pb = new QPushButton(QObject::tr("Edit" UTF8_HORIZONTAL_ELLIPSIS)); + QPushButton *uat_pb = new QPushButton(QObject::tr("Edit…")); uat_pb->setToolTip(tooltip); uat_pb->setProperty(pref_prop_, VariantPointer<pref_t>::asQVariant(pref)); hb->addWidget(uat_pb); @@ -200,7 +200,7 @@ pref_show(pref_t *pref, gpointer layout_ptr) ) .arg(path_le->style()->subElementRect(QStyle::SE_CheckBoxContents, &style_opt).left())); hb->addWidget(path_le); - QPushButton *path_pb = new QPushButton(QObject::tr("Browse" UTF8_HORIZONTAL_ELLIPSIS)); + QPushButton *path_pb = new QPushButton(QObject::tr("Browse…")); path_pb->setProperty(pref_prop_, VariantPointer<pref_t>::asQVariant(pref)); hb->addWidget(path_pb); hb->addSpacerItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum)); diff --git a/ui/qt/packet_diagram.cpp b/ui/qt/packet_diagram.cpp index 2325758a96..71e3d5a802 100644 --- a/ui/qt/packet_diagram.cpp +++ b/ui/qt/packet_diagram.cpp @@ -475,14 +475,14 @@ void PacketDiagram::contextMenuEvent(QContextMenuEvent *event) ctx_menu.addSeparator(); - action = ctx_menu.addAction(tr("Save Diagram As" UTF8_HORIZONTAL_ELLIPSIS)); + action = ctx_menu.addAction(tr("Save Diagram As…")); connect(action, &QAction::triggered, this, &PacketDiagram::saveAsTriggered); action = ctx_menu.addAction(tr("Copy as Raster Image")); connect(action, &QAction::triggered, this, &PacketDiagram::copyAsRasterTriggered); #if defined(QT_SVG_LIB) && !defined(Q_OS_MAC) - action = ctx_menu.addAction(tr(UTF8_HORIZONTAL_ELLIPSIS "as SVG")); + action = ctx_menu.addAction(tr("…as SVG")); connect(action, &QAction::triggered, this, &PacketDiagram::copyAsSvgTriggered); #endif @@ -770,7 +770,7 @@ void PacketDiagram::saveAsTriggered() #endif QString filter = fl.join(";;"); - file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), + file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As…")), path.canonicalPath(), filter, &extension); if (file_name.length() > 0) { diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index 4916010834..d915d09922 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -697,10 +697,10 @@ void PacketList::contextMenuEvent(QContextMenuEvent *event) QAction * action = submenu->addAction(tr("Summary as Text")); action->setData(CopyAsText); connect(action, SIGNAL(triggered()), this, SLOT(copySummary())); - action = submenu->addAction(tr(UTF8_HORIZONTAL_ELLIPSIS "as CSV")); + action = submenu->addAction(tr("…as CSV")); action->setData(CopyAsCSV); connect(action, SIGNAL(triggered()), this, SLOT(copySummary())); - action = submenu->addAction(tr(UTF8_HORIZONTAL_ELLIPSIS "as YAML")); + action = submenu->addAction(tr("…as YAML")); action->setData(CopyAsYAML); connect(action, SIGNAL(triggered()), this, SLOT(copySummary())); submenu->addSeparator(); @@ -715,7 +715,7 @@ void PacketList::contextMenuEvent(QContextMenuEvent *event) ctx_menu->addSeparator(); ctx_menu->addMenu(&proto_prefs_menus_); - action = ctx_menu->addAction(tr("Decode As" UTF8_HORIZONTAL_ELLIPSIS)); + action = ctx_menu->addAction(tr("Decode As…")); action->setProperty("create_new", QVariant(true)); connect(action, &QAction::triggered, this, &PacketList::ctxDecodeAsDialog); // "Print" not ported intentionally diff --git a/ui/qt/preference_editor_frame.cpp b/ui/qt/preference_editor_frame.cpp index a74c993386..5be629822d 100644 --- a/ui/qt/preference_editor_frame.cpp +++ b/ui/qt/preference_editor_frame.cpp @@ -65,7 +65,7 @@ void PreferenceEditorFrame::editPreference(preference *pref, pref_module *module return; } - ui->modulePreferencesToolButton->setText(tr("Open %1 preferences" UTF8_HORIZONTAL_ELLIPSIS).arg(module_->title)); + ui->modulePreferencesToolButton->setText(tr("Open %1 preferences…").arg(module_->title)); pref_stash(pref_, NULL); ui->preferenceTitleLabel->setText(QString("%1:").arg(prefs_get_title(pref))); diff --git a/ui/qt/print_dialog.cpp b/ui/qt/print_dialog.cpp index d443407a93..50c99a3d1d 100644 --- a/ui/qt/print_dialog.cpp +++ b/ui/qt/print_dialog.cpp @@ -69,7 +69,7 @@ PrintDialog::PrintDialog(QWidget *parent, capture_file *cf, QString selRange) : cur_printer_(NULL), cur_painter_(NULL), preview_(new QPrintPreviewWidget(&printer_)), - print_bt_(new QPushButton(tr("&Print" UTF8_HORIZONTAL_ELLIPSIS))), + print_bt_(new QPushButton(tr("&Print…"))), cap_file_(cf), page_pos_(0), in_preview_(FALSE) @@ -113,7 +113,7 @@ PrintDialog::PrintDialog(QWidget *parent, capture_file *cf, QString selRange) : pd_ui_->rangeGroupBox->initRange(&print_args_.range, selRange); pd_ui_->buttonBox->addButton(print_bt_, QDialogButtonBox::ActionRole); - pd_ui_->buttonBox->addButton(tr("Page &Setup" UTF8_HORIZONTAL_ELLIPSIS), QDialogButtonBox::ResetRole); + pd_ui_->buttonBox->addButton(tr("Page &Setup…"), QDialogButtonBox::ResetRole); print_bt_->setDefault(true); connect(preview_, SIGNAL(paintRequested(QPrinter*)), this, SLOT(paintPreview(QPrinter*))); diff --git a/ui/qt/protocol_preferences_menu.cpp b/ui/qt/protocol_preferences_menu.cpp index 58a908b665..9783785f59 100644 --- a/ui/qt/protocol_preferences_menu.cpp +++ b/ui/qt/protocol_preferences_menu.cpp @@ -178,7 +178,7 @@ void ProtocolPreferencesMenu::setModule(const QString module_name) module_name_ = module_name; - action = addAction(tr("Open %1 preferences" UTF8_HORIZONTAL_ELLIPSIS).arg(long_name)); + action = addAction(tr("Open %1 preferences…").arg(long_name)); action->setData(QString(module_name)); connect(action, SIGNAL(triggered(bool)), this, SLOT(modulePreferencesTriggered())); addSeparator(); diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp index 8fcb757fc3..6df756e739 100644 --- a/ui/qt/rtp_analysis_dialog.cpp +++ b/ui/qt/rtp_analysis_dialog.cpp @@ -617,7 +617,7 @@ void RtpAnalysisDialog::on_actionSaveGraph_triggered() if (!file_closed_) { save_file += QString("/%1").arg(cap_file_.fileBaseName()); } - file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), + file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As…")), save_file, filter, &extension); if (!file_name.isEmpty()) { @@ -1459,7 +1459,7 @@ void RtpAnalysisDialog::saveAudio(RtpAnalysisDialog::StreamDirection direction, return; } - ui->hintLabel->setText(tr("Saving %1" UTF8_HORIZONTAL_ELLIPSIS).arg(save_file.fileName())); + ui->hintLabel->setText(tr("Saving %1…").arg(save_file.fileName())); ui->progressFrame->showProgress(tr("Analyzing RTP"), true, true, &stop_flag); clearSAEErrors(); diff --git a/ui/qt/rtp_stream_dialog.cpp b/ui/qt/rtp_stream_dialog.cpp index d56f6eaf7b..39e2020627 100644 --- a/ui/qt/rtp_stream_dialog.cpp +++ b/ui/qt/rtp_stream_dialog.cpp @@ -228,7 +228,7 @@ RtpStreamDialog::RtpStreamDialog(QWidget &parent, CaptureFile &cf) : find_reverse_button_->setToolTip(ui->actionFindReverse->toolTip()); prepare_button_ = ui->buttonBox->addButton(ui->actionPrepareFilter->text(), QDialogButtonBox::ApplyRole); prepare_button_->setToolTip(ui->actionPrepareFilter->toolTip()); - export_button_ = ui->buttonBox->addButton(tr("Export" UTF8_HORIZONTAL_ELLIPSIS), QDialogButtonBox::ApplyRole); + export_button_ = ui->buttonBox->addButton(tr("Export…"), QDialogButtonBox::ApplyRole); export_button_->setToolTip(ui->actionExportAsRtpDump->toolTip()); copy_button_ = ui->buttonBox->addButton(tr("Copy"), QDialogButtonBox::ApplyRole); analyze_button_ = ui->buttonBox->addButton(ui->actionAnalyze->text(), QDialogButtonBox::ApplyRole); @@ -502,7 +502,7 @@ void RtpStreamDialog::on_actionExportAsRtpDump_triggered() QDir path(wsApp->lastOpenDir()); QString save_file = path.canonicalPath() + "/" + cap_file_.fileBaseName(); QString extension; - file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save RTPDump As" UTF8_HORIZONTAL_ELLIPSIS)), + file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save RTPDump As…")), save_file, "RTPDump Format (*.rtpdump)", &extension); if (file_name.length() > 0) { diff --git a/ui/qt/sctp_graph_dialog.cpp b/ui/qt/sctp_graph_dialog.cpp index 8d65aac9e8..f462725901 100644 --- a/ui/qt/sctp_graph_dialog.cpp +++ b/ui/qt/sctp_graph_dialog.cpp @@ -490,7 +490,7 @@ void SCTPGraphDialog::save_graph(QDialog *dlg, QCustomPlot *plot) .arg(bmp_filter) .arg(jpeg_filter); - file_name = WiresharkFileDialog::getSaveFileName(dlg, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), + file_name = WiresharkFileDialog::getSaveFileName(dlg, wsApp->windowTitleString(tr("Save Graph As…")), path.canonicalPath(), filter, &extension); if (file_name.length() > 0) { diff --git a/ui/qt/search_frame.cpp b/ui/qt/search_frame.cpp index feea246b5c..2679f6354e 100644 --- a/ui/qt/search_frame.cpp +++ b/ui/qt/search_frame.cpp @@ -449,7 +449,7 @@ void SearchFrame::on_findButton_clicked() g_free(cap_file_->sfilter); cap_file_->sfilter = g_strdup(sf_ui_->searchLineEdit->text().toUtf8().constData()); wsApp->popStatus(WiresharkApplication::FileStatus); - wsApp->pushStatus(WiresharkApplication::FileStatus, tr("Searching for %1" UTF8_HORIZONTAL_ELLIPSIS).arg(sf_ui_->searchLineEdit->text())); + wsApp->pushStatus(WiresharkApplication::FileStatus, tr("Searching for %1…").arg(sf_ui_->searchLineEdit->text())); if (cap_file_->hex) { /* Hex value in packet data */ diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp index d727c0652e..6ef14d3427 100644 --- a/ui/qt/sequence_dialog.cpp +++ b/ui/qt/sequence_dialog.cpp @@ -168,7 +168,7 @@ SequenceDialog::SequenceDialog(QWidget &parent, CaptureFile &cf, SequenceInfo *i } QPushButton *save_bt = ui->buttonBox->button(QDialogButtonBox::Save); - save_bt->setText(tr("Save As" UTF8_HORIZONTAL_ELLIPSIS)); + save_bt->setText(tr("Save As…")); QPushButton *close_bt = ui->buttonBox->button(QDialogButtonBox::Close); if (close_bt) { @@ -382,7 +382,7 @@ void SequenceDialog::on_buttonBox_accepted() filter.append(QString(";;%5").arg(ascii_filter)); } - file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), + file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As…")), path.canonicalPath(), filter, &extension); if (file_name.length() > 0) { diff --git a/ui/qt/show_packet_bytes_dialog.cpp b/ui/qt/show_packet_bytes_dialog.cpp index 1ccb962728..fc1b5249a7 100644 --- a/ui/qt/show_packet_bytes_dialog.cpp +++ b/ui/qt/show_packet_bytes_dialog.cpp @@ -87,7 +87,7 @@ ShowPacketBytesDialog::ShowPacketBytesDialog(QWidget &parent, CaptureFile &cf) : copy_button_ = ui->buttonBox->addButton(tr("Copy"), QDialogButtonBox::ActionRole); connect(copy_button_, SIGNAL(clicked()), this, SLOT(copyBytes())); - save_as_button_ = ui->buttonBox->addButton(tr("Save as" UTF8_HORIZONTAL_ELLIPSIS), QDialogButtonBox::ActionRole); + save_as_button_ = ui->buttonBox->addButton(tr("Save as…"), QDialogButtonBox::ActionRole); connect(save_as_button_, SIGNAL(clicked()), this, SLOT(saveAs())); connect(ui->buttonBox, SIGNAL(helpRequested()), this, SLOT(helpButton())); @@ -304,7 +304,7 @@ void ShowPacketBytesDialog::copyBytes() void ShowPacketBytesDialog::saveAs() { - QString file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Selected Packet Bytes As" UTF8_HORIZONTAL_ELLIPSIS))); + QString file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Selected Packet Bytes As…"))); if (file_name.isEmpty()) return; diff --git a/ui/qt/tap_parameter_dialog.cpp b/ui/qt/tap_parameter_dialog.cpp index 03c4ed1439..701af18fcf 100644 --- a/ui/qt/tap_parameter_dialog.cpp +++ b/ui/qt/tap_parameter_dialog.cpp @@ -81,7 +81,7 @@ TapParameterDialog::TapParameterDialog(QWidget &parent, CaptureFile &cf, int hel button = ui->buttonBox->addButton(tr("Copy"), QDialogButtonBox::ActionRole); connect(button, SIGNAL(clicked()), this, SLOT(on_actionCopyToClipboard_triggered())); - button = ui->buttonBox->addButton(tr("Save as" UTF8_HORIZONTAL_ELLIPSIS), QDialogButtonBox::ActionRole); + button = ui->buttonBox->addButton(tr("Save as…"), QDialogButtonBox::ActionRole); connect(button, SIGNAL(clicked()), this, SLOT(on_actionSaveAs_triggered())); connect(ui->displayFilterLineEdit, SIGNAL(textChanged(QString)), @@ -528,7 +528,7 @@ void TapParameterDialog::on_actionSaveAs_triggered() #ifdef Q_OS_WIN HANDLE da_ctx = set_thread_per_monitor_v2_awareness(); #endif - QFileDialog SaveAsDialog(this, wsApp->windowTitleString(tr("Save Statistics As" UTF8_HORIZONTAL_ELLIPSIS)), + QFileDialog SaveAsDialog(this, wsApp->windowTitleString(tr("Save Statistics As…")), get_last_open_dir()); SaveAsDialog.setNameFilter(tr("Plain text file (*.txt);;" "Comma separated values (*.csv);;" diff --git a/ui/qt/tcp_stream_dialog.cpp b/ui/qt/tcp_stream_dialog.cpp index a19e3cd434..3a3b5c833b 100644 --- a/ui/qt/tcp_stream_dialog.cpp +++ b/ui/qt/tcp_stream_dialog.cpp @@ -336,7 +336,7 @@ TCPStreamDialog::TCPStreamDialog(QWidget *parent, capture_file *cf, tcp_graph_ty toggleTracerStyle(true); QPushButton *save_bt = ui->buttonBox->button(QDialogButtonBox::Save); - save_bt->setText(tr("Save As" UTF8_HORIZONTAL_ELLIPSIS)); + save_bt->setText(tr("Save As…")); QPushButton *close_bt = ui->buttonBox->button(QDialogButtonBox::Close); if (close_bt) { @@ -1839,7 +1839,7 @@ void TCPStreamDialog::on_buttonBox_accepted() .arg(bmp_filter) .arg(jpeg_filter); - file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), + file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As…")), path.canonicalPath(), filter, &extension); if (file_name.length() > 0) { diff --git a/ui/qt/utils/data_printer.cpp b/ui/qt/utils/data_printer.cpp index 39baab29a5..ebac8737e3 100644 --- a/ui/qt/utils/data_printer.cpp +++ b/ui/qt/utils/data_printer.cpp @@ -197,27 +197,27 @@ QActionGroup * DataPrinter::copyActions(QObject * copyClass, QObject * data) action->setProperty("printertype", DataPrinter::DP_HexDump); connect(action, &QAction::triggered, dpi, &DataPrinter::copyIDataBytes); - action = new QAction(tr(UTF8_HORIZONTAL_ELLIPSIS "as Hex Dump"), actions); + action = new QAction(tr("…as Hex Dump"), actions); action->setToolTip(tr("Copy packet bytes as a hex dump.")); action->setProperty("printertype", DataPrinter::DP_HexOnly); connect(action, &QAction::triggered, dpi, &DataPrinter::copyIDataBytes); - action = new QAction(tr(UTF8_HORIZONTAL_ELLIPSIS "as Printable Text"), actions); + action = new QAction(tr("…as Printable Text"), actions); action->setToolTip(tr("Copy only the printable text in the packet.")); action->setProperty("printertype", DataPrinter::DP_PrintableText); connect(action, &QAction::triggered, dpi, &DataPrinter::copyIDataBytes); - action = new QAction(tr(UTF8_HORIZONTAL_ELLIPSIS "as a Hex Stream"), actions); + action = new QAction(tr("…as a Hex Stream"), actions); action->setToolTip(tr("Copy packet bytes as a stream of hex.")); action->setProperty("printertype", DataPrinter::DP_HexStream); connect(action, &QAction::triggered, dpi, &DataPrinter::copyIDataBytes); - action = new QAction(tr(UTF8_HORIZONTAL_ELLIPSIS "as Raw Binary"), actions); + action = new QAction(tr("…as Raw Binary"), actions); action->setToolTip(tr("Copy packet bytes as application/octet-stream MIME data.")); action->setProperty("printertype", DataPrinter::DP_Binary); connect(action, &QAction::triggered, dpi, &DataPrinter::copyIDataBytes); - action = new QAction(tr(UTF8_HORIZONTAL_ELLIPSIS "as Escaped String"), actions); + action = new QAction(tr("…as Escaped String"), actions); action->setToolTip(tr("Copy packet bytes as an escaped string.")); action->setProperty("printertype", DataPrinter::DP_EscapedString); connect(action, &QAction::triggered, dpi, &DataPrinter::copyIDataBytes); diff --git a/ui/qt/widgets/byte_view_text.cpp b/ui/qt/widgets/byte_view_text.cpp index 5d7f4736b5..691544d357 100644 --- a/ui/qt/widgets/byte_view_text.cpp +++ b/ui/qt/widgets/byte_view_text.cpp @@ -88,7 +88,7 @@ void ByteViewText::createContextMenu() action_bytes_hex_->setData(QVariant::fromValue(BYTES_HEX)); action_bytes_hex_->setCheckable(true); - action_bytes_bits_ = format_actions->addAction(tr(UTF8_HORIZONTAL_ELLIPSIS "as bits")); + action_bytes_bits_ = format_actions->addAction(tr("…as bits")); action_bytes_bits_->setData(QVariant::fromValue(BYTES_BITS)); action_bytes_bits_->setCheckable(true); @@ -102,11 +102,11 @@ void ByteViewText::createContextMenu() action_bytes_enc_from_packet_->setData(QVariant::fromValue(BYTES_ENC_FROM_PACKET)); action_bytes_enc_from_packet_->setCheckable(true); - action_bytes_enc_ascii_ = encoding_actions->addAction(tr(UTF8_HORIZONTAL_ELLIPSIS "as ASCII")); + action_bytes_enc_ascii_ = encoding_actions->addAction(tr("…as ASCII")); action_bytes_enc_ascii_->setData(QVariant::fromValue(BYTES_ENC_ASCII)); action_bytes_enc_ascii_->setCheckable(true); - action_bytes_enc_ebcdic_ = encoding_actions->addAction(tr(UTF8_HORIZONTAL_ELLIPSIS "as EBCDIC")); + action_bytes_enc_ebcdic_ = encoding_actions->addAction(tr("…as EBCDIC")); action_bytes_enc_ebcdic_->setData(QVariant::fromValue(BYTES_ENC_EBCDIC)); action_bytes_enc_ebcdic_->setCheckable(true); diff --git a/ui/qt/widgets/display_filter_edit.cpp b/ui/qt/widgets/display_filter_edit.cpp index ddce654f30..547c65166f 100644 --- a/ui/qt/widgets/display_filter_edit.cpp +++ b/ui/qt/widgets/display_filter_edit.cpp @@ -152,7 +152,7 @@ void DisplayFilterEdit::contextMenuEvent(QContextMenuEvent *event) { menu->addSeparator(); menu->addAction(na); - na = new QAction(tr("Display Filter Expression" UTF8_HORIZONTAL_ELLIPSIS), this); + na = new QAction(tr("Display Filter Expression…"), this); connect(na, &QAction::triggered, this, &DisplayFilterEdit::displayFilterExpression); menu->insertAction(first, na); diff --git a/ui/qt/widgets/packet_list_header.cpp b/ui/qt/widgets/packet_list_header.cpp index 251fc4e44c..4c6dc4d4e3 100644 --- a/ui/qt/widgets/packet_list_header.cpp +++ b/ui/qt/widgets/packet_list_header.cpp @@ -186,13 +186,13 @@ void PacketListHeader::contextMenuEvent(QContextMenuEvent *event) contextMenu->addActions(alignmentActions->actions()); contextMenu->addSeparator(); - action = contextMenu->addAction(tr("Column Preferences" UTF8_HORIZONTAL_ELLIPSIS)); + action = contextMenu->addAction(tr("Column Preferences…")); connect(action, &QAction::triggered, this, &PacketListHeader::showColumnPrefs); action = contextMenu->addAction(tr("Edit Column")); connect(action, &QAction::triggered, this, &PacketListHeader::doEditColumn); action = contextMenu->addAction(tr("Resize to Contents")); connect(action, &QAction::triggered, this, &PacketListHeader::resizeToContent); - action = contextMenu->addAction(tr("Resize Column to Width" UTF8_HORIZONTAL_ELLIPSIS)); + action = contextMenu->addAction(tr("Resize Column to Width…")); connect(action, &QAction::triggered, this, &PacketListHeader::resizeToWidth); action = contextMenu->addAction(tr("Resolve Names")); |