diff options
| -rw-r--r-- | ui/gtk/file_import_dlg.c | 4 | ||||
| -rw-r--r-- | ui/gtk/main_menubar.c | 4 | ||||
| -rw-r--r-- | ui/qt/import_text_dialog.ui | 2 | ||||
| -rw-r--r-- | ui/qt/main_window.h | 2 | ||||
| -rw-r--r-- | ui/qt/main_window.ui | 6 | ||||
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/qtshark_de.ts | 2 | ||||
| -rw-r--r-- | ui/qt/qtshark_fr.ts | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c index 2470c8f10c..fd80e67acd 100644 --- a/ui/gtk/file_import_dlg.c +++ b/ui/gtk/file_import_dlg.c @@ -105,7 +105,7 @@ file_import_dlg_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_) static void browse_file_cb(GtkWidget *browse_bt, GtkWidget *filename_te) { - file_selection_browse(browse_bt, filename_te, "Wireshark: Import from Text", + file_selection_browse(browse_bt, filename_te, "Wireshark: Import from Hex Dump", FILE_SELECTION_READ_BROWSE); } @@ -854,7 +854,7 @@ file_import_dlg_new(void) /* Setup the dialog */ - main_w = dlg_window_new("Wireshark: Import from Text"); + main_w = dlg_window_new("Wireshark: Import from Hex Dump"); gtk_window_set_default_size(GTK_WINDOW(main_w), 400, 300); main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE); diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 1ed4d864e4..c2718197ce 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -950,7 +950,7 @@ static const char *ui_desc_menubar = " <placeholder name='RecentFiles'/>\n" " </menu>\n" " <menuitem name='Merge' action='/File/Merge'/>\n" -" <menuitem name='Import' action='/File/Import'/>\n" +" <menuitem name='ImportFromHexDump' action='/File/ImportFromHexDump'/>\n" " <menuitem name='Close' action='/File/Close'/>\n" " <separator/>\n" " <menuitem name='Save' action='/File/Save'/>\n" @@ -1423,7 +1423,7 @@ static const GtkActionEntry main_menu_bar_entries[] = { { "/File/Open", GTK_STOCK_OPEN, "_Open...", "<control>O", "Open a file", G_CALLBACK(file_open_cmd_cb) }, { "/File/OpenRecent", NULL, "Open _Recent", NULL, NULL, NULL }, { "/File/Merge", NULL, "_Merge...", NULL, NULL, G_CALLBACK(file_merge_cmd_cb) }, - { "/File/Import", NULL, "_Import...", NULL, NULL, G_CALLBACK(file_import_cmd_cb) }, + { "/File/ImportFromHexDump", NULL, "_Import from Hex Dump...", NULL, NULL, G_CALLBACK(file_import_cmd_cb) }, { "/File/Close", GTK_STOCK_CLOSE, "_Close", "<control>W", NULL, G_CALLBACK(file_close_cmd_cb) }, { "/File/Save", WIRESHARK_STOCK_SAVE, "_Save", "<control>S", NULL, G_CALLBACK(file_save_cmd_cb) }, diff --git a/ui/qt/import_text_dialog.ui b/ui/qt/import_text_dialog.ui index 823b522600..dd46b03acc 100644 --- a/ui/qt/import_text_dialog.ui +++ b/ui/qt/import_text_dialog.ui @@ -23,7 +23,7 @@ </size> </property> <property name="windowTitle"> - <string>Wireshark: Import from Text</string> + <string>Wireshark: Import from Hex Dump</string> </property> <property name="sizeGripEnabled"> <bool>true</bool> diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index e230eb88c5..2ee55568cb 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -184,7 +184,7 @@ private slots: // gtk/main_menubar.c void on_actionFileOpen_triggered(); void on_actionFileMerge_triggered(); - void on_actionFileImport_triggered(); + void on_actionFileImportFromHexDump_triggered(); void on_actionFileClose_triggered(); void on_actionFileSave_triggered(); void on_actionFileSaveAs_triggered(); diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 2e5e7d9091..f3b2e012c1 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -136,7 +136,7 @@ <addaction name="actionFileOpen"/> <addaction name="menuOpenRecentCaptureFile"/> <addaction name="actionFileMerge"/> - <addaction name="actionFileImport"/> + <addaction name="actionFileImportFromHexDump"/> <addaction name="actionFileClose"/> <addaction name="separator"/> <addaction name="actionFileSave"/> @@ -651,9 +651,9 @@ <string>Merge one or more files</string> </property> </action> - <action name="actionFileImport"> + <action name="actionFileImportFromHexDump"> <property name="text"> - <string>&Import...</string> + <string>&Import from Hex Dump...</string> </property> <property name="toolTip"> <string>Import a file</string> diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index c61e2a1483..2645b01eed 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1020,7 +1020,7 @@ void MainWindow::on_actionFileMerge_triggered() mergeCaptureFile(); } -void MainWindow::on_actionFileImport_triggered() +void MainWindow::on_actionFileImportFromHexDump_triggered() { importCaptureFile(); } diff --git a/ui/qt/qtshark_de.ts b/ui/qt/qtshark_de.ts index b7ae95336b..6fb10b0a44 100644 --- a/ui/qt/qtshark_de.ts +++ b/ui/qt/qtshark_de.ts @@ -325,7 +325,7 @@ <context> <name>ImportTextDialog</name> <message> - <source>Wireshark: Import from Text</source> + <source>Wireshark: Import from Hex Dump</source> <translation type="unfinished"></translation> </message> <message> diff --git a/ui/qt/qtshark_fr.ts b/ui/qt/qtshark_fr.ts index cc54473790..01a2248f20 100644 --- a/ui/qt/qtshark_fr.ts +++ b/ui/qt/qtshark_fr.ts @@ -410,7 +410,7 @@ <name>ImportTextDialog</name> <message> <location filename="import_text_dialog.ui" line="26"/> - <source>Wireshark: Import from Text</source> + <source>Wireshark: Import from Hex Dump</source> <translation>Wireshark: Import depuis du texte</translation> </message> <message> |