Mailing-List: contact connectors-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
Reply-To: connectors-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1229229 - in
 /incubator/lcf/trunk/connectors/rss/connector/src/main:
 java/org/apache/manifoldcf/crawler/connectors/rss/
 native2ascii/org/apache/manifoldcf/crawler/connectors/rss/
Date: Mon, 09 Jan 2012 16:04:53 -0000
To: connectors-commits@incubator.apache.org
From: kwright@apache.org
Message-Id: <20120109160454.04C3423888CD@eris.apache.org>

Author: kwright
Date: Mon Jan  9 16:04:53 2012
New Revision: 1229229

URL: http://svn.apache.org/viewvc?rev=1229229&view=rev
Log:
Patch for CONNECTORS-364.  Further patches will be required.

Modified:
    incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
    incubator/lcf/trunk/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_en_US.properties
    incubator/lcf/trunk/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_ja_JP.properties

Modified: incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java?rev=1229229&r1=1229228&r2=1229229&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java (original)
+++ incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java Mon Jan  9 16:04:53 2012
@@ -1568,25 +1568,25 @@ public class RSSConnector extends org.ap
 "{\n"+
 "  if (editconnection.email.value != \"\" && editconnection.email.value.indexOf(\"@\") == -1)\n"+
 "  {\n"+
-"    alert(\"Need a valid email address\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.NeedAValidEmailAddress")+");\n"+
 "    editconnection.email.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.bandwidth.value != \"\" && !isInteger(editconnection.bandwidth.value))\n"+
 "  {\n"+
-"    alert(\"Enter a valid number, or blank for no limit\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.EnterAValidNumberOrBlankForNoLimit")+");\n"+
 "    editconnection.bandwidth.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.connections.value == \"\" || !isInteger(editconnection.connections.value))\n"+
 "  {\n"+
-"    alert(\"Enter a valid number for the max number of open connections per server\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.EnterAValidNumberForTheMaxNumberOfOpenConnectionsPerServer")+");\n"+
 "    editconnection.connections.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.fetches.value != \"\" && !isInteger(editconnection.fetches.value))\n"+
 "  {\n"+
-"    alert(\"Enter a valid number, or blank for no limit\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.EnterAValidNumberOrBlankForNoLimit")+");\n"+
 "    editconnection.fetches.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -1597,7 +1597,7 @@ public class RSSConnector extends org.ap
 "{\n"+
 "  if (editconnection.email.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Email address required, to be included in all request headers\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.EmailAddressRequiredToBeIncludedInAllRequestHeaders")+");\n"+
 "    SelectTab(\"Email\");\n"+
 "    editconnection.email.focus();\n"+
 "    return false;\n"+
@@ -1863,7 +1863,7 @@ public class RSSConnector extends org.ap
       {
         IKeystoreManager kmanager = KeystoreManagerFactory.make("",value);
         out.print(
-"      <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(param)+"=<"+Integer.toString(kmanager.getContents().length)+" certificate(s)></nobr><br/>\n"
+"      <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(param)+"=<"+Integer.toString(kmanager.getContents().length)+Messages.getString(locale,"RSSConnector.certificates")+"></nobr><br/>\n"
         );
       }
       else
@@ -1911,7 +1911,7 @@ public class RSSConnector extends org.ap
 "{\n"+
 "  if (editjob.rssmatch.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Match must have a regexp value\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.MatchMustHaveARegexpValue")+");\n"+
 "    editjob.rssmatch.focus();\n"+
 "    return;\n"+
 "  }\n"+
@@ -1929,7 +1929,7 @@ public class RSSConnector extends org.ap
 "{\n"+
 "  if (editjob.spectoken.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Type in an access token\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.TypeInAnAccessToken")+");\n"+
 "    editjob.spectoken.focus();\n"+
 "    return;\n"+
 "  }\n"+
@@ -1940,13 +1940,13 @@ public class RSSConnector extends org.ap
 "{\n"+
 "  if (editjob.specmetaname.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Type in metadata name\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.TypeInMetadataName")+");\n"+
 "    editjob.specmetaname.focus();\n"+
 "    return;\n"+
 "  }\n"+
 "  if (editjob.specmetavalue.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Type in metadata value\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.TypeInMetadataValue")+");\n"+
 "    editjob.specmetavalue.focus();\n"+
 "    return;\n"+
 "  }\n"+
