incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1225205 - in /incubator/lcf/trunk: ./ framework/crawler-ui/src/main/webapp/ framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/
Date Wed, 28 Dec 2011 15:22:16 GMT
Author: kwright
Date: Wed Dec 28 15:22:15 2011
New Revision: 1225205

URL: http://svn.apache.org/viewvc?rev=1225205&view=rev
Log:
Fix for CONNECTORS-340.  Separate labels with colons from labels without, by convention.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp
    incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp
    incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
    incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1225205&r1=1225204&r2=1225205&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Wed Dec 28 15:22:15 2011
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-340: Separate labels with colons from labels without.
+(Karl Wright)
+
 CONNECTORS-338: Move localization to the ui-core jar.
 (Karl Wright)
 

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1225205&r1=1225204&r2=1225205&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp Wed Dec 28 15:22:15 2011
@@ -294,7 +294,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name")%></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.NameColon")%></nobr></td><td class="value" colspan="4">
 <%
 	    // If the connection doesn't exist yet, we are allowed to change the name.
 	    if (connection == null)
@@ -314,7 +314,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Description")%></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.DescriptionColon")%></nobr></td><td class="value" colspan="4">
 					<input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
 				</td>
 			</tr>
@@ -338,7 +338,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.ConnectionType")%></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.ConnectionTypeColon")%></nobr></td><td class="value" colspan="4">
 <%
 	    if (className.length() > 0)
 	    {
@@ -401,7 +401,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.MaxConnections")%></nobr><br/><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.PerJVM")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.MaxConnections")%></nobr><br/><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.PerJVMColon")%></nobr></td>
 				<td class="value" colspan="4"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 		    </table>

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp?rev=1225205&r1=1225204&r2=1225205&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp Wed Dec 28 15:22:15 2011
@@ -333,7 +333,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name")%></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.NameColon")%></nobr></td><td class="value" colspan="4">
 <%
 	    // If the connection doesn't exist yet, we are allowed to change the name.
 	    if (connection == null)
@@ -353,7 +353,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Description")%></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.DescriptionColon")%></nobr></td><td class="value" colspan="4">
 					<input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
 				</td>
 			</tr>
@@ -377,7 +377,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ConnectionType")%></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ConnectionTypeColon")%></nobr></td><td class="value" colspan="4">
 <%
 	    if (className.length() > 0)
 	    {
@@ -422,7 +422,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Authority")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.AuthorityColon")%></nobr></td>
 				<td class="value" colspan="4">
 <%
 	    IAuthorityConnection[] set2 = authConnectionManager.getAllConnections();
@@ -470,14 +470,14 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="2"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Maxconnections")%></nobr><br/><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.PerJVM")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Maxconnections")%></nobr><br/><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.PerJVMColon")%></nobr></td>
 				<td class="value"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="2"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Throttling")%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ThrottlingColon")%></nobr></td>
 				<td class="boxcell" colspan="4">
 					<input type="hidden" name="throttleop" value="Continue"/>
 					<input type="hidden" name="throttlenumber" value=""/>
@@ -485,7 +485,7 @@
 					    <tr class="formheaderrow">
 						<td class="formcolumnheader"></td>
 						<td class="formcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.BinRegularExpression")%></nobr></td>
-						<td class="formcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Description2")%></nobr></td>
+						<td class="formcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Description")%></nobr></td>
 						<td class="formcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.MaxAvgFetchesMin")%></nobr></td>
 					    </tr>
 <%

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1225205&r1=1225204&r2=1225205&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editjob.jsp Wed Dec 28 15:22:15 2011
@@ -503,7 +503,7 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Name")%></nobr></td><td class="value" colspan="3">
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.NameColon")%></nobr></td><td class="value" colspan="3">
 					<input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
 				</td>
 			</tr>
@@ -538,7 +538,7 @@
 				mapField = mapValue.toString();
 %>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.MaximumHopCountForType")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(relationshipType)%>'<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.semicolon")%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.MaximumHopCountForType")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(relationshipType)%>'<%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.colon")%></nobr></td>
 				<td class="value" colspan="3" >
 					<input name='<%="hopmax_"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(relationshipType)%>' type="text" size="5" value='<%=mapField%>'/>
 				</td>
@@ -548,7 +548,7 @@
 %>
 			<tr><td class="separator" colspan="4"><hr/></td></tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.HopCountMode")%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.HopCountModeColon")%></nobr></td>
 				<td class="value" colspan="3">
 					<nobr><input type="radio" name="hopcountmode" value='<%=Integer.toString(IJobDescription.HOPCOUNT_ACCURATE)%>' <%=((hopcountMode==IJobDescription.HOPCOUNT_ACCURATE)?"checked=\"true\"":"")%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.DeleteUnreachableDocuments")%></input></nobr><br/>
 					<nobr><input type="radio" name="hopcountmode" value='<%=Integer.toString(IJobDescription.HOPCOUNT_NODELETE)%>' <%=((hopcountMode==IJobDescription.HOPCOUNT_NODELETE)?"checked=\"true\"":"")%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.KeepUnreachableDocumentsForNow")%></input></nobr><br/>
