Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 39 insertions, 16 deletions

diff --git a/ui/qt/wireshark_main_window.ui b/ui/qt/wireshark_main_window.ui
index cb01e642..5ff9f8e5 100644
--- a/ui/qt/wireshark_main_window.ui
+++ b/ui/qt/wireshark_main_window.ui
@@ -471,6 +471,13 @@
      <addaction name="actionStatisticsBACappObjectId"/>
      <addaction name="actionStatisticsBACappService"/>
     </widget>
+    <widget class="QMenu" name="menuDNS">
+     <property name="title">
+      <string>DNS</string>
+     </property>
+     <addaction name="actionStatisticsDNS"/>
+     <addaction name="actionStatisticsDNS_QR"/>
+    </widget>
     <widget class="QMenu" name="menuHTTP">
      <property name="title">
       <string>HTTP</string>
@@ -554,7 +561,7 @@
     <addaction name="actionStatisticsANCP"/>
     <addaction name="menuBACnet"/>
     <addaction name="actionStatisticsCollectd"/>
-    <addaction name="actionStatisticsDNS"/>
+    <addaction name="menuDNS"/>
     <addaction name="actionStatisticsFlowGraph"/>
     <addaction name="actionStatisticsHART_IP"/>
     <addaction name="actionStatisticsHpfeeds"/>
@@ -608,7 +615,7 @@
     </widget>
     <widget class="QMenu" name="menuLTE">
      <property name="title">
-      <string>&amp;LTE</string>
+      <string>&amp;3GPP Uu</string>
      </property>
      <addaction name="actionTelephonyLTEPlaceholder"/>
     </widget>
@@ -639,6 +646,7 @@
     <addaction name="actionTelephonyUCPMessages"/>
     <addaction name="actionTelephonyF1APMessages"/>
     <addaction name="actionTelephonyNGAPMessages"/>
+    <addaction name="actionTelephonyE2APMessages"/>
    </widget>
    <widget class="QMenu" name="menuEdit">
     <property name="title">
@@ -670,13 +678,13 @@
     <addaction name="actionEditFindNext"/>
     <addaction name="actionEditFindPrevious"/>
     <addaction name="separator"/>
-    <addaction name="actionEditMarkPacket"/>
+    <addaction name="actionEditMarkSelected"/>
     <addaction name="actionEditMarkAllDisplayed"/>
     <addaction name="actionEditUnmarkAllDisplayed"/>
     <addaction name="actionEditNextMark"/>
     <addaction name="actionEditPreviousMark"/>
     <addaction name="separator"/>
-    <addaction name="actionEditIgnorePacket"/>
+    <addaction name="actionEditIgnoreSelected"/>
     <addaction name="actionEditIgnoreAllDisplayed"/>
     <addaction name="actionEditUnignoreAllDisplayed"/>
     <addaction name="separator"/>
@@ -779,6 +787,7 @@
    <addaction name="actionViewZoomOut"/>
    <addaction name="actionViewNormalSize"/>
    <addaction name="actionViewResizeColumns"/>
+   <addaction name="actionViewResetLayout"/>
   </widget>
   <widget class="MainStatusBar" name="statusBar"/>
   <widget class="QToolBar" name="displayFilterToolBar">
@@ -893,17 +902,15 @@
   </action>
   <action name="actionHelpContents">
    <property name="text">
-    <string>&amp;Contents</string>
+    <string>&amp;User's Guide</string>
    </property>
+   <!-- This tooltip is replaced with the URL -->
    <property name="toolTip">
-    <string>Help contents</string>
+    <string>Wireshark User's Guide</string>
    </property>
    <property name="shortcut">
     <string notr="true">F1</string>
    </property>
-   <property name="iconVisibleInMenu">
-    <bool>true</bool>
-   </property>
   </action>
   <action name="actionHelpMPWireshark">
    <property name="text">
@@ -912,7 +919,7 @@
   </action>
   <action name="actionHelpMPWireshark_Filter">
    <property name="text">
-    <string>Wireshark Filter</string>
+    <string>Display Filters</string>
    </property>
   </action>
   <action name="actionHelpMPTShark">
@@ -1463,9 +1470,9 @@
     <string notr="true">Ctrl+B</string>
    </property>
   </action>
-  <action name="actionEditMarkPacket">
+  <action name="actionEditMarkSelected">
    <property name="text">
-    <string>&amp;Mark/Unmark Packet(s)</string>
+    <string>&amp;Mark/Unmark Selected</string>
    </property>
    <property name="toolTip">
     <string>Mark or unmark each selected packet</string>
@@ -1518,9 +1525,9 @@
     <string notr="true">Ctrl+Shift+B</string>
    </property>
   </action>
-  <action name="actionEditIgnorePacket">
+  <action name="actionEditIgnoreSelected">
    <property name="text">
-    <string>&amp;Ignore/Unignore Packet(s)</string>
+    <string>&amp;Ignore/Unignore Selected</string>
    </property>
    <property name="toolTip">
     <string>Ignore or unignore each selected packet</string>
@@ -1812,12 +1819,20 @@
   </action>
   <action name="actionStatisticsDNS">
    <property name="text">
-    <string>DNS</string>
+    <string>General</string>
    </property>
    <property name="toolTip">
     <string>DNS statistics</string>
    </property>
   </action>
+  <action name="actionStatisticsDNS_QR">
+   <property name="text">
+    <string>Query-Response</string>
+   </property>
+   <property name="toolTip">
+    <string>DNS Query-Response Statistics</string>
+   </property>
+  </action>
   <action name="actionStatisticsHART_IP">
    <property name="text">
     <string>HART-IP</string>
@@ -1970,6 +1985,14 @@
     <string>NGAP Messages</string>
    </property>
   </action>
+  <action name="actionTelephonyE2APMessages">
+   <property name="text">
+    <string>E2AP</string>
+   </property>
+   <property name="toolTip">
+    <string>E2AP Messages</string>
+   </property>
+  </action>
   <action name="actionAnalyzeDecodeAs">
    <property name="text">
     <string>Decode &amp;As…</string>
@@ -2181,7 +2204,7 @@
     <string>Reset Layout</string>
    </property>
    <property name="toolTip">
-    <string>Reset appearance layout to default size</string>
+    <string>Reset layout to default size</string>
    </property>
    <property name="shortcut">
     <string notr="true">Ctrl+Shift+W</string>