Windows packaging and release note updates.

For now, use "Wireshark" and "Wireshark 2 Preview" instead of
"Wireshark (GTK+)" and "Wireshark (Qt)" respectively to match the 1.12
installer. Shorten the descriptions of the command line tools. Warn
against (but don't prohibit) installing on XP.

Change-Id: Ica37ffa5b04eb48cadf41842b6fb9b1431c69803
Reviewed-on: https://code.wireshark.org/review/1988
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 25bb29a1d65896959bc3f73bcf20b400fe0d32dd)
Reviewed-on: https://code.wireshark.org/review/1989

3 files changed, 44 insertions, 38 deletions

diff --git a/packaging/nsis/AdditionalTasksPage.ini b/packaging/nsis/AdditionalTasksPage.ini
index ea0c4e8aa1..b36f9e9aa7 100644
--- a/packaging/nsis/AdditionalTasksPage.ini
+++ b/packaging/nsis/AdditionalTasksPage.ini
@@ -16,7 +16,7 @@ Left=10
 Right=-1
 Top=10
 Bottom=18
-Text=Start Menu Item (Wireshark GTK+)
+Text=Start Menu Item
 State=1
 
 [Field 3]
@@ -25,7 +25,7 @@ Left=10
 Right=-1
 Top=20
 Bottom=28
-Text=Desktop Icon (Wireshark GTK+)
+Text=Desktop Icon
 State=0
 
 [Field 4]
@@ -34,7 +34,7 @@ Left=10
 Right=-1
 Top=30
 Bottom=38
-Text=Quick Launch Icon (Wireshark GTK+)
+Text=Quick Launch Icon
 State=1
 
 [Field 5]
@@ -43,7 +43,7 @@ Left=10
 Right=-1
 Top=40
 Bottom=48
-Text=Start Menu Item (Wireshark Qt)
+Text=Wireshark 2 Preview Start Menu Item
 Flags=DISABLED
 State=0
 
@@ -53,7 +53,7 @@ Left=10
 Right=-1
 Top=50
 Bottom=58
-Text=Desktop Icon (Wireshark Qt)
+Text=Wireshark 2 Preview Desktop Icon
 Flags=DISABLED
 State=0
 
@@ -63,7 +63,7 @@ Left=10
 Right=-1
 Top=60
 Bottom=68
-Text=Quick Launch Icon (Wireshark Qt)
+Text=Wireshark 2 Preview Quick Launch Icon
 Flags=DISABLED
 State=0
 
@@ -72,7 +72,7 @@ Type=GroupBox
 Left=0
 Right=-1
 Top=75
-Bottom=140
+Bottom=150
 Text=File Extensions
 State=1
 
@@ -83,7 +83,7 @@ Left=10
 Right=-1
 Top=85
 Bottom=93
-Text=Associate trace file extensions to Wireshark GTK+
+Text=Associate trace file extensions to Wireshark
 State=1
 
 [Field 10]
@@ -93,7 +93,7 @@ Left=10
 Right=-1
 Top=95
 Bottom=103
-Text=Associate trace file extensions to Wireshark Qt
+Text=Associate trace file extensions to Wireshark 2 Preview
 Flags=DISABLED
 State=0
 
@@ -109,17 +109,17 @@ State=0
 
 [Field 12]
 Type=Label
-Left=30
+Left=10
 Right=280
-Top=115
-Bottom=123
-Text=(5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, out, pcap, pcapng, pkt,
+Top=120
+Bottom=128
+Text=Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, out, pcap,
 
 [Field 13]
 Type=Label
-Left=30
+Left=10
 Right=280
-Top=125
-Bottom=133
-Text=rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz)
+Top=130
+Bottom=138
+Text=pcapng, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz
 
diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh
index ef85faa498..ee4b9e20f4 100755
--- a/packaging/nsis/common.nsh
+++ b/packaging/nsis/common.nsh
@@ -12,10 +12,10 @@
 !define DISPLAY_NAME "${PROGRAM_NAME} ${VERSION} (${BITS}-bit)"
 Name "${DISPLAY_NAME}"
 
-!define PROGRAM_NAME_GTK "${PROGRAM_NAME} (GTK+)"
-!define PROGRAM_NAME_QT "${PROGRAM_NAME} (Qt)"
-!define PROGRAM_FULL_NAME_GTK "The ${PROGRAM_NAME} Network Protocol Analyzer (GTK+)"
-!define PROGRAM_FULL_NAME_QT "The ${PROGRAM_NAME} Network Protocol Analyzer (Qt)"
+!define PROGRAM_NAME_GTK "${PROGRAM_NAME}"
+!define PROGRAM_NAME_QT "${PROGRAM_NAME} 2 Preview"
+!define PROGRAM_FULL_NAME_GTK "The ${PROGRAM_NAME} Network Protocol Analyzer"
+!define PROGRAM_FULL_NAME_QT "The ${PROGRAM_NAME} Network Protocol Analyzer (Version 2 Preview)"
 !define PROGRAM_NAME_PATH_GTK "${PROGRAM_NAME}.exe"
 !define PROGRAM_NAME_PATH_QT "qtshark.exe"
 
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 6fe00bd0a6..cff66c2c0f 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -1,8 +1,6 @@
 ;
 ; wireshark.nsi
 ;
