svn commit: r1647731 [1/2] - in /manifoldcf/branches/dev_1x: ./ connectors/documentfilter/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/documentfilter/ connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/m...

[kw...@apache.org]

Author: kwright
Date: Wed Dec 24 05:15:32 2014
New Revision: 1647731

URL: http://svn.apache.org/r1647731
Log:
Pull up changes related to CONNECTORS-1005 from trunk

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/connectors/documentfilter/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/documentfilter/common_ja_JP.properties
    manifoldcf/branches/dev_1x/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_ja_JP.properties
    manifoldcf/branches/dev_1x/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_zh_CN.properties
    manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties
    manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties
    manifoldcf/branches/dev_1x/framework/   (props changed)
    manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
    manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties
    manifoldcf/branches/dev_1x/site/src/documentation/content/xdocs/zh_CN/end-user-documentation.xml

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 24 05:15:32 2014
@@ -119,4 +119,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,1634155,163
 4188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608
+/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
 4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608

Modified: manifoldcf/branches/dev_1x/connectors/documentfilter/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/documentfilter/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/documentfilter/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/documentfilter/common_ja_JP.properties?rev=1647731&r1=1647730&r2=1647731&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/documentfilter/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/documentfilter/common_ja_JP.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/documentfilter/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/documentfilter/common_ja_JP.properties Wed Dec 24 05:15:32 2014
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 DocumentFilter.ContentsTabName=コンテンツ
-DocumentFilter.MinFileSizeBytesColon=Min file size (バイト):
+DocumentFilter.MinFileSizeBytesColon=最小ファイルサイズ (バイト):
 DocumentFilter.MaxFileSizeBytesColon=最大ファイルサイズ (バイト):
 DocumentFilter.AllowedMIMETypesColon=利用可能なMIMEタイプ：
 DocumentFilter.AllowedFileExtensionsColon=利用可能なファイル拡張子：

Modified: manifoldcf/branches/dev_1x/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_ja_JP.properties?rev=1647731&r1=1647730&r2=1647731&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_ja_JP.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_ja_JP.properties Wed Dec 24 05:15:32 2014
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ForcedMetadata.ForcedMetadata=Add metadata
-ForcedMetadata.FieldMappingTabName=Move metadata
+ForcedMetadata.ForcedMetadata=強制メタデータ
+ForcedMetadata.FieldMappingTabName=フィールドマッピング
 
 ForcedMetadata.ForcedMetadataNameMustNotBeNull=強制メタデータ名を必ず入力してください
 ForcedMetadata.ForcedMetadataColon=強制メタデータ:

Modified: manifoldcf/branches/dev_1x/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_zh_CN.properties?rev=1647731&r1=1647730&r2=1647731&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_zh_CN.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_zh_CN.properties Wed Dec 24 05:15:32 2014
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ForcedMetadata.ForcedMetadata=Add metadata
-ForcedMetadata.FieldMappingTabName=Move metadata
+ForcedMetadata.ForcedMetadata=强制性元数据
+ForcedMetadata.FieldMappingTabName=字段映射
 
 ForcedMetadata.ForcedMetadataNameMustNotBeNull=强制性元数据名不能为空
 ForcedMetadata.ForcedMetadataColon=强制性元数据:

Modified: manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties?rev=1647731&r1=1647730&r2=1647731&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_ja_JP.properties Wed Dec 24 05:15:32 2014
@@ -34,4 +34,4 @@ TikaExtractor.AddFieldMapping=フã‚
 TikaExtractor.Delete=削除
 TikaExtractor.DeleteFieldMapping=フィールドマッピングを削除
 TikaExtractor.NoFieldNameSpecified=フィールド名を指定してください
-TikaExtractor.IgnoreTikaExceptions=Tika例外を無視してください:
+TikaExtractor.IgnoreTikaExceptions=Tika例外を無視してください:
\ No newline at end of file

Modified: manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties?rev=1647731&r1=1647730&r2=1647731&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/tika/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tika/common_zh_CN.properties Wed Dec 24 05:15:32 2014
@@ -34,4 +34,4 @@ TikaExtractor.AddFieldMapping=æ·»åŠ
 TikaExtractor.Delete=删除
 TikaExtractor.DeleteFieldMapping=删除字段映射
 TikaExtractor.NoFieldNameSpecified=未指定字段名
-TikaExtractor.IgnoreTikaExceptions=忽略Tika异常:
+TikaExtractor.IgnoreTikaExceptions=忽略Tika异常:
\ No newline at end of file

Propchange: manifoldcf/branches/dev_1x/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 24 05:15:32 2014
@@ -113,4 +113,4 @@
 /manifoldcf/branches/CONNECTORS-989/framework:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990/framework:1610284-1610707
 /manifoldcf/trunk:1629122
-/manifoldcf/trunk/framework:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1632013,1632289,1632844,1633108,1633193,1633202,1633348,1633364,1634145,1634148,1634155,1634264,1634373,1634530,1635438,1635809,1636146,1636180,1636207,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1639593,1639600,1640018,1640101,1640199,1640314,1640319,1640749,1640772,1640925,1640941,1641222,1641557,1641559,1641724,1
 641911,1642163,1642255,1642318,1644197,1644399,1646317,1646397,1646403,1646640,1647574,1647585,1647608