@@ -595,7 +595,7 @@
 	    if (outputName.length() == 0)
 	    {
 %>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.OutputConnection")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.OutputConnectionColon")%></nobr></td>
 				<td class="value">
 					<select name="outputname" size="1">
 						<option <%="".equals(outputName)?"selected=\"selected\"":""%> value="">-- <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.NoneSelected")%> --</option>
@@ -616,7 +616,7 @@
 	    else
 	    {
 %>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.OutputConnection")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.OutputConnectionColon")%></nobr></td>
 				<td class="value"><input type="hidden" name="outputname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(outputName)%>'/><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(outputName)%></td>
 <%
 	    }
@@ -626,7 +626,7 @@
 	    if (connectionName.length() == 0)
 	    {
 %>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RepositoryConnection")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RepositoryConnectionColon")%></nobr></td>
 				<td class="value">
 					<select name="connectionname" size="1">
 						<option <%="".equals(connectionName)?"selected=\"selected\"":""%> value="">-- <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.NoneSelected")%> --</option>
@@ -647,14 +647,14 @@
 	    else
 	    {
 %>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RepositoryConnection")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RepositoryConnectionColon")%></nobr></td>
 				<td class="value"><input type="hidden" name="connectionname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></td>
 <%
 	    }
 %>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Priority")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.PriorityColon")%></nobr></td>
 				<td class="value">
 					<select name="priority" size="1">
 						<option value="1" <%=(priority==1)?"selected=\"selected\"":""%>>1 <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Highest")%></option>
@@ -669,7 +669,7 @@
 						<option value="10" <%=(priority==10)?"selected=\"selected\"":""%>>10 <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.Lowest")%></option>
 					</select>
 				</td>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.StartMethod")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.StartMethodColon")%></nobr></td>
 				<td class="value">
 					<select name="startmethod" size="1">
 						<option value='<%=IJobDescription.START_WINDOWBEGIN%>' <%=(startMethod==IJobDescription.START_WINDOWBEGIN)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.StartWhenScheduleWindowStarts")%></option>
@@ -703,19 +703,19 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ScheduleType")%></nobr></td><td class="value"><select name="scheduletype" size="1">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ScheduleTypeColon")%></nobr></td><td class="value"><select name="scheduletype" size="1">
 					<option value='<%=IJobDescription.TYPE_CONTINUOUS%>' <%=(type==IJobDescription.TYPE_CONTINUOUS)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RescanDocumentsDynamically")%></option>
 					<option value='<%=IJobDescription.TYPE_SPECIFIED%>' <%=(type==IJobDescription.TYPE_SPECIFIED)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ScanEveryDocumentOnce")%></option>
-				</select></td><td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RecrawlIntervalIfContinuous")%></nobr></td><td class="value">
+				</select></td><td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.RecrawlIntervalIfContinuousColon")%></nobr></td><td class="value">
 					<nobr><input type="text" size="5" name="recrawlinterval" value='<%=((recrawlInterval==null)?"":recrawlInterval.toString())%>'/> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutesBlankInfinity")%></nobr>
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ExpirationIntervalIfContinuous")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ExpirationIntervalIfContinuousColon")%></nobr></td>
 				<td class="value">
 					<nobr><input type="text" size="5" name="expirationinterval" value='<%=((expirationInterval==null)?"":expirationInterval.toString())%>'/> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutesBlankInfinity")%></nobr>
 				</td>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ReseedIntervalIfContinuous")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ReseedIntervalIfContinuousColon")%></nobr></td>
 				<td class="value">
 					<nobr><input type="text" size="5" name="reseedinterval" value='<%=((reseedInterval==null)?"":reseedInterval.toString())%>'/> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutesBlankInfinity")%></nobr>
 				</td>
@@ -768,7 +768,7 @@
 		}
 %>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ScheduledTime")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.ScheduledTimeColon")%></nobr></td>
 				<td colspan="3" class="value">
 				    <select class="schedulepulldown" multiple="true" name='<%="dayofweek"+postFix%>' size="3">
 					<option value="none" <%=(srDayOfWeek==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.AnyDayOfWeek")%></option>
@@ -859,7 +859,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.MaximumRunTime")%></nobr></td><td colspan="3" class="value">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.MaximumRunTimeColon")%></nobr></td><td colspan="3" class="value">
 					<input type="text" size="5" name='<%="duration"+postFix%>' value='<%=((srDuration==null)?"":new Long(srDuration.longValue()/60000L).toString())%>'/> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutes")%>
 				</td>
 			</tr>
