You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/10/26 06:01:06 UTC
svn commit: r1634274 - in /manifoldcf/branches/dev_1x: ./ connectors/rss/
connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/
connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/c...
Author: kwright
Date: Sun Oct 26 05:01:06 2014
New Revision: 1634274
URL: http://svn.apache.org/r1634274
Log:
Pull up fix for CONNECTORS-1084 from trunk
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/connectors/rss/ (props changed)
manifoldcf/branches/dev_1x/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_ja_JP.properties
manifoldcf/branches/dev_1x/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_zh_CN.properties
manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_en_US.properties
manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_ja_JP.properties
manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_zh_CN.properties
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1634202
Propchange: manifoldcf/branches/dev_1x/connectors/rss/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk/connectors/rss:r1634202
Modified: manifoldcf/branches/dev_1x/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_ja_JP.properties?rev=1634274&r1=1634273&r2=1634274&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_ja_JP.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_ja_JP.properties Sun Oct 26 05:01:06 2014
@@ -89,7 +89,7 @@ RSSConnector.NoRSSUrlsSpecified=RSS URL�
RSSConnector.URLCanonicalization=URLæ£è¦åï¼
RSSConnector.URLRegexp=URLæ£è¦è¡¨ç¾
RSSConnector.URLMappingsColon=URLãããï¼
-RSSConnector.NoMappingsSpecifiedWillAcceptAllUrls=ããããæå®ããã¦ãã¾ããããã¹ã¦ã®URIãåéãã¾ã
+RSSConnector.NoMappingsSpecifiedWillAcceptAllUrls=ããããæå®ããã¦ãã¾ããããã¹ã¦ã®URLãåéãã¾ã
RSSConnector.FeedConnectionTimeout=ãã£ã¼ãæ¥ç¶ã¿ã¤ã ã¢ã¦ãï¼ç§ï¼ï¼
RSSConnector.DefaultFeedRescanInterval=ããã©ã«ãååéééï¼åï¼ï¼
RSSConnector.MinimumFeedRescanInterval=æå°ååéééï¼åï¼ï¼
@@ -99,6 +99,6 @@ RSSConnector.ChromedContent=ã¯ã
RSSConnector.AccessTokens=ã¢ã¯ã»ã¹ãã¼ã¯ã³ï¼
RSSConnector.Exclusions=é¤å¤
RSSConnector.Exclude=é¤å¤ï¼
-RSSConnector.Remove=Remove
-RSSConnector.Add=Add
RSSConnector.Delete=Delete
+RSSConnector.Remove=åé¤
+RSSConnector.Add=追å
Modified: manifoldcf/branches/dev_1x/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_zh_CN.properties?rev=1634274&r1=1634273&r2=1634274&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_zh_CN.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/rss/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/rss/common_zh_CN.properties Sun Oct 26 05:01:06 2014
@@ -89,7 +89,7 @@ RSSConnector.NoRSSUrlsSpecified=RSS URL�
RSSConnector.URLCanonicalization=URLè§èå:
RSSConnector.URLRegexp=URLæ£å表达å¼
RSSConnector.URLMappingsColon=URLæ å°:
-RSSConnector.NoMappingsSpecifiedWillAcceptAllUrls=æ å°æªæå®ã访é®ææURI
+RSSConnector.NoMappingsSpecifiedWillAcceptAllUrls=æ å°æªæå®ãæéææURL
RSSConnector.FeedConnectionTimeout=é¦éè¿æ¥è¶
æ¶(ç§):
RSSConnector.DefaultFeedRescanInterval=éæ°é¦é缺çé´é(å):
RSSConnector.MinimumFeedRescanInterval=éæ°é¦éæå°é´é(å):
@@ -99,6 +99,4 @@ RSSConnector.ChromedContent=éé»
RSSConnector.AccessTokens=访é®ä»¤ç:
RSSConnector.Exclusions=æé¤
RSSConnector.Exclude=æé¤:
-RSSConnector.Remove=Remove
-RSSConnector.Add=Add
RSSConnector.Delete=Delete
Modified: manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_en_US.properties?rev=1634274&r1=1634273&r2=1634274&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_en_US.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_en_US.properties Sun Oct 26 05:01:06 2014
@@ -197,4 +197,5 @@ WebcrawlerConnector.RemoveRegexp=Remove
WebcrawlerConnector.AddRegexp=Add regular expression
WebcrawlerConnector.Remove=Remove
WebcrawlerConnector.NoMappingsSpecifiedWillAcceptAllUrls=No mappings specified; will accept all URLs
-WebcrawlerConnector.URLMappingsColon=URL mappings:
\ No newline at end of file
+WebcrawlerConnector.URLMappingsColon=URL mappings:
+WebcrawlerConnector.MatchMustHaveARegexpValue=Match must have a regexp value
Modified: manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_ja_JP.properties?rev=1634274&r1=1634273&r2=1634274&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_ja_JP.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_ja_JP.properties Sun Oct 26 05:01:06 2014
@@ -164,12 +164,13 @@ WebcrawlerConnector.TypeInAnAccessToken=
WebcrawlerConnector.TypeInMetadataName=ã¡ã¿ãã¼ã¿åã®å
¥å
WebcrawlerConnector.TypeInMetadataValue=ã¡ã¿ãã¼ã¿å¤ã®å
¥å
WebcrawlerConnector.InvalidUrlsInSeedsList=ã·ã¼ããªã¹ãå
ã®ç¡å¹ãªURLï¼
-WebcrawlerConnector.yes=yes
-WebcrawlerConnector.no=no
-WebcrawlerConnector.ExcludedHeadersColon=Excluded headers:
-WebcrawlerConnector.URLMappings=URL Mappings
-WebcrawlerConnector.RemoveRegexp=Remove regular expression
-WebcrawlerConnector.AddRegexp=Add regular expression
-WebcrawlerConnector.Remove=Remove
-WebcrawlerConnector.NoMappingsSpecifiedWillAcceptAllUrls=No mappings specified; will accept all URLs
-WebcrawlerConnector.URLMappingsColon=URL mappings:
\ No newline at end of file
+WebcrawlerConnector.yes=ã¯ã
+WebcrawlerConnector.no=ããã
+WebcrawlerConnector.ExcludedHeadersColon=é¤å¤ããã:
+WebcrawlerConnector.URLMappings=URLãããã³ã°
+WebcrawlerConnector.RemoveRegexp=æ£è¦è¡¨ç¾ãåé¤ #
+WebcrawlerConnector.AddRegexp=æ£è¦è¡¨ç¾ã追å
+WebcrawlerConnector.Remove=åé¤
+WebcrawlerConnector.NoMappingsSpecifiedWillAcceptAllUrls=ããããæå®ããã¦ãã¾ããããã¹ã¦ã®URLãåéãã¾ã
+WebcrawlerConnector.URLMappingsColon=URLãããã³ã°:
+WebcrawlerConnector.MatchMustHaveARegexpValue=ãã¿ã¼ã³ã¯æ£è¦è¡¨ç¾ãå
¥åãã¦ãã ãã
Modified: manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_zh_CN.properties?rev=1634274&r1=1634273&r2=1634274&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_zh_CN.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/webcrawler/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/webcrawler/common_zh_CN.properties Sun Oct 26 05:01:06 2014
@@ -167,9 +167,10 @@ WebcrawlerConnector.InvalidUrlsInSeedsLi
WebcrawlerConnector.yes=æ¯
WebcrawlerConnector.no=å¦
WebcrawlerConnector.ExcludedHeadersColon=被æé¤ç头:
-WebcrawlerConnector.URLMappings=URL Mappings
-WebcrawlerConnector.RemoveRegexp=Remove regular expression
-WebcrawlerConnector.AddRegexp=Add regular expression
-WebcrawlerConnector.Remove=Remove
-WebcrawlerConnector.NoMappingsSpecifiedWillAcceptAllUrls=No mappings specified; will accept all URLs
-WebcrawlerConnector.URLMappingsColon=URL mappings:
+WebcrawlerConnector.URLMappings=URLæ å°
+WebcrawlerConnector.RemoveRegexp=å é¤æ£åè¡¨è¾¾å¼ #
+WebcrawlerConnector.AddRegexp=æ·»å æ£å表达å¼
+WebcrawlerConnector.Remove=å é¤
+WebcrawlerConnector.NoMappingsSpecifiedWillAcceptAllUrls=æ å°æªæå®ãæéææURL
+WebcrawlerConnector.URLMappingsColon=URLæ å°:
+WebcrawlerConnector.MatchMustHaveARegexpValue=å¹é
å¿
须为æ£å表达å¼