+/manifoldcf/trunk/framework:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1632013,1632289,1632844,1633108,1633193,1633202,1633348,1633364,1634145,1634148,1634155,1634264,1634373,1634530,1635438,1635809,1636146,1636180,1636207,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1639593,1639600,1640018,1640101,1640199,1640314,1640319,1640749,1640772,1640925,1640941,1641222,1641557,1641559,1
 641724,1641911,1642163,1642255,1642318,1644197,1644399,1646317,1646397,1646403,1646640,1647574,1647585,1647608

Modified: manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1647731&r1=1647730&r2=1647731&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties (original)
+++ manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties Wed Dec 24 05:15:32 2014
@@ -401,25 +401,25 @@ editjob.ApacheManifoldCFEditJob=Apache M
 editjob.EditaJob=ジョブの編集
 editjob.EditJob=ジョブの編集
 
-editjob.PipelineColon=Pipeline:
-editjob.StageNumber=Stage
-editjob.StageType=Type
-editjob.StagePrecedent=Precedent
-editjob.StageDescription=Description
-editjob.StageConnectionName=Connection name
-editjob.Repository=Repository
-editjob.Output=Output
-editjob.Transformation=Transformation
-editjob.InsertTransformationBefore=Insert transformation before
-editjob.InsertOutputBefore=Insert output before
-editjob.Insertnewstagehere=Insert new stage here
-editjob.SelectATransformationStageConnectionName=Select a transformation stage connection name
-editjob.SelectAnOutputStageConnectionName=Select an output stage connection name
-editjob.AddAnOutput=Add an output
-editjob.AddOutput=Add output
-editjob.Deletepipelinestage=Delete pipeline stage
-editjob.Insertnewtransformationhere=Insert new transformation here
-editjob.Insertnewoutputhere=Insert new output here
+editjob.PipelineColon=パイプライン:
+editjob.StageNumber=ステージ
+editjob.StageType=タイプ
+editjob.StagePrecedent=前提
+editjob.StageDescription=説明
+editjob.StageConnectionName=接続名
+editjob.Repository=リポジトリ
+editjob.Output=出力
+editjob.Transformation=変換
+editjob.InsertTransformationBefore=前に変換を挿入
+editjob.InsertOutputBefore=前に出力を挿入
+editjob.Insertnewstagehere=新しいステージを挿入
+editjob.SelectATransformationStageConnectionName=変換ステージ接続名を選択
+editjob.SelectAnOutputStageConnectionName=出力ステージ接続名を選択
+editjob.AddAnOutput=出力を一つ追加
+editjob.AddOutput=出力を追加
+editjob.Deletepipelinestage=パイプラインステージを削除
+editjob.Insertnewtransformationhere=新しい変換を挿入
+editjob.Insertnewoutputhere=新しい出力を挿入
 
 editjob.NoRepositoryConnectionsDefinedCreateOneFirst=リポジトリコネクションが未指定です - 作成してください
 editjob.NoOutputConnectionsDefinedCreateOneFirst=出力コネクションが未指定です - 作成してください
@@ -852,15 +852,15 @@ error.Return=戻る
 viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF：ジョブ情報
 viewjob.ViewAJob=ジョブ情報
 
-viewjob.PipelineColon=Pipeline:
-viewjob.StageNumber=Stage
-viewjob.StageType=Type
-viewjob.StagePrecedent=Precedent
-viewjob.StageDescription=Description
-viewjob.StageConnectionName=Connection name
-viewjob.Repository=Repository
-viewjob.Output=Output
-viewjob.Transformation=Transformation
+viewjob.PipelineColon=パイプライン:
+viewjob.StageNumber=ステージ
+viewjob.StageType=タイプ
+viewjob.StagePrecedent=前提
+viewjob.StageDescription=説明
+viewjob.StageConnectionName=接続名
+viewjob.Repository=リポジトリ
+viewjob.Output=出力
+viewjob.Transformation=変換
 
 viewjob.ScheduleTypeColon=スケジュールタイプ：
 viewjob.MinimumRecrawlIntervalColon=最小再読込み間隔：

Modified: manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties?rev=1647731&r1=1647730&r2=1647731&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties (original)
+++ manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties Wed Dec 24 05:15:32 2014
@@ -852,13 +852,13 @@ error.Return=返回
 viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF: 作业信息
 viewjob.ViewAJob=作业信息
 
-viewjob.PipelineColon=Pipeline:
-viewjob.StageNumber=Stage
-viewjob.StageType=Type
-viewjob.StagePrecedent=Precedent
-viewjob.StageDescription=Description
-viewjob.StageConnectionName=Connection name
-viewjob.Repository=Repository
+viewjob.PipelineColon=管道:
+viewjob.StageNumber=阶段
+viewjob.StageType=类型
+viewjob.StagePrecedent=前提
+viewjob.StageDescription=说明
+viewjob.StageConnectionName=连接名
+viewjob.Repository=存储库
 viewjob.Output=输出
 viewjob.Transformation=转换