@@ -970,7 +970,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.MaximumRunTime")%></nobr></td><td colspan="3" class="value">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.MaximumRunTimeColon")%></nobr></td><td colspan="3" class="value">
 					<input type="text" size="5" name="duration" value='<%=((duration==null)?"":duration.toString())%>'/> <%=Messages.getString(pageContext.getRequest().getLocale(),"editjob.minutes")%>
 				</td>
 			</tr>

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1225205&r1=1225204&r2=1225205&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp Wed Dec 28 15:22:15 2011
@@ -293,7 +293,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name")%></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.NameColon")%></nobr></td><td class="value" colspan="4">
 <%
 	    // If the connection doesn't exist yet, we are allowed to change the name.
 	    if (connection == null || connectionName.length() < 1)
@@ -313,7 +313,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Description")%></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.DescriptionColon")%></nobr></td><td class="value" colspan="4">
 					<input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
 				</td>
 			</tr>
@@ -337,7 +337,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.ConnectionType")%></nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.ConnectionTypeColon")%></nobr></td><td class="value" colspan="4">
 <%
 	    if (className.length() > 0)
 	    {
@@ -400,7 +400,7 @@
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="2"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.MaxConnections")%></nobr><br/><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.PerJVM")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.MaxConnections")%></nobr><br/><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editoutput.PerJVMColon")%></nobr></td>
 				<td class="value"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 		    </table>

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1225205&r1=1225204&r2=1225205&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp Wed Dec 28 15:22:15 2011
@@ -120,15 +120,15 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.Name")%></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.Description")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.NameColon")%></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.DescriptionColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.AuthorityType")%></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.MaxConnections")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.AuthorityTypeColon")%></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.MaxConnectionsColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
@@ -145,7 +145,7 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.ConnectionStatus")%></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.ConnectionStatusColon")%></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1225205&r1=1225204&r2=1225205&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp Wed Dec 28 15:22:15 2011
@@ -123,24 +123,24 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Name")%></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Description")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.NameColon")%></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.DescriptionColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionType")%></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.MaxConnections")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionTypeColon")%></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.MaxConnectionsColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Authority")%></nobr></td><td class="value" colspan="3"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.AuthorityColon")%></nobr></td><td class="value" colspan="3"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName)%></nobr></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Throttling")%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.ThrottlingColon")%></nobr></td>
 				<td class="boxcell" colspan="3">
 					<table class="formtable">
 						<tr class="formheaderrow">
@@ -199,7 +199,7 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionStatus")%></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionStatusColon")%></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1225205&r1=1225204&r2=1225205&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp Wed Dec 28 15:22:15 2011
@@ -135,23 +135,23 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.Name")%></nobr></td><td class="value" colspan="3" ><%="<!--jobid="+jobID+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getDescription())%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.NameColon")%></nobr></td><td class="value" colspan="3" ><%="<!--jobid="+jobID+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getDescription())%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.OutputConnection")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.OutputConnectionColon")%></nobr></td>
 				<td class="value"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getOutputConnectionName())%></td>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.RepositoryConnection")%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.RepositoryConnectionColon")%></nobr></td>
 				<td class="value"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getConnectionName())%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.Priority")%></nobr></td><td class="value"><%=priority%></td>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.StartMethod")%></nobr></td><td class="value"><%=startMethod%></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.PriorityColon")%></nobr></td><td class="value"><%=priority%></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.StartMethodColon")%></nobr></td><td class="value"><%=startMethod%></td>
 			</tr>
 <%
 		if (model != -1 && model != IRepositoryConnector.MODEL_ADD_CHANGE_DELETE)
@@ -161,13 +161,13 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ScheduleType")%></nobr></td><td class="value"><nobr><%=jobType%></nobr></td>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.MinimumRecrawlInterval")%></nobr></td><td class="value"><nobr><%=intervalString%></nobr>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ScheduleTypeColon")%></nobr></td><td class="value"><nobr><%=jobType%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.MinimumRecrawlIntervalColon")%></nobr></td><td class="value"><nobr><%=intervalString%></nobr>
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ExpirationInterval")%></nobr></td><td class="value"><nobr><%=expirationIntervalString%></nobr></td>
-				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ReseedInterval")%></nobr></td><td class="value"><nobr><%=reseedIntervalString%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ExpirationIntervalColon")%></nobr></td><td class="value"><nobr><%=expirationIntervalString%></nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.ReseedIntervalColon")%></nobr></td><td class="value"><nobr><%=reseedIntervalString%></nobr></td>
 			</tr>
 <%
 		}