-; $Id$
-
 
 ; Set the compression mechanism first.
 ; As of NSIS 2.07, solid compression which makes installer about 1MB smaller
@@ -773,7 +771,7 @@ SetShellVarContext all
 SectionEnd ; "Required"
 
 !ifdef GTK_DIR
-Section "${PROGRAM_NAME} GTK+ UI (stable)" SecWiresharkGtk
+Section "${PROGRAM_NAME}" SecWiresharkGtk
 ;-------------------------------------------
 SetOutPath $INSTDIR
 File "${STAGING_DIR}\${PROGRAM_NAME_PATH_GTK}"
@@ -865,7 +863,7 @@ File "..\..\doc\tshark.html"
 SectionEnd
 
 !ifdef QT_DIR
-Section "${PROGRAM_NAME} Qt UI (alpha)" SecWiresharkQt
+Section "${PROGRAM_NAME} 2 Preview" SecWiresharkQt
 ;-------------------------------------------
 ; by default, QtShark is installed but file is always associate with Wireshark GTK+
 SetOutPath $INSTDIR
@@ -1052,11 +1050,11 @@ SectionEnd
 ; ============================================================================
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 !ifdef GTK_DIR
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkGtk} "${PROGRAM_NAME} is a GUI network protocol analyzer. (GTK+ UI)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkGtk} "The main network protocol analyzer application."
 !endif
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecTShark} "TShark is a text based network protocol analyzer."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecTShark} "Text based network protocol analyzer."
 !ifdef QT_DIR
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkQt} "${PROGRAM_NAME} is a GUI network protocol analyzer. (Qt UI, alpha)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecWiresharkQt} "Preview of the next major release."
 !endif
 
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPluginsGroup} "Plugins and extensions for both ${PROGRAM_NAME} and TShark."
@@ -1071,15 +1069,15 @@ SectionEnd
 !endif
 
   !insertmacro MUI_DESCRIPTION_TEXT ${SecToolsGroup} "Additional command line based tools."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Editcap is a program that reads a capture file and writes some or all of the packets into another capture file."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Text2pcap is a program that reads in an ASCII hex dump and writes the data into a libpcap-style capture file."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMergecap} "Mergecap is a program that combines multiple saved capture files into a single output file"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecReordercap} "Reordercap is a program that copies frames from an input capture to an output capture after sorting by time."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecCapinfos} "Capinfos is a program that provides information on capture files."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecRawshark} "Rawshark is a raw packet filter."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Copy packets to a new file, optionally trimmming packets, omitting them, or saving to a different format."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Read an ASCII hex dump and write the data into a libpcap-style capture file."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMergecap} "Combine multiple saved capture files into a single output file"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecReordercap} "Copy packets to a new file, sorted by time."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecCapinfos} "Pring information about capture files."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecRawshark} "Raw packet filter."
 
 !ifdef HHC_DIR
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecUsersGuide} "Install the user's guide, so an internet connection is not required to read the help pages."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecUsersGuide} "Install an offline copy of the User's Guide."
 !endif
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
@@ -1205,25 +1203,33 @@ Function myShowCallback
     StrCmp $R0 'ME' lbl_winversion_unsupported
     StrCmp $R0 'NT 4.0' lbl_winversion_unsupported_nt4
     StrCmp $R0 '2000' lbl_winversion_unsupported_2000
+    StrCmp $R0 'XP' lbl_winversion_warn_xp
     Goto lbl_winversion_supported
+
 lbl_winversion_unsupported:
     MessageBox MB_OK \
-        "Windows $R0 is no longer supported. The last known version working with 98/ME was Ethereal 0.99.0." \
+        "Windows $R0 is no longer supported.$\nPlease install Ethereal 0.99.0 instead." \
         /SD IDOK
     Quit
 
 lbl_winversion_unsupported_nt4:
     MessageBox MB_OK \
-            "Windows $R0 is no longer supported. The last known version working with NT 4.0 was Wireshark 0.99.4." \
+            "Windows $R0 is no longer supported.$\nPlease install Wireshark 0.99.4 instead." \
             /SD IDOK
     Quit
 
 lbl_winversion_unsupported_2000:
     MessageBox MB_OK \
-        "Windows $R0 is no longer supported. Please install Wireshark 1.2 or 1.0." \
+        "Windows $R0 is no longer supported.$\nPlease install Wireshark 1.2 or 1.0 instead." \
         /SD IDOK
     Quit
 
+lbl_winversion_warn_xp:
+    MessageBox MB_OK \
+        "This version of ${PROGRAM_NAME} may not work on Windows $R0.$\nWe recommend Wireshark 1.10 instead." \
+        /SD IDOK
+    ; Don't quit.
+
 lbl_winversion_supported:
     ; detect if WinPcap should be installed
     WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap ${PCAP_DISPLAY_VERSION}"