Qt → wireshark. GTK+ → wireshark-gtk.

Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".

It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.

Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).

Tested:

- Nmake builds

- NSIS packaging

- CMake builds (Windows, OS X)

- Autotools build and distcheck

- RPM packaging

To do:

- Test Debian packaging

- Fix PortableApps

Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/ui/qt/i18n.qrc b/ui/qt/i18n.qrc
index 51aadfc5e4..ac7872ea9c 100644
--- a/ui/qt/i18n.qrc
+++ b/ui/qt/i18n.qrc
@@ -2,28 +2,28 @@
   Wireshark - Network traffic analyzer
   By Gerald Combs <gerald@wireshark.org>
   Copyright 1998 Gerald Combs
- 
+
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
   as published by the Free Software Foundation; either version 2
   of the License, or (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 -->
 <RCC>
     <qresource prefix="/i18n">
-        <file>qtshark_de.qm</file>
-        <file>qtshark_en.qm</file>
-        <file>qtshark_fr.qm</file>
-        <file>qtshark_ja_JP.qm</file>
-        <file>qtshark_pl.qm</file>
-        <file>qtshark_zh_CN.qm</file>
+        <file>wireshark_de.qm</file>
+        <file>wireshark_en.qm</file>
+        <file>wireshark_fr.qm</file>
+        <file>wireshark_ja_JP.qm</file>
+        <file>wireshark_pl.qm</file>
+        <file>wireshark_zh_CN.qm</file>
     </qresource>
 </RCC>