@@ -530,7 +530,7 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.HopCountMode")%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewjob.HopCountModeColon")%></nobr></td>
 				<td class="value" colspan="3"><nobr><%=(hopcountMode==IJobDescription.HOPCOUNT_ACCURATE)?"Delete unreachable documents":""%><%=(hopcountMode==IJobDescription.HOPCOUNT_NODELETE)?"No deletes, for now":""%><%=(hopcountMode==IJobDescription.HOPCOUNT_NEVERDELETE)?"No deletes, forever":""%></nobr></td>
 			</tr>
 <%

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp?rev=1225205&r1=1225204&r2=1225205&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/viewoutput.jsp Wed Dec 28 15:22:15 2011
@@ -129,15 +129,15 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.Name")%></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.Description")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.NameColon")%></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.DescriptionColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.ConnectionType")%></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.MaxConnections")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.ConnectionTypeColon")%></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.MaxConnectionsColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>
@@ -153,7 +153,7 @@
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.ConnectionStatus")%></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"viewoutput.ConnectionStatusColon")%></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>

Modified: incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1225205&r1=1225204&r2=1225205&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original)
+++ incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Wed Dec 28 15:22:15 2011
@@ -78,7 +78,7 @@ listoutputs.AddAnOutputConnection=Add an
 editoutput.ApacheManifoldCFEditOutputConnection=Apache ManifoldCF: Edit Output Connection
 editoutput.EditAnOutputConnection=Edit an Output Connection
 editoutput.EditOutputConnection2=Edit Output Connection
-editoutput.ConnectionType=Connection type:
+editoutput.ConnectionTypeColon=Connection type:
 editoutput.Continue=Continue
 editoutput.ContinueToNextPage=Continue to next page
 editoutput.Cancel=Cancel
@@ -86,18 +86,18 @@ editoutput.CancelOutputConnectionEditing
 editoutput.Save=Save
 editoutput.SaveThisOutputConnection=Save this output connection
 editoutput.MaxConnections=Max connections
-editoutput.PerJVM=(per JVM):
+editoutput.PerJVMColon=(per JVM):
 editoutput.EditOutputConnection=Edit output connection
-editoutput.Name=Name:
-editoutput.Description=Description:
+editoutput.NameColon=Name:
+editoutput.DescriptionColon=Description:
 
 viewoutput.ApacheManifoldCFViewOutputConnectionStatus=Apache ManifoldCF: View Output Connection Status
 viewoutput.ViewOutputConnectionStatus=View Output Connection Status
-viewoutput.Name=Name:
-viewoutput.Description=Description:
-viewoutput.ConnectionType=Connection type:
-viewoutput.MaxConnections=Max connections:
-viewoutput.ConnectionStatus=Connection status:
+viewoutput.NameColon=Name:
+viewoutput.DescriptionColon=Description:
+viewoutput.ConnectionTypeColon=Connection type:
+viewoutput.MaxConnectionsColon=Max connections:
+viewoutput.ConnectionStatusColon=Connection status:
 viewoutput.Refresh=Refresh
 viewoutput.EditThisOutputConnection=Edit this output connection
 viewoutput.Edit=Edit
@@ -120,13 +120,13 @@ listauthorities.Delete=Delete
 
 editauthority.ApacheManifoldCFEditAuthority=Apache ManifoldCF: Edit Authority
 editauthority.EditAnAuthority=Edit an Authority
-editauthority.Name=Name:
-editauthority.Description=Description:
-editauthority.ConnectionType=Connection type:
+editauthority.NameColon=Name:
+editauthority.DescriptionColon=Description:
+editauthority.ConnectionTypeColon=Connection type:
 editauthority.Continue=Continue
 editauthority.ContinueToNextPage=Continue to next page
 editauthority.MaxConnections=Max connections
-editauthority.PerJVM=(per JVM):
+editauthority.PerJVMColon=(per JVM):
 editauthority.Cancel=Cancel
 editauthority.CancelAuthorityEditing=Cancel authority editing
 editauthority.Save=Save
@@ -147,18 +147,18 @@ listconnections.Delete=Delete
 
 editconnection.ApacheManifoldCFEditConnection=Apache ManifoldCF: Edit Connection
 editconnection.EditAConnection=Edit a Connection
-editconnection.ConnectionType=Connection type:
-editconnection.Authority=Authority:
+editconnection.ConnectionTypeColon=Connection type:
+editconnection.AuthorityColon=Authority:
 editconnection.Cancel=Cancel
 editconnection.CancelConnectionEditing=Cancel connection editing
-editconnection.Name=Name:
-editconnection.Description=Description:
+editconnection.NameColon=Name:
+editconnection.DescriptionColon=Description:
 editconnection.Maxconnections=Max connections
-editconnection.PerJVM=(per JVM):
-editconnection.Throttling=Throttling:
+editconnection.PerJVMColon=(per JVM):
+editconnection.ThrottlingColon=Throttling:
 editconnection.Add=Add
 editconnection.BinRegularExpression=Bin regular expression
-editconnection.Description2=Description
+editconnection.Description=Description
 editconnection.MaxAvgFetchesMin=Max avg fetches/min
 editconnection.NoThrottlingSpecified=No throttling specified
 editconnection.Continue=Continue
