--- a/ChangeLog	Fri Apr 24 14:47:45 2015 +0200
+++ b/ChangeLog	Fri Apr 24 14:56:35 2015 +0200
@@ -1,3 +1,8 @@
+2015-04-24  Alexandr Kolouch  <skolnag@gmail.com>
+
+	* netx/net/sourceforge/jnlp/resources/Messages.properties: various improvements
+	to default set.
+
 2015-04-23  Jiri Vanek  <jvanek@redhat.com>
 
 	* tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/testcases/PartiallySignedAppletManifestSpecifiesSandboxTests.java: 

--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Fri Apr 24 14:47:45 2015 +0200
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Fri Apr 24 14:56:35 2015 +0200
@@ -114,10 +114,10 @@
 LCLaunching=Launch Error
 LCNotSupported=Unsupported Feature
 LCInit=Initialization Error
- 
+
 LAllThreadGroup=All JNLP applications
 LNullUpdatePolicy=Update policy cannot be null.
- 
+
 LThreadInterrupted=Thread interrupted while waiting for file to launch.
 LThreadInterruptedInfo=This can lead to deadlock or yield other damage during execution. Please restart your application/browser.
 LCouldNotLaunch=Could not launch JNLP file.
@@ -125,10 +125,10 @@
 LCantRead=Could not read or parse the JNLP file.
 LCantReadInfo=You can try to download this file manually and send it as bug report to IcedTea-Web team.
 LNullLocation=Could not determine .jnlp file location.
-LNullLocationInfo=An attempt was made to launch a JNLP file in another JVM, but the file could not be located.  In order to launch in an external JVM, the runtime must be able to locate the .jnlp file either in the local filesystem or on a server.
+LNullLocationInfo=An attempt was made to launch a JNLP file in another JVM, but the file could not be located.  In order to launch in an external JVM, the runtime must be able to locate the .jnlp file either in the local file system or on a server.
 LNetxJarMissing=Could not determine location of netx.jar.
-LNetxJarMissingInfo=An attempt was made to lauch a JNLP file in another JVM, but the netx.jar could not be located.  In order to launch in an external JVM, the runtime must be able to locate the netx.jar file.
-LNotToSpec=JNLP file not strictly to spec.
+LNetxJarMissingInfo=An attempt was made to launch a JNLP file in another JVM, but the netx.jar could not be located.  In order to launch in an external JVM, the runtime must be able to locate the netx.jar file.
+LNotToSpec=JNLP file not strictly to specifications.
 LNotToSpecInfo=The JNLP file contains data that is prohibited by the JNLP specification.  The runtime can attempt to ignore the invalid information and continue launching the file.
 LNotApplication=Not an application file.
 LNotApplicationInfo=An attempt was made to load a non-application file as an application.
@@ -161,7 +161,7 @@
 LNoSecInstance=Error: No security instance for {0}. The application may have trouble continuing
 LCertFoundIn={0} found in cacerts ({1})
 LSingleInstanceExists=Another instance of this applet already exists and only one may be run at the same time.
- 
+
 JNotApplet=File is not an applet.
 JNotApplication=File is not an application.
 JNotComponent=File is not a component.
@@ -169,7 +169,7 @@
 JInvalidExtensionDescriptor=Extension does not refer to a component or installer (name={1}, location={2}).
 
 LNotVerified=Jars not verified.
-LCancelOnUserRequest=Canceled on user request.
+LCancelOnUserRequest=Cancelled on user request.
 LFatalVerification=A fatal error occurred while trying to verify jars.
 LFatalVerificationInfo=An exception has been thrown in class JarCertVerifier. Being unable to read the cacerts or trusted.certs files could be a possible cause for this exception.
 
@@ -237,7 +237,7 @@
 RCantCreateDir=Cant create directory {0}
 RCantRename=Cant rename {0} to {1}
 RDenyStopped=Stopped applications have no permissions.
-RExitNoApp=Can not exit the JVM because the current application cannot be determined.
+RExitNoApp=Cannot exit the JVM because the current application cannot be determined.
 RNoLockDir=Unable to create locks directory ({0})
 RNestedJarExtration=Unable to extract nested jar.
 RUnexpected=Unexpected {0} at {1}
@@ -251,7 +251,7 @@
 RBrowserLocationPromptMessage=Specify Browser Location
 RBrowserLocationPromptMessageWithReason=Specify Browser Location (the browser command "{0}" is invalid).
 HTMLnoneFound=No applet found on this html page (supported are object, embed and applet tags)
-HTMLmoreThenOne=More then one ({0}) applets found. Using  first. You can specify ''all'' or numbers to specify appelts you wont to run.
+HTMLmoreThenOne=More then one ({0}) applets found. Using  first. You can specify ''all'' or numbers to specify applets you want to run.
 
 # icedtea-web man (note, spaces are important due to man pages markup
 ITWintroL1={0}provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project.