@@ -1968,25 +1968,25 @@ public class RSSConnector extends org.ap
 "{\n"+
 "  if (editjob.feedtimeout.value == \"\" || !isInteger(editjob.feedtimeout.value))\n"+
 "  {\n"+
-"    alert(\"A timeout value, in seconds, is required\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.ATimeoutValueInSecondsIsRequired")+");\n"+
 "    editjob.feedtimeout.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editjob.feedrefetch.value == \"\" || !isInteger(editjob.feedrefetch.value))\n"+
 "  {\n"+
-"    alert(\"A refetch interval, in minutes, is required\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.ARefetchIntervalInMinutesIsRequired")+");\n"+
 "    editjob.feedrefetch.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editjob.minfeedrefetch.value == \"\" || !isInteger(editjob.minfeedrefetch.value))\n"+
 "  {\n"+
-"    alert(\"A minimum refetch interval, in minutes, is required\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.AMinimumRefetchIntervalInMinutesIsRequire")+");\n"+
 "    editjob.minfeedrefetch.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editjob.badfeedrefetch.value != \"\" && !isInteger(editjob.badfeedrefetch.value))\n"+
 "  {\n"+
-"    alert(\"A bad feed refetch interval, in minutes, is required\");\n"+
+"    alert("+Messages.getString(locale,"RSSConnector.ABadFeedRefetchIntervalInMinutesIsRequired")+");\n"+
 "    editjob.badfeedrefetch.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -2106,13 +2106,13 @@ public class RSSConnector extends org.ap
 "      <table class=\"formtable\">\n"+
 "        <tr class=\"formheaderrow\">\n"+
 "          <td class=\"formcolumnheader\"></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>URL regular expression</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Description</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Reorder?</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Remove JSP sessions?</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Remove ASP sessions?</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Remove PHP sessions?</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Remove BV sessions?</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.URLRegularExpression")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.Description")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.Reorder")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.RemoveJSPSessions")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.RemoveASPSessions")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.RemovePHPSessions")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.RemoveBVSessions")+"</nobr></td>\n"+
 "        </tr>\n"
       );
       int q = 0;
@@ -2146,7 +2146,7 @@ public class RSSConnector extends org.ap
 "        <tr class=\""+(((l % 2)==0)?"evenformrow":"oddformrow")+"\">\n"+
 "          <td class=\"formcolumncell\">\n"+
 "            <a name=\""+"urlregexp_"+Integer.toString(l)+"\">\n"+
-"              <input type=\"button\" value=\"Delete\" alt=\""+"Delete url regexp "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(regexpString)+"\" onclick='javascript:URLRegexpDelete("+Integer.toString(l)+",\"urlregexp_"+Integer.toString(l)+"\");'/>\n"+
+"              <input type=\"button\" value=\"Delete\" alt=\""+Messages.getString(locale,"RSSConnector.DeleteUrlRegexp")+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(regexpString)+"\" onclick='javascript:URLRegexpDelete("+Integer.toString(l)+",\"urlregexp_"+Integer.toString(l)+"\");'/>\n"+
 "            </a>\n"+
 "          </td>\n"+
 "          <td class=\"formcolumncell\">\n"+