@@ -166,18 +166,18 @@ editconnection.ContinueToNextPage=Contin
 editconnection.Save=Save
 editconnection.SaveThisAuthorityConnection=Save this connection
 editconnection.EditConnection=Edit connection
-editconnection.GlobalAuthority=None(globalAuthority)
+editconnection.GlobalAuthority=None (globalAuthority)
 
 viewconnection.ApacheManifoldCFViewRepositoryConnectionStatus=Apache ManifoldCF: View Repository Connection Status
 viewconnection.ViewRepositoryConnectionStatus=View Repository Connection Status
-viewconnection.Name=Name:
-viewconnection.Description=Description:
-viewconnection.ConnectionType=Connection type:
-viewconnection.MaxConnections=Max connections:
-viewconnection.Authority=Authority:
-viewconnection.Throttling=Throttling:
+viewconnection.NameColon=Name:
+viewconnection.DescriptionColon=Description:
+viewconnection.ConnectionTypeColon=Connection type:
+viewconnection.MaxConnectionsColon=Max connections:
+viewconnection.AuthorityColon=Authority:
+viewconnection.ThrottlingColon=Throttling:
 viewconnection.NoThrottles=No throttles
-viewconnection.ConnectionStatus=Connection status:
+viewconnection.ConnectionStatusColon=Connection status:
 viewconnection.Refresh=Refresh
 viewconnection.EditThisConnection=Edit this connection
 viewconnection.Edit=Edit
@@ -205,33 +205,33 @@ editjob.EditaJob=Edit a Job
 editjob.EditJob=Edit job
 editjob.NoRepositoryConnectionsDefinedCreateOneFirst=No repository connections defined - create one first
 editjob.NoOutputConnectionsDefinedCreateOneFirst=No output connections defined - create one first
-editjob.Name=Name:
+editjob.NameColon=Name:
 editjob.MaximumHopCountForType=Maximum hop count for type
-editjob.semicolon=:
+editjob.colon=:
 editjob.cancel=cancel
 editjob.CancelJobEditing=Cancel job editing
-editjob.OutputConnection=Output connection:
+editjob.OutputConnectionColon=Output connection:
 editjob.NoneSelected=None selected
-editjob.Priority=Priority:
+editjob.PriorityColon=Priority:
 editjob.Highest=(Highest)
 editjob.Lowest=(Lowest)
-editjob.StartMethod=Start method:
-editjob.RepositoryConnection=Repository connection:
+editjob.StartMethodColon=Start method:
+editjob.RepositoryConnectionColon=Repository connection:
 editjob.Continue=Continue
 editjob.ContinueToNextScreen=Continue to next screen
 editjob.StartWhenScheduleWindowStarts=Start when schedule window starts
 editjob.StartEvenInsideAScheduleWindow=Start even inside a schedule window
 editjob.DontAutomaticallyStartThisJob=Don't automatically start this job
 
-editjob.ScheduleType=Schedule type:
+editjob.ScheduleTypeColon=Schedule type:
 editjob.RescanDocumentsDynamically=Rescan documents dynamically
 editjob.ScanEveryDocumentOnce=Scan every document once
-editjob.RecrawlIntervalIfContinuous=Recrawl interval (if continuous):
+editjob.RecrawlIntervalIfContinuousColon=Recrawl interval (if continuous):
 editjob.minutesBlankInfinity=minutes (blank=infinity)
-editjob.ExpirationIntervalIfContinuous=Expiration interval (if continuous):
-editjob.ReseedIntervalIfContinuous=Reseed interval (if continuous):
+editjob.ExpirationIntervalIfContinuousColon=Expiration interval (if continuous):
+editjob.ReseedIntervalIfContinuousColon=Reseed interval (if continuous):
 editjob.NoScheduleSpecified=No schedule specified
-editjob.ScheduledTime=Scheduled time:
+editjob.ScheduledTimeColon=Scheduled time:
 editjob.AnyDayOfWeek=Any day of week
 editjob.Sundays=Sundays
 editjob.Mondays=Mondays
@@ -261,12 +261,12 @@ editjob.November=November
 editjob.December=December
 editjob.on=on
 editjob.AnyDayOfMonth=Any day of month
-editjob.MaximumRunTime=Maximum run time:
+editjob.MaximumRunTimeColon=Maximum run time:
 editjob.RemoveSchedule=Remove Schedule
 editjob.DeleteUnreachableDocuments=Delete unreachable documents
 editjob.KeepUnreachableDocumentsForNow=Keep unreachable documents, for now
 editjob.KeepUnreachableDocumentsForever=Keep unreachable documents, forever
-editjob.HopCountMode=Hop count mode:
+editjob.HopCountModeColon=Hop count mode:
 editjob.Save=Save
 editjob.SaveThisJob=Save this job
 