@@ -322,7 +322,7 @@
 BOUsage=[-run-options] jnlp file
 BOUsage2=[-control-options]
 BOJnlp      = Location of JNLP file to launch (url or file).
-BOHtml      = Location of HTML file to launch (url or file). You concate parameter ALL  or numbers (like 1 2 5) to select applets on page. However experimental, this switch should keep you still in safety.
+BOHtml      = Location of HTML file to launch (url or file). You can use parameter ALL  or numbers (like 1 2 5) to select applets on page. However experimental, this switch should keep you still in safety.
 BOArg       = Adds an application argument before launching.
 BOParam     = Adds an applet parameter before launching.
 BOProperty  = Sets a system property before launching.
@@ -390,17 +390,17 @@
 CChooseCache=Choose a cache directory...
 CChooseCacheInfo=NetX needs a location for storing cache files.
 CChooseCacheDir=Cache directory
-CCannotClearCache=Can not clear the cache at this time. Try later. If the problem persists, try closing your browser(s) & JNLP applications. At the end you can try to kill all java applications. \\\n You can clear cache by javaws -Xclearcache or via itw-settings Cache -> View files -> Purge
+CCannotClearCache=Cannot clear the cache at this time. Try later. If the problem persists, try closing your browser(s) & JNLP applications. At the end you can try to kill all java applications. \\\n You can clear cache by javaws -Xclearcache or via itw-settings Cache -> View files -> Purge
 CFakeCache=Cache is corrupt. Fixing.
 CFakedCache=Cache was corrupt and has been fixed. It is strongly recommended that you run ''javaws -Xclearcache'' and rerun your application as soon as possible. You can also use via itw-settings Cache -> View files -> Purge
 
 # extended access warning pane 
 EXAWdesktopWants=Desktop icon shortcut (applications want to).
-EXAWdesktopDontWants=Desktop icon shortcut (applications don''t wants to, but you still can).
+EXAWdesktopDontWants=Desktop icon shortcut (applications don''t want to, but you still can).
 EXAWsubmenu=Menu icon shortcut (applications will try to include to submenu - {0}).
-EXAWmenuWants=Menu icon shortcut (applications wont to).
-EXAWmenuDontWants=Menu icon shortcut (applications don''t wants to, but you still can).
-EXAWsettingsInfo=Your curernt setting is: {0}. You can change it in itweb-settings in {1} panel.
+EXAWmenuWants=Menu icon shortcut (applications want to).
+EXAWmenuDontWants=Menu icon shortcut (applications don''t want to, but you still can).
+EXAWsettingsInfo=Your current setting is: {0}. You can change it in itweb-settings in {1} panel.
 EXAWsettingsManage=You can manage existing menu entries in itweb-settings in {0} panel.
 EXAWrememberByApp=Remember by application
 EXAWrememberByPage=Remember by domain
@@ -416,18 +416,18 @@
 EXAWbrowserTolltip=<html>Browser shortcut<br> \
 <li>This option will create shortcut to open your browser with current page loaded</li> \
 <li>If your browser support offline run, this is the safest option</li></html>
-EXAWbrowsersTolltip=<html>browser used for lunching this applet (will lunch icedtea-web later)<br> \
+EXAWbrowsersTolltip=<html>browser used for lunching this applet (will launch IcedTea-web later)<br> \
 <li>The default browser was preset</li> \
-<li>Feel free to include  browser of your choice</li></html>
+<li>Feel free to include a browser of your choice</li></html>
 EXAWgeneratedTolltip=<html><li>The jnlp file will be generated from your current html page</li> \
-<li>Once you lunch jor shortcut, javaws will lunch this jnlp file</li> \
+<li>Once you launch your shortcut, javaws will launch this jnlp file</li> \
 <li>This applet will then run <b>without</b> the browser</li>\
 <li>However experimental, this is working surprisingly well.</li></html>
 EXAWhrefTolltip=<html>Some applets are just pointing to jnlp file, which is containing actual informations about the resources of this app.<br> \
-<li>By selecting this option, this jnlp file will be saved and used for later lunches.</li> \
-<li>Javaws will be the luncher, and this applet will run <b>out</b> of browser</li> \
-<li>However good htis sounds, this si surprisingly not working</li></html>
-EXAWhtmlTolltip=<html>BY using -html switch, javaws can try to parse html and try to extract applet, and to lunch it out of browser<br> \
+<li>By selecting this option, this jnlp file will be saved and used for later launches.</li> \
+<li>Javaws will be the launcher, and this applet will run <b>out</b> of browser</li> \
+<li>However good this sounds, this is surprisingly not working</li></html>
+EXAWhtmlTolltip=<html>BY using -html switch, javaws can try to parse html and try to extract applet, and to launch it out of browser<br> \
 <li>highly experimental</li> \
 <li>really cool</li></html>
 EXAWfixTolltip=<html>Some jnlp files pointed from applet are not designed to be used as jnlp apps<br> \