@@ -2174,7 +2174,7 @@ public class RSSConnector extends org.ap
       if (l == 0)
       {
         out.print(
-"        <tr class=\"formrow\"><td colspan=\"8\" class=\"formcolumnmessage\"><nobr>No canonicalization specified - all URLs will be reordered and have all sessions removed</nobr></td></tr>\n"
+"        <tr class=\"formrow\"><td colspan=\"8\" class=\"formcolumnmessage\"><nobr>"+Messages.getString(locale,"RSSConnector.NoCanonicalizationSpecified")+"</nobr></td></tr>\n"
         );
       }
       out.print(
@@ -2182,7 +2182,7 @@ public class RSSConnector extends org.ap
 "        <tr class=\"formrow\">\n"+
 "          <td class=\"formcolumncell\">\n"+
 "            <a name=\""+"urlregexp_"+Integer.toString(l)+"\">\n"+
-"              <input type=\"button\" value=\"Add\" alt=\"Add url regexp\" onclick='javascript:URLRegexpAdd(\"urlregexp_"+Integer.toString(l+1)+"\");'/>\n"+
+"              <input type=\"button\" value=\"Add\" alt=\""+Messages.getString(locale,"RSSConnector.AddUlRegexp")+"\" onclick='javascript:URLRegexpAdd(\"urlregexp_"+Integer.toString(l+1)+"\");'/>\n"+
 "              <input type=\"hidden\" name=\"urlregexpcount\" value=\""+Integer.toString(l)+"\"/>\n"+
 "            </a>\n"+
 "          </td>\n"+
@@ -2268,7 +2268,7 @@ public class RSSConnector extends org.ap
 "  <tr>\n"+
 "    <td class=\"value\">\n"+
 "      <a name=\""+"regexp_"+Integer.toString(i)+"\">\n"+
-"        <input type=\"button\" value=\"Remove\" onclick='javascript:RemoveRegexp("+Integer.toString(i)+",\"regexp_"+Integer.toString(i)+"\")' alt=\""+"Remove regexp #"+Integer.toString(i)+"\"/>\n"+
+"        <input type=\"button\" value=\"Remove\" onclick='javascript:RemoveRegexp("+Integer.toString(i)+",\"regexp_"+Integer.toString(i)+"\")' alt=\""+Messages.getString(locale,"RSSConnector.RemoveRegexp")+Integer.toString(i)+"\"/>\n"+
 "      </a>\n"+
 "    </td>\n"+
 "    <td class=\"value\"><input type=\"hidden\" name=\""+prefix+"match"+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape((String)regexp.get(i))+"\"/>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape((String)regexp.get(i))+"</td>\n"+
@@ -2299,7 +2299,7 @@ public class RSSConnector extends org.ap
       }
       out.print(
 "  <tr>\n"+
-"    <td class=\"value\"><a name=\""+"regexp_"+Integer.toString(i)+"\"><input type=\"button\" value=\"Add\" onclick='javascript:AddRegexp(\"regexp_"+Integer.toString(i+1)+"\")' alt=\"Add regexp\"/></a></td>\n"+
+"    <td class=\"value\"><a name=\""+"regexp_"+Integer.toString(i)+"\"><input type=\"button\" value=\"Add\" onclick='javascript:AddRegexp(\"regexp_"+Integer.toString(i+1)+"\")' alt=\""+Messages.getString(locale,"RSSConnector.AddRegexp")+"\"/></a></td>\n"+
 "    <td class=\"value\"><input type=\"text\" name=\"rssmatch\" size=\"16\" value=\"\"/></td>\n"+
 "    <td class=\"value\">==></td>\n"+
 "    <td class=\"value\"><input type=\"text\" name=\"rssmap\" size=\"16\" value=\"\"/></td>\n"+
@@ -2332,19 +2332,19 @@ public class RSSConnector extends org.ap
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Feed connect timeout (seconds):</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.FeedConnectTimeout")+"</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"5\" name=\"feedtimeout\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(Integer.toString(feedTimeoutValue))+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Default feed refetch time (minutes)</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.DefaultFeedRefetchTime")+"</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"5\" name=\"feedrefetch\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(Integer.toString(feedRefetchValue))+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Minimum feed refetch time (minutes)</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.MinimumFeedRefetchTime")+"</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"5\" name=\"minfeedrefetch\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(Integer.toString(minFeedRefetchValue))+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Bad feed refetch time (minutes)</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.BadFeedRefetchTime")+"</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <input type=\"hidden\" name=\"badfeedrefetch_present\" value=\"true\"/>\n"+
 "      <input type=\"text\" size=\"5\" name=\"badfeedrefetch\" value=\""+((badFeedRefetchValue==null)?"":org.apache.manifoldcf.ui.util.Encoder.attributeEscape(badFeedRefetchValue.toString()))+"\"/>\n"+