@@ -533,33 +533,33 @@ error.Return=Return
 
 viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF: View Job
 viewjob.ViewAJob=View a Job
-viewjob.ScheduleType=Schedule type:
-viewjob.MinimumRecrawlInterval=Minimum recrawl interval:
-viewjob.ExpirationInterval=Expiration interval:
-viewjob.ReseedInterval=Reseed interval:
+viewjob.ScheduleTypeColon=Schedule type:
+viewjob.MinimumRecrawlIntervalColon=Minimum recrawl interval:
+viewjob.ExpirationIntervalColon=Expiration interval:
+viewjob.ReseedIntervalColon=Reseed interval:
 viewjob.NoScheduledRunTimes=No scheduled run times
-viewjob.ScheduledTime=Scheduled time:
-viewjob.MaximumRunTime=Maximum run time:
+viewjob.ScheduledTimeColon=Scheduled time:
+viewjob.MaximumRunTimeColon=Maximum run time:
 viewjob.MaximumHopCountForLinkType=Maximum hop count for link type
-viewjob.HopCountMode=Hop count mode:
+viewjob.HopCountModeColon=Hop count mode:
 viewjob.Delete=Delete
 viewjob.DeleteThisJob=Delete this job
 viewjob.Edit=Edit
 viewjob.EditThisJob=Edit this job
 viewjob.Copy=Copy
 viewjob.CopyThisJob=Copy this job
-viewjob.Name=Name:
-viewjob.OutputConnection=Output connection:
-viewjob.RepositoryConnection=Repository connection:
-viewjob.Priority=Priority:
-viewjob.StartMethod=Start method:
+viewjob.NameColon=Name:
+viewjob.OutputConnectionColon=Output connection:
+viewjob.RepositoryConnectionColon=Repository connection:
+viewjob.PriorityColon=Priority:
+viewjob.StartMethodColon=Start method:
 
 viewauthority.ViewAuthorityConnectionStatus=View Authority Connection Status
-viewauthority.Name=Name:
-viewauthority.Description=Description:
-viewauthority.AuthorityType=Authority type:
-viewauthority.MaxConnections=Max connections:
-viewauthority.ConnectionStatus=Connection status:
+viewauthority.NameColon=Name:
+viewauthority.DescriptionColon=Description:
+viewauthority.AuthorityTypeColon=Authority type:
+viewauthority.MaxConnectionsColon=Max connections:
+viewauthority.ConnectionStatusColon=Connection status:
 viewauthority.Refresh=Refresh
 viewauthority.Edit=Edit
 viewauthority.EditThisAuthorityConnection=Edit this authority connection

Modified: incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1225205&r1=1225204&r2=1225205&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties (original)
+++ incubator/lcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties Wed Dec 28 15:22:15 2011
@@ -78,7 +78,7 @@ listoutputs.AddAnOutputConnection=出
 editoutput.ApacheManifoldCFEditOutputConnection=Apache ManifoldCF:出力コネクションの編集
 editoutput.EditAnOutputConnection=出力コネクションの編集
 editoutput.EditOutputConnection2=E出力コネクションを編集
-editoutput.ConnectionType=コネクションタイプ:
+editoutput.ConnectionTypeColon=コネクションタイプ:
 editoutput.Continue=次へ
 editoutput.ContinueToNextPage=次のページに進む
 editoutput.Cancel=キャンセル
@@ -86,18 +86,18 @@ editoutput.CancelOutputConnectionEditing
 editoutput.Save=保存
 editoutput.SaveThisOutputConnection=出力コネクションを保存
 editoutput.MaxConnections=最大コネクション数
-editoutput.PerJVM=(/JVM):
+editoutput.PerJVMColon=(/JVM):
 editoutput.EditOutputConnection=出力コネクションを編集
-editoutput.Name=名前:
-editoutput.Description=説明:
+editoutput.NameColon=名前:
+editoutput.DescriptionColon=説明:
 
 viewoutput.ApacheManifoldCFViewOutputConnectionStatus=Apache ManifoldCF:出力コネクション状態を表示
 viewoutput.ViewOutputConnectionStatus=出力コネクション状態を表示
-viewoutput.Name=名前:
-viewoutput.Description=説明:
-viewoutput.ConnectionType=コネクションタイプ:
-viewoutput.MaxConnections=最大コネクション数:
-viewoutput.ConnectionStatus=コネクションの状態:
+viewoutput.NameColon=名前:
+viewoutput.DescriptionColon=説明:
+viewoutput.ConnectionTypeColon=コネクションタイプ:
+viewoutput.MaxConnectionsColon=最大コネクション数:
+viewoutput.ConnectionStatusColon=コネクションの状態:
 viewoutput.Refresh=更新
 viewoutput.EditThisOutputConnection=出力コネクションを編集
 viewoutput.Edit=編集
