Author: markt
Date: Wed Mar 8 20:18:26 2017
New Revision: 1786074
URL: http://svn.apache.org/viewvc?rev=1786074&view=rev
Log:
Fix i18n related warnings that are reported with NSIS 3.0. (The problem existed
with 2.x but no warning was generated.)
Modified:
tomcat/tc8.0.x/trunk/res/tomcat.nsi
Modified: tomcat/tc8.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/tomcat.nsi?rev=1786074&r1=1786073&r2=1786074&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc8.0.x/trunk/res/tomcat.nsi Wed Mar 8 20:18:26 2017
@@ -96,27 +96,6 @@ Var ServiceInstallLog
!define MUI_ICON tomcat.ico
!define MUI_UNICON tomcat.ico
- ;Install Options pages
- LangString TEXT_JVM_TITLE ${LANG_ENGLISH} "Java Virtual Machine"
- LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} "Java Virtual Machine path
selection."
- LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} ": Java Virtual Machine path
selection"
-
- LangString TEXT_INSTDIR_NOT_EMPTY ${LANG_ENGLISH} "The specified
installation directory is not empty. Do you wish to continue?"
- LangString TEXT_CONF_TITLE ${LANG_ENGLISH} "Configuration"
- LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
- LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
-
- LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
SE 7.0 or later JRE installed on your system."
- LangString TEXT_CONF_LABEL_PORT_SHUTDOWN ${LANG_ENGLISH} "Server Shutdown
Port"
- LangString TEXT_CONF_LABEL_PORT_HTTP ${LANG_ENGLISH} "HTTP/1.1 Connector
Port"
- LangString TEXT_CONF_LABEL_PORT_AJP ${LANG_ENGLISH} "AJP/1.3 Connector Port"
- LangString TEXT_CONF_LABEL_SERVICE_NAME ${LANG_ENGLISH} "Windows Service
Name"
- LangString TEXT_CONF_LABEL_SHORTCUT_ALL_USERS ${LANG_ENGLISH} "Create
shortcuts for all users"
- LangString TEXT_CONF_LABEL_ADMIN ${LANG_ENGLISH} "Tomcat Administrator Login
(optional)"
- LangString TEXT_CONF_LABEL_ADMINUSERNAME ${LANG_ENGLISH} "User Name"
- LangString TEXT_CONF_LABEL_ADMINPASSWORD ${LANG_ENGLISH} "Password"
- LangString TEXT_CONF_LABEL_ADMINROLES ${LANG_ENGLISH} "Roles"
-
;Install Page order
!insertmacro MUI_PAGE_WELCOME
; Show file named "INSTALLLICENSE"
@@ -138,21 +117,41 @@ Var ServiceInstallLog
!insertmacro MUI_UNPAGE_INSTFILES
!endif
- ;Component-selection page
- ;Descriptions
- LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet
container as a Windows service."
- LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet
container core and create the Windows service."
- LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start the
Tomcat service when the computer is started."
- LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Install APR based Tomcat
native .dll for better performance and scalability in production environments."
- LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group
for Tomcat."
- LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation
bundle. This includes documentation on the servlet container and its
configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors."
- LangString DESC_SecManager ${LANG_ENGLISH} "Install the Tomcat Manager
administrative web application."
- LangString DESC_SecHostManager ${LANG_ENGLISH} "Install the Tomcat Host
Manager administrative web application."
- LangString DESC_SecExamples ${LANG_ENGLISH} "Install the Servlet and JSP
examples web application."
-
;Language
!insertmacro MUI_LANGUAGE English
+ ;Install Options pages
+ LangString TEXT_JVM_TITLE ${LANG_ENGLISH} "Java Virtual Machine"
+ LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} "Java Virtual Machine path
selection."
+ LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} ": Java Virtual Machine path
selection"
+
+ LangString TEXT_INSTDIR_NOT_EMPTY ${LANG_ENGLISH} "The specified
installation directory is not empty. Do you wish to continue?"
+ LangString TEXT_CONF_TITLE ${LANG_ENGLISH} "Configuration"
+ LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
+ LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
+
+ LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
SE 7.0 or later JRE installed on your system."
+ LangString TEXT_CONF_LABEL_PORT_SHUTDOWN ${LANG_ENGLISH} "Server Shutdown
Port"
+ LangString TEXT_CONF_LABEL_PORT_HTTP ${LANG_ENGLISH} "HTTP/1.1 Connector
Port"
+ LangString TEXT_CONF_LABEL_PORT_AJP ${LANG_ENGLISH} "AJP/1.3 Connector Port"
+ LangString TEXT_CONF_LABEL_SERVICE_NAME ${LANG_ENGLISH} "Windows Service
Name"
+ LangString TEXT_CONF_LABEL_SHORTCUT_ALL_USERS ${LANG_ENGLISH} "Create
shortcuts for all users"
+ LangString TEXT_CONF_LABEL_ADMIN ${LANG_ENGLISH} "Tomcat Administrator Login
(optional)"
+ LangString TEXT_CONF_LABEL_ADMINUSERNAME ${LANG_ENGLISH} "User Name"
+ LangString TEXT_CONF_LABEL_ADMINPASSWORD ${LANG_ENGLISH} "Password"
+ LangString TEXT_CONF_LABEL_ADMINROLES ${LANG_ENGLISH} "Roles"
+
+ ;Component-selection page
+ LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet
container as a Windows service."
+ LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet
container core and create the Windows service."
+ LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start the
Tomcat service when the computer is started."
+ LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Install APR based Tomcat
native .dll for better performance and scalability in production environments."
+ LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group
for Tomcat."
+ LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation
bundle. This includes documentation on the servlet container and its
configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors."
+ LangString DESC_SecManager ${LANG_ENGLISH} "Install the Tomcat Manager
administrative web application."
+ LangString DESC_SecHostManager ${LANG_ENGLISH} "Install the Tomcat Host
Manager administrative web application."
+ LangString DESC_SecExamples ${LANG_ENGLISH} "Install the Servlet and JSP
examples web application."
+
;Install types
InstType Normal
InstType Minimum
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