@@ -2383,22 +2383,22 @@ public class RSSConnector extends org.ap
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"1\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"value\"><nobr><input type=\"radio\" name=\"dechromedmode\" value=\"none\" "+(dechromedMode.equals("none")?"checked=\"true\"":"")+"/>&nbsp;No dechromed content</nobr></td>\n"+
+"    <td class=\"value\"><nobr><input type=\"radio\" name=\"dechromedmode\" value=\"none\" "+(dechromedMode.equals("none")?"checked=\"true\"":"")+"/>"+Messages.getString(locale,"RSSConnector.NoDechromedContent")+"</nobr></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"value\"><nobr><input type=\"radio\" name=\"dechromedmode\" value=\"description\" "+(dechromedMode.equals("description")?"checked=\"true\"":"")+"/>&nbsp;Dechromed content, if present, in 'description' field</nobr></td>\n"+
+"    <td class=\"value\"><nobr><input type=\"radio\" name=\"dechromedmode\" value=\"description\" "+(dechromedMode.equals("description")?"checked=\"true\"":"")+"/>"+Messages.getString(locale,"RSSConnector.DechromedContentIfPresentInDescriptionField")+"</nobr></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"value\"><nobr><input type=\"radio\" name=\"dechromedmode\" value=\"content\" "+(dechromedMode.equals("content")?"checked=\"true\"":"")+"/>&nbsp;Dechromed content, if present, in 'content' field</nobr></td>\n"+
+"    <td class=\"value\"><nobr><input type=\"radio\" name=\"dechromedmode\" value=\"content\" "+(dechromedMode.equals("content")?"checked=\"true\"":"")+"/>"+Messages.getString(locale,"RSSConnector.ContentIfPresentInContentField")+"</nobr></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
 "    <td class=\"separator\"><hr/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"value\"><nobr><input type=\"radio\" name=\"chromedmode\" value=\"use\" "+(chromedMode.equals("use")?"checked=\"true\"":"")+"/>&nbsp;Use chromed content if no dechromed content found</nobr></td>\n"+
+"    <td class=\"value\"><nobr><input type=\"radio\" name=\"chromedmode\" value=\"use\" "+(chromedMode.equals("use")?"checked=\"true\"":"")+"/>"+Messages.getString(locale,"RSSConnector.UseChromedContentIfNoDechromedContentFound")+"</nobr></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"value\"><nobr><input type=\"radio\" name=\"chromedmode\" value=\"skip\" "+(chromedMode.equals("skip")?"checked=\"true\"":"")+"/>&nbsp;Never use chromed content</nobr></td>\n"+
+"    <td class=\"value\"><nobr><input type=\"radio\" name=\"chromedmode\" value=\"skip\" "+(chromedMode.equals("skip")?"checked=\"true\"":"")+"/>"+Messages.getString(locale,"RSSConnector.NeverUseChromedContent")+"</nobr></td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -2438,7 +2438,7 @@ public class RSSConnector extends org.ap
 "      <input type=\"hidden\" name=\""+accessOpName+"\" value=\"\"/>\n"+
 "      <input type=\"hidden\" name=\""+"spectoken"+accessDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(token)+"\"/>\n"+
 "      <a name=\""+"token_"+Integer.toString(k)+"\">\n"+
-"        <input type=\"button\" value=\"Delete\" onClick='Javascript:SpecOp(\""+accessOpName+"\",\"Delete\",\"token_"+Integer.toString(k)+"\")' alt=\""+"Delete token #"+Integer.toString(k)+"\"/>\n"+
+"        <input type=\"button\" value=\"Delete\" onClick='Javascript:SpecOp(\""+accessOpName+"\",\"Delete\",\"token_"+Integer.toString(k)+"\")' alt=\""+Messages.getString(locale,"RSSConnector.DeleteToken")+Integer.toString(k)+"\"/>\n"+
 "      </a>&nbsp;\n"+
 "    </td>\n"+
 "    <td class=\"value\">\n"+
@@ -2464,7 +2464,7 @@ public class RSSConnector extends org.ap
 "      <input type=\"hidden\" name=\"tokencount\" value=\""+Integer.toString(k)+"\"/>\n"+
 "      <input type=\"hidden\" name=\"accessop\" value=\"\"/>\n"+
 "      <a name=\""+"token_"+Integer.toString(k)+"\">\n"+
-"        <input type=\"button\" value=\"Add\" onClick='Javascript:SpecAddToken(\"token_"+Integer.toString(k+1)+"\")' alt=\"Add access token\"/>\n"+
+"        <input type=\"button\" value=\"Add\" onClick='Javascript:SpecAddToken(\"token_"+Integer.toString(k+1)+"\")' alt=\""+Messages.getString(locale,"RSSConnector.AddAccessToken")+"\"/>\n"+
 "      </a>&nbsp;\n"+
 "    </td>\n"+
 "    <td class=\"value\">\n"+