@@ -535,14 +535,14 @@
 DCUnknownSettingWithName=Property "{0}" is unknown.
 DCmaindircheckNotexists=After all attempts, your configuration directory {0} do not exists.
 DCmaindircheckNotdir=Your configuration directory {0} is not directory.
-DCmaindircheckRwproblem=Your configuration directory {0} can not be read/written properly.
+DCmaindircheckRwproblem=Your configuration directory {0} cannot be read/written properly.
 
 # Value Validator messages. Messages should follow "Possible values ..." 
 VVPossibleValues=Possible values {0}
 VVPossibleBooleanValues=are {0} or {1}
 VVPossibleFileValues=include an absolute path to a file or directory
 VVPossibleRangedIntegerValues=are in range {0} to {1} (inclusive)
-VVPossibleUrlValues=include any valid url (eg http://icedtea.classpath.org/hg/)
+VVPossibleUrlValues=include any valid url (eg. http://icedtea.classpath.org/hg/)
 
 # Control Panel - Main
 CPMainDescriptionShort=Configure IcedTea-Web
@@ -553,7 +553,7 @@
 CPNetworkSettingsDescription=Configure network settings, including how IcedTea-Web connects to the internet and whether to use any proxies.
 CPTempInternetFilesDescription=Java stores application data for faster execution the next time you run it.
 CPJRESettingsDescription=View and manage Java Runtime Environment versions and settings for Java applications and applets.
-CPCertificatesDescription=Use certificates to positively identify yourself, certifications, authorities, and plublishers.
+CPCertificatesDescription=Use certificates to positively identify yourself, certifications, authorities, and publishers.
 CPSecurityDescription=Use this to configure security settings.
 CPDebuggingDescription=Enable options here to help with debugging
 CPDesktopIntegrationDescription=Set whether or not to allow creation of desktop shortcut.
@@ -969,7 +969,7 @@
 CPInvalidPortTitle=Error on input.
 
 # command line control panel
-CLNoInfo=No information avaiable (is this a valid option?).
+CLNoInfo=No information available (is this a valid option?).
 CLValue=Value: {0}
 CLValueSource=Source: {0}
 CLDescription=Description: {0}
@@ -997,12 +997,12 @@
 SPLASHclosewAndCopyException = Close and copy the stack trace to clipboard
 SPLASHexOccured = An exception has occurred...
 SPLASHHome = Home
-SPLASHcantCopyEx = Can not copy exception
+SPLASHcantCopyEx = Cannot copy exception
 SPLASHnoExRecorded = No exception recorded
 SPLASHmainL1 = For even more information you can visit {0} and follow the steps described there on how to obtain necessary information to file bug
 SPLASHmainL3 = No further information available, try to launch the browser from the command line and examine the output.
 SPLASHcloseAndCopyShorter = Close and copy to clipboard
-SPLASHmainL4 = The folloing exception has occured. For more information, try to launch the browser from the command line and examine the output.
+SPLASHmainL4 = The following exception has occurred. For more information, try to launch the browser from the command line and examine the output.
 SPLASHmainL2 = Additional information may be available in the console or logs. Even more information is available if debugging is enabled.
 SPLASHexWas = Exception was:
 SPLASHcfl = Can''t follow link to
@@ -1020,7 +1020,7 @@
 CBCheckOkSignedOk = Codebase matches codebase manifest attribute, and application is signed. Continuing. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
 CBCheckSignedAppletDontMatchException = Signed applets are not allowed to run when their actual Codebase does not match the Codebase specified in their manifest. Expected: {0}. Actual: {1}. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
 CBCheckSignedFail = Application Codebase does NOT match the Codebase specified in the application''s manifest, and this application is signed. You are strongly discouraged from running this application. See: http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html for details.
- 
+
 # itweb-settings man (note, spaces (especially the one around markup) are important due to man pages markup). Only bold  tag is now recognized by ReplacingTextFormatter.
 ITWSintro= - view and modify settings for <B>javaws </B>and the <B>browser plugin</B>
 ITWSsynops=command arguments
@@ -1046,18 +1046,18 @@
 
 # files descriptions
 FILEpipe=Contains in and out pipe for native2java communication and (if enabled) debugging pipe.
-FILEmozillauser=Location of plugin library for user''s purposes on mozilla compliant browser.
-FILEmozillaglobal64=Location of plugin library for global purposes  on mozilla compliant browser, 64b systems.
-FILEmozillaglobal32=Location of plugin library for global purposes  on mozilla compliant browser, 32b systems.
-FILEopera64=Location of plugin library for global purposes  on opera compliant browser, 64b systems.
-FILEopera32=Location of plugin library for global purposes  on opera compliant browser, 32b systems.
-    
-FILEcache=Contains cached runtime entries (and my be changed by you).
+FILEmozillauser=Location of plugin library for user''s purposes on Mozilla compliant browser.
+FILEmozillaglobal64=Location of plugin library for global purposes  on Mozilla compliant browser, 64-bit systems.
+FILEmozillaglobal32=Location of plugin library for global purposes  on Mozilla compliant browser, 32-bit systems.
+FILEopera64=Location of plugin library for global purposes  on opera compliant browser, 64-bit systems.
+FILEopera32=Location of plugin library for global purposes  on opera compliant browser, 32-bit systems.
+
+FILEcache=Contains cached runtime entries.
 FILErecentlyUsed=Additional information about items in cache
 FILEappdata=Contains saved application data.
 FILElogs=contains file-log files (if enabled), itw-cplugin-date_time.log for native part of plugin, itw-javantx-date_time.log for everything else.
-FILEicons=Location where icons of javaws applications desktp/menu launchers icons are stored
-FILEjnlps=Location where jnlps files generated from html pages for javaws applications desktp/menu launchers icons are stored
+FILEicons=Location where icons of javaws applications desktop/menu launchers icons are stored
+FILEjnlps=Location where jnlp files generated from html pages for javaws applications desktop/menu launchers icons are stored
 FILEmenus=Subdirectory in users menus space, for placing custom menu shortcuts.
 FILEextasuser=File responsible for various actions on applets and apps based on their codebase based on users actions.
 FILEextasadmin=File responsible for various actions on applets and apps based on their codebase based on admins actions.
@@ -1122,7 +1122,7 @@
 APPEXTSECguiPanelMatchingNote=Please note, that only first matched result will be considered as result.
 APPEXTSECguiPanelMatched=Matched
 APPEXTSECguiPanelMatchingError=Error during matching: {0}
-APPEXTSECguiPanelCanNotValidate=Can not validate, can not create tmp file - {0}
+APPEXTSECguiPanelCanNotValidate=Cannot validate, cannot create tmp file - {0}
 APPEXTSECguiPanelEmptyDoc=All document-bases must be full
 APPEXTSECguiPanelEmptyCode=All code-bases must be full
 APPEXTSECguiPanelTableValid=Table looks valid
@@ -1146,7 +1146,7 @@
 </p> \
 <A name="level"><h2>Security Level</h2></A> \
 <p> \
-Its a main switch for "extended applet security". Its value is commonly stored in usrs_home/.icedtea/deployment.properties, but can be enforced via global settings in /etc/.java/deployment/deployment.properties or JAVA_HOME/lib/deployment.properties under the key <b>deployment.security.level</b><br/> \
+Its a main switch for "extended applet security". Its value is commonly stored in users_home/.icedtea/deployment.properties, but can be enforced via global settings in /etc/.java/deployment/deployment.properties or JAVA_HOME/lib/deployment.properties under the key <b>deployment.security.level</b><br/> \
 <li/><b>Disable running of all Java applets</b> - stored as <i>DENY_ALL</i> - No applet will be run<br/> \
 <blockquote cite="" > \
 No applet will be allowed to run. However the Java virtual machine will always be executed (and an error screen with reason appear instead of applets). To disable Java completely you can uninstall IcedTea-Web or disable it in your browser (if supported). The tables with records are of course ignored. \
@@ -1251,7 +1251,7 @@
 </p> \
 <p> \
 <h2><A name="regexes">Regular expressions</A></h2> \
-IcedTea-Web extended applet security - uses a powerful matching engine to match exact (sets of) applets. Base stone is <b>Quotation</b> of URL \Q\E and <b>wildchars</b> llike .* or .? or more.<br/> \
+IcedTea-Web extended applet security - uses a powerful matching engine to match exact (sets of) applets. Base stone is <b>Quotation</b> of URL \Q\E and <b>wildchars</b> like .* or .? or more.<br/> \
 This was designed to suits the need to block or allow exact pages. The best is to show some examples:<br/> \
 N 12.12.2012 .* \Qhttp://blogs.com/evilJohn\E.* <br/> \
 N 12.12.2012 \Qhttp://blogs.com/goodJohn/evilApplet.html\E.* \Qhttp://blogs.com/goodJohn/\E goodJohnsArchive.jar <br/> \