@@ -120,13 +120,13 @@ listauthorities.Delete=削除
 
 editauthority.ApacheManifoldCFEditAuthority=Apache ManifoldCF:権限の編集
 editauthority.EditAnAuthority=権限を編集
-editauthority.Name=名前:
-editauthority.Description=説明:
-editauthority.ConnectionType=コネクションタイプ:
+editauthority.NameColon=名前:
+editauthority.DescriptionColon=説明:
+editauthority.ConnectionTypeColon=コネクションタイプ:
 editauthority.Continue=次へ
 editauthority.ContinueToNextPage=次のページに進む
 editauthority.MaxConnections=最大コネクション数
-editauthority.PerJVM=(/JVM):
+editauthority.PerJVMColon=(/JVM):
 editauthority.Cancel=キャンセル
 editauthority.CancelAuthorityEditing=権限の編集をキャンセル
 editauthority.Save=保存
@@ -147,18 +147,18 @@ listconnections.Delete=削除
 
 editconnection.ApacheManifoldCFEditConnection=Apache ManifoldCF:コネクションを編集
 editconnection.EditAConnection=コネクションを編集
-editconnection.ConnectionType=コネクションタイプ:
-editconnection.Authority=権限:
+editconnection.ConnectionTypeColon=コネクションタイプ:
+editconnection.AuthorityColon=権限:
 editconnection.Cancel=キャンセル
 editconnection.CancelConnectionEditing=コネクションの編集をキャンセル
-editconnection.Name=名前:
-editconnection.Description=説明:
+editconnection.NameColon=名前:
+editconnection.DescriptionColon=説明:
 editconnection.Maxconnections=最大コネクション数
-editconnection.PerJVM=(/JVM):
-editconnection.Throttling=スロットリング:
+editconnection.PerJVMColon=(/JVM):
+editconnection.ThrottlingColon=スロットリング:
 editconnection.Add=追加
 editconnection.BinRegularExpression=Bin正規表現
-editconnection.Description2=説明
+editconnection.Description=説明
 editconnection.MaxAvgFetchesMin=最大平均取得/分
 editconnection.NoThrottlingSpecified=スロットリングが指定されていません
 editconnection.Continue=次へ
@@ -170,14 +170,14 @@ editconnection.GlobalAuthority=なã�
 
 viewconnection.ApacheManifoldCFViewRepositoryConnectionStatus=Apache ManifoldCF:リポジトリコネクション状態の表意
 viewconnection.ViewRepositoryConnectionStatus=リポジトリコネクション状態を表意
-viewconnection.Name=名前:
-viewconnection.Description=説明:
-viewconnection.ConnectionType=コネクションタイプ:
-viewconnection.MaxConnections=最大コネクション数:
-viewconnection.Authority=権限:
-viewconnection.Throttling=スロットリング:
+viewconnection.NameColon=名前:
+viewconnection.DescriptionColon=説明:
+viewconnection.ConnectionTypeColon=コネクションタイプ:
+viewconnection.MaxConnectionsColon=最大コネクション数:
+viewconnection.AuthorityColon=権限:
+viewconnection.ThrottlingColon=スロットリング:
 viewconnection.NoThrottles=スロットリングなし
-viewconnection.ConnectionStatus=コネクションの状態:
+viewconnection.ConnectionStatusColon=コネクションの状態:
 viewconnection.Refresh=更新
 viewconnection.EditThisConnection=コネクションの編集
 viewconnection.Edit=編集
@@ -205,33 +205,33 @@ editjob.EditaJob=ジョブã�
 editjob.EditJob=ジョブの編集
 editjob.NoRepositoryConnectionsDefinedCreateOneFirst=リポジトリコネクションが未指定です - 作成してください
 editjob.NoOutputConnectionsDefinedCreateOneFirst=出力コネクションが未指定です - 作成してください
-editjob.Name=名前:
+editjob.NameColon=名前:
 editjob.MaximumHopCountForType=タイプの最大ホップ数
-editjob.semicolon=:
+editjob.colon=:
 editjob.cancel=キャンセル
 editjob.CancelJobEditing=ジョブの編集をキャンセル
-editjob.OutputConnection=出力コネクション:
+editjob.OutputConnectionColon=出力コネクション:
 editjob.NoneSelected=未指定
-editjob.Priority=優先順位:
+editjob.PriorityColon=優先順位:
 editjob.Highest=(最大)
 editjob.Lowest=(最少低)
-editjob.StartMethod=機動方法:
-editjob.RepositoryConnection=リポジトリコネクション:
+editjob.StartMethodColon=機動方法:
+editjob.RepositoryConnectionColon=リポジトリコネクション:
 editjob.Continue=次へ
 editjob.ContinueToNextScreen=次のページに移動
 editjob.StartWhenScheduleWindowStarts=ウインドウを機動した時に開始
 editjob.StartEvenInsideAScheduleWindow=スケジュールウインドウ内でも開始
 editjob.DontAutomaticallyStartThisJob=ジョブを自動的に開始しない
 