@@ -2523,7 +2523,7 @@ public class RSSConnector extends org.ap
 "      <input type=\"hidden\" name=\""+"specmetaname"+metadataDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)+"\"/>\n"+
 "      <input type=\"hidden\" name=\""+"specmetavalue"+metadataDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(value)+"\"/>\n"+
 "      <a name=\""+"metadata_"+Integer.toString(k)+"\">\n"+
-"        <input type=\"button\" value=\"Delete\" onClick='Javascript:SpecOp(\""+metadataOpName+"\",\"Delete\",\"metadata_"+Integer.toString(k)+"\")' alt=\""+"Delete metadata #"+Integer.toString(k)+"\"/>\n"+
+"        <input type=\"button\" value=\"Delete\" onClick='Javascript:SpecOp(\""+metadataOpName+"\",\"Delete\",\"metadata_"+Integer.toString(k)+"\")' alt=\""+Messages.getString(locale,"RSSConnector.DeleteMetadata")+Integer.toString(k)+"\"/>\n"+
 "      </a>&nbsp;\n"+
 "    </td>\n"+
 "    <td class=\"value\">\n"+
@@ -2543,7 +2543,7 @@ public class RSSConnector extends org.ap
       {
         out.print(
 "  <tr>\n"+
-"    <td class=\"message\" colspan=\"4\">No metadata present</td>\n"+
+"    <td class=\"message\" colspan=\"4\">"+Messages.getString(locale,"RSSConnector.NoMetadataPresent")+"</td>\n"+
 "  </tr>\n"
         );
       }
@@ -2554,7 +2554,7 @@ public class RSSConnector extends org.ap
 "      <input type=\"hidden\" name=\"metadatacount\" value=\""+Integer.toString(k)+"\"/>\n"+
 "      <input type=\"hidden\" name=\"metadataop\" value=\"\"/>\n"+
 "      <a name=\""+"metadata_"+Integer.toString(k)+"\">\n"+
-"        <input type=\"button\" value=\"Add\" onClick='Javascript:SpecAddMetadata(\"metadata_"+Integer.toString(k+1)+"\")' alt=\"Add metadata\"/>\n"+
+"        <input type=\"button\" value=\"Add\" onClick='Javascript:SpecAddMetadata(\"metadata_"+Integer.toString(k+1)+"\")' alt=\""+Messages.getString(locale,"RSSConnector.AddMetadata")+"\"/>\n"+
 "      </a>&nbsp;\n"+
 "    </td>\n"+
 "    <td class=\"value\">\n"+
@@ -3046,7 +3046,7 @@ public class RSSConnector extends org.ap
         {
           out.print(
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>RSS urls:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.RSSUrls")+"</nobr></td>\n"+
 "    <td class=\"value\">\n"
           );
           seenAny = true;
@@ -3067,7 +3067,7 @@ public class RSSConnector extends org.ap
     else
     {
       out.print(
-"  <tr><td class=\"message\" colspan=\"2\"><nobr>No RSS urls specified</nobr></td></tr>\n"
+"  <tr><td class=\"message\" colspan=\"2\"><nobr>"+Messages.getString(locale,"RSSConnector.NoRSSUrlsSpecified")+"</nobr></td></tr>\n"
       );
     }
     out.print(
@@ -3085,17 +3085,17 @@ public class RSSConnector extends org.ap
         {
           out.print(
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>URL canonicalization:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.URLCanonicalization")+"</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <table class=\"formtable\">\n"+
 "        <tr class=\"formheaderrow\">\n"+
-"          <td class=\"formcolumnheader\"><nobr>URL regexp</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Description</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Reorder?</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Remove JSP sessions?</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Remove ASP sessions?</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Remove PHP sessions?</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Remove BV sessions?</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.URLRegexp")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.Description")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.Reorder")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.RemoveJSPSessions")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.RemoveASPSessions")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.RemovePHPSessions")+"</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>"+Messages.getString(locale,"RSSConnector.RemoveBVSessions")+"</nobr></td>\n"+
 "        </tr>\n"
           );
         }
