summaryrefslogtreecommitdiff
path: root/ui/qt/wireshark_en.ts
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-05-14 08:14:03 +0000
committerGerald Combs <gerald@wireshark.org>2017-05-14 08:14:09 +0000
commitd8df8415af519e35036b686e670cfd9bdb6f0681 (patch)
tree3619213e053c913a765282186e0fdf6540202f1d /ui/qt/wireshark_en.ts
parent21735ead4f907b1323b5fd72ea698372774e0ee5 (diff)
downloadwireshark-d8df8415af519e35036b686e670cfd9bdb6f0681.tar.gz
[Automatic update for 2017-05-14]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ia7833dc62cb4f4687da664b66eba6c5f31437f9a Reviewed-on: https://code.wireshark.org/review/21630 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/wireshark_en.ts')
-rw-r--r--ui/qt/wireshark_en.ts12
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts
index e4993e9e87..e4c4e4ebd5 100644
--- a/ui/qt/wireshark_en.ts
+++ b/ui/qt/wireshark_en.ts
@@ -1934,12 +1934,12 @@ PLEASE NOTE: One option MUST be selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="compiled_filter_output.cpp" line="48"/>
+ <location filename="compiled_filter_output.cpp" line="51"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="compiled_filter_output.cpp" line="49"/>
+ <location filename="compiled_filter_output.cpp" line="52"/>
<source>Copy filter text to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
@@ -15594,22 +15594,22 @@ a:hover {
<context>
<name>WiresharkApplication</name>
<message>
- <location filename="wireshark_application.cpp" line="576"/>
+ <location filename="wireshark_application.cpp" line="584"/>
<source>Dell Backup and Recovery Found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="wireshark_application.cpp" line="577"/>
+ <location filename="wireshark_application.cpp" line="585"/>
<source>You appear to be running Dell Backup and Recovery 1.8.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="wireshark_application.cpp" line="578"/>
+ <location filename="wireshark_application.cpp" line="586"/>
<source>DBAR can make many applications crash &lt;a href=&quot;https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036&quot;&gt;including Wireshark&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="wireshark_application.cpp" line="582"/>
+ <location filename="wireshark_application.cpp" line="590"/>
<source>Offending DLL: %1</source>
<translation type="unfinished"></translation>
</message>