-editjob.ScheduleType=スケジュールタイプ:
+editjob.ScheduleTypeColon=スケジュールタイプ:
 editjob.RescanDocumentsDynamically=動的にコンテンツを再スキャン
 editjob.ScanEveryDocumentOnce=すべてのコンテンツを1回スキャン
-editjob.RecrawlIntervalIfContinuous=再読込み間隔 (継続の場合):
+editjob.RecrawlIntervalIfContinuousColon=再読込み間隔 (継続の場合):
 editjob.minutesBlankInfinity=分 (空白=無限)
-editjob.ExpirationIntervalIfContinuous=失効間隔 (継続の場合):
-editjob.ReseedIntervalIfContinuous=再シード間隔 (継続の場合):
+editjob.ExpirationIntervalIfContinuousColon=失効間隔 (継続の場合):
+editjob.ReseedIntervalIfContinuousColon=再シード間隔 (継続の場合):
 editjob.NoScheduleSpecified=スケジュールが指定されていません
-editjob.ScheduledTime=スケジュール時間:
+editjob.ScheduledTimeColon=スケジュール時間:
 editjob.AnyDayOfWeek=すべての曜日
 editjob.Sundays=日
 editjob.Mondays=月
@@ -261,12 +261,12 @@ editjob.November=11月
 editjob.December=12月
 editjob.on=
 editjob.AnyDayOfMonth=すべての日
-editjob.MaximumRunTime=最大実行時間:
+editjob.MaximumRunTimeColon=最大実行時間:
 editjob.RemoveSchedule=スケジュールを削除
 editjob.DeleteUnreachableDocuments=読込めないコンテンツ情報は削除
 editjob.KeepUnreachableDocumentsForNow=読込めないコンテンツ情報は一時的に保存
 editjob.KeepUnreachableDocumentsForever=読込めないコンテンツ情報は永久保存
-editjob.HopCountMode=ホップ数モード:
+editjob.HopCountModeColon=ホップ数モード:
 editjob.Save=保存
 editjob.SaveThisJob=ジョブを保存
 
@@ -533,33 +533,33 @@ error.Return=戻る
 
 viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF:ジョブ情報
 viewjob.ViewAJob=ジョブ情報
-viewjob.ScheduleType=スケジュールタイプ:
-viewjob.MinimumRecrawlInterval=最小再読込み間隔:
-viewjob.ExpirationInterval=失効間隔:
-viewjob.ReseedInterval=再シード間隔:
+viewjob.ScheduleTypeColon=スケジュールタイプ:
+viewjob.MinimumRecrawlIntervalColon=最小再読込み間隔:
+viewjob.ExpirationIntervalColon=失効間隔:
+viewjob.ReseedIntervalColon=再シード間隔:
 viewjob.NoScheduledRunTimes=スケジュールされた実行時間がありません
-viewjob.ScheduledTime=スケジュール時間:
-viewjob.MaximumRunTime=最大実行時間:
+viewjob.ScheduledTimeColon=スケジュール時間:
+viewjob.MaximumRunTimeColon=最大実行時間:
 viewjob.MaximumHopCountForLinkType=リンクタイプの最大ホップ数
-viewjob.HopCountMode=ホップ数モード:
+viewjob.HopCountModeColon=ホップ数モード:
 viewjob.Delete=削除
 viewjob.DeleteThisJob=ジョブを削除
 viewjob.Edit=編集
 viewjob.EditThisJob=ジョブを編集
 viewjob.Copy=コピー
 viewjob.CopyThisJob=ジョブをコピー
-viewjob.Name=名前:
-viewjob.OutputConnection=出力コネクション:
-viewjob.RepositoryConnection=リポジトリコネクション:
-viewjob.Priority=優先順位:
-viewjob.StartMethod=開始メソッド:
+viewjob.NameColon=名前:
+viewjob.OutputConnectionColon=出力コネクション:
+viewjob.RepositoryConnectionColon=リポジトリコネクション:
+viewjob.PriorityColon=優先順位:
+viewjob.StartMethodColon=開始メソッド:
 
 viewauthority.ViewAuthorityConnectionStatus=権限コネクション状態の表示
-viewauthority.Name=名前:
-viewauthority.Description=説明:
-viewauthority.AuthorityType=権限タイプ:
-viewauthority.MaxConnections=最大コネクション:
-viewauthority.ConnectionStatus=コネクション状態:
+viewauthority.NameColon=名前:
+viewauthority.DescriptionColon=説明:
+viewauthority.AuthorityTypeColon=権限タイプ:
+viewauthority.MaxConnectionsColon=最大コネクション:
+viewauthority.ConnectionStatusColon=コネクション状態:
 viewauthority.Refresh=更新
 viewauthority.Edit=編集
 viewauthority.EditThisAuthorityConnection=権限コネクションを編集



Mime
View raw message