diff options
| -rw-r--r-- | docbook/wsug_src/WSUG_chapter_customize.adoc | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-ieee1905.c | 2 | ||||
| -rw-r--r-- | extcap.c | 2 | ||||
| -rw-r--r-- | ui/qt/bluetooth_att_server_attributes_dialog.ui | 2 | ||||
| -rw-r--r-- | ui/qt/bluetooth_device_dialog.ui | 4 | ||||
| -rw-r--r-- | ui/qt/bluetooth_devices_dialog.ui | 2 | ||||
| -rw-r--r-- | ui/qt/import_text_dialog.ui | 4 | ||||
| -rw-r--r-- | ui/qt/main_window.ui | 2 | ||||
| -rw-r--r-- | ui/qt/profile_dialog.ui | 2 | ||||
| -rw-r--r-- | ui/qt/proto_tree.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/widgets/additional_toolbar.cpp | 2 |
11 files changed, 15 insertions, 16 deletions
diff --git a/docbook/wsug_src/WSUG_chapter_customize.adoc b/docbook/wsug_src/WSUG_chapter_customize.adoc index 6a99368bf9..612b465279 100644 --- a/docbook/wsug_src/WSUG_chapter_customize.adoc +++ b/docbook/wsug_src/WSUG_chapter_customize.adoc @@ -772,10 +772,9 @@ and is highlighted so that you can more easily change it. Delete (-):: Deletes the selected profile. This includes all configuration files used -in this profile. It is not possible to delete the “Default” profile or global -profiles. Multiple profiles can be selected and deleted at the same time, if global -profiles are selected they will be skipped, a selected "Default" profile will be -resetted. +in this profile. Multiple profiles can be selected and deleted at the same time. +It is not possible to delete the “Default” profile or global profiles. +Deletion of the "Default" profile will reset this profile. Copy:: Copies the selected profile. This copies the configuration of the diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c index 39493812c4..c027c239c1 100644 --- a/epan/dissectors/packet-ieee1905.c +++ b/epan/dissectors/packet-ieee1905.c @@ -4673,7 +4673,7 @@ proto_register_ieee1905(void) FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ieee1905_mac_throughput_capacity, - { "MAC througput capacity", "ieee1905.macThroughputCapacity", + { "MAC throughput capacity", "ieee1905.macThroughputCapacity", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ieee1905_link_availability, @@ -53,7 +53,7 @@ static void extcap_child_watch_cb(GPid pid, gint status, gpointer user_data); /* internal container, for all the extcap executables that have been found. - * Will be resetted if extcap_clear_interfaces() is being explicitly called + * Will be reset if extcap_clear_interfaces() is being explicitly called * and is being used for printing information about all extcap interfaces found, * as well as storing all sub-interfaces */ diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.ui b/ui/qt/bluetooth_att_server_attributes_dialog.ui index ea48e3f125..ba67973f5e 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.ui +++ b/ui/qt/bluetooth_att_server_attributes_dialog.ui @@ -203,7 +203,7 @@ <string>Mark/Unmark Row</string> </property> <property name="shortcut"> - <string>CtrlM</string> + <string>Ctrl-M</string> </property> </action> <action name="actionMark_Unmark_Cell"> diff --git a/ui/qt/bluetooth_device_dialog.ui b/ui/qt/bluetooth_device_dialog.ui index 91411c5dd5..b5b06048e8 100644 --- a/ui/qt/bluetooth_device_dialog.ui +++ b/ui/qt/bluetooth_device_dialog.ui @@ -100,7 +100,7 @@ </row> <row> <property name="text"> - <string>LMP Subverion</string> + <string>LMP Subversion</string> </property> </row> <row> @@ -246,7 +246,7 @@ <string>Mark/Unmark Row</string> </property> <property name="shortcut"> - <string>CtrlM</string> + <string>Ctrl-M</string> </property> </action> <action name="actionMark_Unmark_Cell"> diff --git a/ui/qt/bluetooth_devices_dialog.ui b/ui/qt/bluetooth_devices_dialog.ui index 5a5ab534fd..a4cfd91be8 100644 --- a/ui/qt/bluetooth_devices_dialog.ui +++ b/ui/qt/bluetooth_devices_dialog.ui @@ -186,7 +186,7 @@ <string>Mark/Unmark Row</string> </property> <property name="shortcut"> - <string>CtrlM</string> + <string>Ctrl-M</string> </property> </action> <action name="actionMark_Unmark_Cell"> diff --git a/ui/qt/import_text_dialog.ui b/ui/qt/import_text_dialog.ui index 344140c379..dbe06f521b 100644 --- a/ui/qt/import_text_dialog.ui +++ b/ui/qt/import_text_dialog.ui @@ -159,7 +159,7 @@ <item> <widget class="QLabel" name="label_3"> <property name="toolTip"> - <string>The format in which to parse timestamps in the text file (eg. %H:%M:%S.). Format specifiers are based on strptime(3)</string> + <string>The format in which to parse timestamps in the text file (e.g. %H:%M:%S.). Format specifiers are based on strptime(3)</string> </property> <property name="text"> <string>Timestamp format:</string> @@ -169,7 +169,7 @@ <item> <widget class="QLineEdit" name="dateTimeLineEdit"> <property name="toolTip"> - <string>The format in which to parse timestamps in the text file (eg. %H:%M:%S.). Format specifiers are based on strptime(3)</string> + <string>The format in which to parse timestamps in the text file (e.g. %H:%M:%S.). Format specifiers are based on strptime(3)</string> </property> </widget> </item> diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 315b777f3b..1f03a535dc 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -1648,7 +1648,7 @@ <string>Throughput</string> </property> <property name="toolTip"> - <string>TCP througput</string> + <string>TCP throughput</string> </property> </action> <action name="actionStatisticsTcpStreamRoundTripTime"> diff --git a/ui/qt/profile_dialog.ui b/ui/qt/profile_dialog.ui index d0e545b8d8..fcc7591f7d 100644 --- a/ui/qt/profile_dialog.ui +++ b/ui/qt/profile_dialog.ui @@ -72,7 +72,7 @@ <item> <widget class="StockIconToolButton" name="deleteToolButton"> <property name="toolTip"> - <string><html><head/><body><p>Remove this profile. System provided profiles cannot be removed. The default profile will be resetted upon deletion.</p></body></html></string> + <string><html><head/><body><p>Remove this profile. System provided profiles cannot be removed. The default profile will be reset upon deletion.</p></body></html></string> </property> <property name="icon"> <iconset> diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp index 28f3f0e3aa..d23c0879aa 100644 --- a/ui/qt/proto_tree.cpp +++ b/ui/qt/proto_tree.cpp @@ -292,7 +292,7 @@ void ProtoTree::contextMenuEvent(QContextMenuEvent *event) submenu->addAction(tr("All Visible Items"), this, SLOT(ctxCopyVisibleItems())); action = submenu->addAction(tr("All Visible Selected Tree Items"), this, SLOT(ctxCopyVisibleItems())); action->setProperty("selected_tree", qVariantFromValue(true)); - action = submenu->addAction(tr("Desription"), this, SLOT(ctxCopySelectedInfo())); + action = submenu->addAction(tr("Description"), this, SLOT(ctxCopySelectedInfo())); action->setProperty("field_type", ProtoTree::Description); action = submenu->addAction(tr("Field Name"), this, SLOT(ctxCopySelectedInfo())); action->setProperty("field_type", ProtoTree::Name); diff --git a/ui/qt/widgets/additional_toolbar.cpp b/ui/qt/widgets/additional_toolbar.cpp index b0565d2f42..3afe079a13 100644 --- a/ui/qt/widgets/additional_toolbar.cpp +++ b/ui/qt/widgets/additional_toolbar.cpp @@ -64,7 +64,7 @@ AdditionalToolBar * AdditionalToolBar::create(QWidget * parent, ext_toolbar_t * if ( newAction ) { result->addAction(newAction); - /* Necessary, because enable state is resetted upon adding the action */ + /* Necessary, because enable state is reset upon adding the action */ result->actions()[result->actions().count() - 1]->setEnabled(!item->capture_only); } } |