changeset 964:1fa70bdff359

Adjust strings in ALACA dialog 2013-03-31 Omair Majid <omajid@redhat.com> * netx/net/sourceforge/jnlp/resources/Messages.properties (ALACAMissingMainTitle, ALACAMissingInfo ALACAMatchingMainTitle) (ALACAMatchingInfo): Rephrase strings and replace full links with page names. * netx/net/sourceforge/jnlp/util/UrlUtils.java (setOfUrlsToHtmlList): Enclose list in 'ul' element.
author Omair Majid <omajid@redhat.com>
date Mon, 31 Mar 2014 13:19:52 -0400
parents ee80e215928e
children ec7b04725a82
files ChangeLog netx/net/sourceforge/jnlp/resources/Messages.properties netx/net/sourceforge/jnlp/util/UrlUtils.java
diffstat 3 files changed, 23 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Mar 31 16:54:52 2014 +0200
+++ b/ChangeLog	Mon Mar 31 13:19:52 2014 -0400
@@ -1,3 +1,12 @@
+2013-03-31  Omair Majid  <omajid@redhat.com>
+
+	* netx/net/sourceforge/jnlp/resources/Messages.properties
+	(ALACAMissingMainTitle, ALACAMissingInfo ALACAMatchingMainTitle)
+	(ALACAMatchingInfo): Rephrase strings and replace full links with page
+	names.
+	* netx/net/sourceforge/jnlp/util/UrlUtils.java (setOfUrlsToHtmlList):
+	Enclose list in 'ul' element.
+
 2013-03-31  Jiri Vanek  <jvanek@redhat.com>
             Alexandr Kolouch  <skolnag@gmail.com>
 
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Mon Mar 31 16:54:52 2014 +0200
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Mon Mar 31 13:19:52 2014 -0400
@@ -61,23 +61,24 @@
 http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html</a>
 
 # missing Application-Library-Allowable-Codebase dialogue
-ALACAMissingMainTitle=Application <span color='red'> {0} </span> \
-form codebase <span color='red'> {1} </span> is missing the  Application-Library-Allowable-Codebase attribute. \
-This application uses resources from the following remote locations:<br/> {2} Are you sure you want to run this application?
-ALACAMissingInfo=For more information you can visit:<br/>\
+ALACAMissingMainTitle=The application <span color='red'> {0} </span> \
+from <span color='red'> {1} </span> uses resources from the following remote locations: \
+{2} \
+Are you sure you want to run this application?
+ALACAMissingInfo=For more information see:<br/>\
 <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library"> \
-http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library</a> <br/> \
+JAR File Manifest Attributes</a> <br/> \
 and<br/> <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html"> \
-http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html</a>
+Preventing the Repurposing of an Application</a>
 # matching Application-Library-Allowable-Codebase dialogue
-ALACAMatchingMainTitle=Application <span color='red'> {0} </span> \
-form codebase <span color='red'> {1} </span> is requiring valid resources from different locations:<br/>{2} <br/> \
-Those resources are expected to be loaded. Do you agree to run this application?
+ALACAMatchingMainTitle=The application <span color='red'> {0} </span> \
+from <span color='red'> {1} </span> uses resources from the following remote locations:<br/>{2} <br/> \
+Are you sure you want to run this application?
 ALACAMatchingInfo=For more information you can visit:<br/>\
 <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library"> \
-http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library</a> <br/> \
+JAR File Manifest Attributes</a> <br/> \
 and<br/> <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html"> \
-http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html</a>
+Preventing the Repurposing of an Application</a>
 
 # LS - Severity
 LSMinor=Minor
--- a/netx/net/sourceforge/jnlp/util/UrlUtils.java	Mon Mar 31 16:54:52 2014 +0200
+++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java	Mon Mar 31 13:19:52 2014 -0400
@@ -195,9 +195,11 @@
      */
     public static String setOfUrlsToHtmlList(Iterable<URL> remoteUrls) {
         StringBuilder sb = new StringBuilder();
+        sb.append("<ul>");
         for (URL url : remoteUrls) {
             sb.append("<li>").append(url.toExternalForm()).append("</li>");
         }
+        sb.append("</ul>");
         return sb.toString();
     }