@@ -3143,7 +3143,7 @@ public class RSSConnector extends org.ap
     else
     {
       out.print(
-"  <tr><td class=\"message\" colspan=\"2\"><nobr>No url canonicalization specified; will reorder all urls and remove all sessions</nobr></td></tr>\n"
+"  <tr><td class=\"message\" colspan=\"2\"><nobr>"+Messages.getString(locale,"RSSConnector.NoCanonicalizationSpecified")+"</nobr></td></tr>\n"
       );
     }
 
@@ -3161,7 +3161,7 @@ public class RSSConnector extends org.ap
         {
           out.print(
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>URL mappings:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.URLMappings")+"</nobr></td>\n"+
 "    <td class=\"value\">\n"
           );
           seenAny = true;
@@ -3193,7 +3193,7 @@ public class RSSConnector extends org.ap
     else
     {
       out.print(
-"  <tr><td class=\"message\" colspan=\"2\"><nobr>No mappings specified; will accept all urls</nobr></td></tr>\n"
+"  <tr><td class=\"message\" colspan=\"2\"><nobr>"+Messages.getString(locale,"RSSConnector.NoMappingsSpecifiedWillAcceptAllUrls")+"</nobr></td></tr>\n"
       );
     }
     out.print(
@@ -3236,19 +3236,19 @@ public class RSSConnector extends org.ap
     }
     out.print(
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Feed connection timeout (seconds):</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.FeedConnectionTimeout")+"</nobr></td>\n"+
 "    <td class=\"value\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(feedTimeoutValue)+"</td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Default feed rescan interval (minutes):</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.DefaultFeedRescanInterval")+"</nobr></td>\n"+
 "    <td class=\"value\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(feedRefetchValue)+"</td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Minimum feed rescan interval (minutes):</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.MinimumFeedRescanInterval")+"</nobr></td>\n"+
 "    <td class=\"value\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(minFeedRefetchValue)+"</td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Bad feed rescan interval (minutes):</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.BadFeedRescanInterval")+"</nobr></td>\n"+
 "    <td class=\"value\">"+((badFeedRefetchValue==null)?"(Default feed rescan value)":org.apache.manifoldcf.ui.util.Encoder.bodyEscape(badFeedRefetchValue))+"</td>\n"+
 
 "  </tr>\n"+
@@ -3256,11 +3256,11 @@ public class RSSConnector extends org.ap
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Dechromed content source:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.DechromedContentSource")+"</nobr></td>\n"+
 "    <td class=\"value\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(dechromedMode)+"</td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Chromed content:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.ChromedContent")+"</nobr></td>\n"+
 "    <td class=\"value\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(chromedMode)+"</td>\n"+
 "  </tr>\n"+
 "\n"+
@@ -3277,7 +3277,7 @@ public class RSSConnector extends org.ap
         if (seenAny == false)
         {
           out.print(
-"  <tr><td class=\"description\"><nobr>Access tokens:</nobr></td>\n"+
+"  <tr><td class=\"description\"><nobr>"+Messages.getString(locale,"RSSConnector.AccessTokens")+"</nobr></td>\n"+
 "    <td class=\"value\">\n"
           );
           seenAny = true;

Modified: incubator/lcf/trunk/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_en_US.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_en_US.properties?rev=1229229&r1=1229228&r2=1229229&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_en_US.properties (original)
+++ incubator/lcf/trunk/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_en_US.properties Mon Jan  9 16:04:53 2012
@@ -43,4 +43,56 @@ RSSConnector.NoAccessTokensSpecified=No 
 RSSConnector.MetadataColon=Metadata:
 RSSConnector.NoMetadataSpecified=No metadata specified
 RSSConnector.NoAccessTokensPresent=No access tokens present
+RSSConnector.NeedAValidEmailAddress=\"Need a valid email address\"
+RSSConnector.EnterAValidNumberOrBlankForNoLimit=\"Enter a valid number, or blank for no limit\"
+RSSConnector.EnterAValidNumberForTheMaxNumberOfOpenConnectionsPerServer=\"Enter a valid number for the max number of open connections per server\"
+RSSConnector.EmailAddressRequiredToBeIncludedInAllRequestHeaders=\"Email address required, to be included in all request headers\"
+RSSConnector.certificates= certificate(s)
+RSSConnector.MatchMustHaveARegexpValue=\"Match must have a regexp value\"
+RSSConnector.TypeInAnAccessToken=\"Type in an access token\"
+RSSConnector.TypeInMetadataName=\"Type in metadata name\"
+RSSConnector.TypeInMetadataValue=\"Type in metadata value\"
+RSSConnector.ATimeoutValueInSecondsIsRequired=\"A timeout value, in seconds, is required\"
+RSSConnector.ARefetchIntervalInMinutesIsRequired=\"A refetch interval, in minutes, is required\"
+RSSConnector.AMinimumRefetchIntervalInMinutesIsRequire=\"A minimum refetch interval, in minutes, is required\"
+RSSConnector.ABadFeedRefetchIntervalInMinutesIsRequired=\"A bad feed refetch interval, in minutes, is required\"
+RSSConnector.URLRegularExpression=URL regular expression
+RSSConnector.Description=Description
+RSSConnector.Reorder=Reorder?
+RSSConnector.RemoveJSPSessions=Remove JSP sessions?
+RSSConnector.RemoveASPSessions=Remove ASP sessions?
+RSSConnector.RemovePHPSessions=Remove PHP sessions?
+RSSConnector.RemoveBVSessions=Remove BV sessions?
+RSSConnector.DeleteUrlRegexp=Delete url regexp
+RSSConnector.NoCanonicalizationSpecified=No canonicalization specified - all URLs will be reordered and have all sessions removed
+RSSConnector.AddUlRegexp=Add url regexp
+RSSConnector.RemoveRegexp=Remove regexp #
+RSSConnector.AddRegexp=Add regexp
+RSSConnector.FeedConnectTimeout=Feed connect timeout (seconds):
+RSSConnector.DefaultFeedRefetchTime=Default feed refetch time (minutes)
+RSSConnector.MinimumFeedRefetchTime=Minimum feed refetch time (minutes)
+RSSConnector.BadFeedRefetchTime=Bad feed refetch time (minutes)
+RSSConnector.NoDechromedContent=&nbsp;No dechromed content
+RSSConnector.DechromedContentIfPresentInDescriptionField=&nbsp;Dechromed content, if present, in 'description' field
+RSSConnector.Dechromed ContentIfPresentInContentField=&nbsp;Dechromed content, if present, in 'content' field
+RSSConnector.UseChromedContentIfNoDechromedContentFound=&nbsp;Use chromed content if no dechromed content found
+RSSConnector.NeverUseChromedContent=&nbsp;Never use chromed content
+RSSConnector.DeleteToken=Delete token #
+RSSConnector.AddAccessToken=Add access token
+RSSConnector.DeleteMetadata=Delete metadata #
+RSSConnector.NoMetadataPresent=No metadata present
+RSSConnector.AddMetadata=Add metadata
+RSSConnector.RSSUrls=RSS urls:
+RSSConnector.NoRSSUrlsSpecified=No RSS urls specified
+RSSConnector.URLCanonicalization=URL canonicalization:
+RSSConnector.URLRegexp=URL regexp
+RSSConnector.URLMappings=URL mappings:
+RSSConnector.NoMappingsSpecifiedWillAcceptAllUrls=No mappings specified; will accept all urls
+RSSConnector.FeedConnectionTimeout=Feed connection timeout (seconds):
+RSSConnector.DefaultFeedRescanInterval=Default feed rescan interval (minutes):
+RSSConnector.MinimumFeedRescanInterval=Minimum feed rescan interval (minutes):
+RSSConnector.BadFeedRescanInterval=Bad feed rescan interval (minutes):
+RSSConnector.DechromedContentSource=Dechromed content source:
+RSSConnector.ChromedContent=Chromed content:
+RSSConnector.AccessTokens=Access tokens:
 

Modified: incubator/lcf/trunk/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_ja_JP.properties?rev=1229229&r1=1229228&r2=1229229&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_ja_JP.properties (original)
+++ incubator/lcf/trunk/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_ja_JP.properties Mon Jan  9 16:04:53 2012
@@ -43,4 +43,56 @@ RSSConnector.NoAccessTokensSpecified=ã�
 RSSConnector.MetadataColon=ã¡ã¿ãã¼ã¿ï¼
 RSSConnector.NoMetadataSpecified=ã¡ã¿ãã¼ã¿ãæå®ãã¦ãã ãã
 RSSConnector.NoAccessTokensPresent=ã¢ã¯ã»ã¹ãã¼ã¯ã³ãå­å¨ãã¾ãã
+RSSConnector.NeedAValidEmailAddress=\"Need a valid email address\"
+RSSConnector.EnterAValidNumberOrBlankForNoLimit=\"Enter a valid number, or blank for no limit\"
+RSSConnector.EnterAValidNumberForTheMaxNumberOfOpenConnectionsPerServer=\"Enter a valid number for the max number of open connections per server\"
+RSSConnector.EmailAddressRequiredToBeIncludedInAllRequestHeaders=\"Email address required, to be included in all request headers\"
+RSSConnector.certificates= certificate(s)
+RSSConnector.MatchMustHaveARegexpValue=\"Match must have a regexp value\"
+RSSConnector.TypeInAnAccessToken=\"Type in an access token\"
+RSSConnector.TypeInMetadataName=\"Type in metadata name\"
+RSSConnector.TypeInMetadataValue=\"Type in metadata value\"
+RSSConnector.ATimeoutValueInSecondsIsRequired=\"A timeout value, in seconds, is required\"
+RSSConnector.ARefetchIntervalInMinutesIsRequired=\"A refetch interval, in minutes, is required\"
+RSSConnector.AMinimumRefetchIntervalInMinutesIsRequire=\"A minimum refetch interval, in minutes, is required\"
+RSSConnector.ABadFeedRefetchIntervalInMinutesIsRequired=\"A bad feed refetch interval, in minutes, is required\"
+RSSConnector.URLRegularExpression=URL regular expression
+RSSConnector.Description=Description
+RSSConnector.Reorder=Reorder?
+RSSConnector.RemoveJSPSessions=Remove JSP sessions?
+RSSConnector.RemoveASPSessions=Remove ASP sessions?
+RSSConnector.RemovePHPSessions=Remove PHP sessions?
+RSSConnector.RemoveBVSessions=Remove BV sessions?
+RSSConnector.DeleteUrlRegexp=Delete url regexp
+RSSConnector.NoCanonicalizationSpecified=No canonicalization specified - all URLs will be reordered and have all sessions removed
+RSSConnector.AddUlRegexp=Add url regexp
+RSSConnector.RemoveRegexp=Remove regexp #
+RSSConnector.AddRegexp=Add regexp
+RSSConnector.FeedConnectTimeout=Feed connect timeout (seconds):
+RSSConnector.DefaultFeedRefetchTime=Default feed refetch time (minutes)
+RSSConnector.MinimumFeedRefetchTime=Minimum feed refetch time (minutes)
+RSSConnector.BadFeedRefetchTime=Bad feed refetch time (minutes)
+RSSConnector.NoDechromedContent=&nbsp;No dechromed content
+RSSConnector.DechromedContentIfPresentInDescriptionField=&nbsp;Dechromed content, if present, in 'description' field
+RSSConnector.Dechromed ContentIfPresentInContentField=&nbsp;Dechromed content, if present, in 'content' field
+RSSConnector.UseChromedContentIfNoDechromedContentFound=&nbsp;Use chromed content if no dechromed content found
+RSSConnector.NeverUseChromedContent=&nbsp;Never use chromed content
+RSSConnector.DeleteToken=Delete token #
+RSSConnector.AddAccessToken=Add access token
+RSSConnector.DeleteMetadata=Delete metadata #
+RSSConnector.NoMetadataPresent=No metadata present
+RSSConnector.AddMetadata=Add metadata
+RSSConnector.RSSUrls=RSS urls:
+RSSConnector.NoRSSUrlsSpecified=No RSS urls specified
+RSSConnector.URLCanonicalization=URL canonicalization:
+RSSConnector.URLRegexp=URL regexp
+RSSConnector.URLMappings=URL mappings:
+RSSConnector.NoMappingsSpecifiedWillAcceptAllUrls=No mappings specified; will accept all urls
+RSSConnector.FeedConnectionTimeout=Feed connection timeout (seconds):
+RSSConnector.DefaultFeedRescanInterval=Default feed rescan interval (minutes):
+RSSConnector.MinimumFeedRescanInterval=Minimum feed rescan interval (minutes):
+RSSConnector.BadFeedRescanInterval=Bad feed rescan interval (minutes):
+RSSConnector.DechromedContentSource=Dechromed content source:
+RSSConnector.ChromedContent=Chromed content:
+RSSConnector.AccessTokens=Access tokens: