--- loncom/localize/localize/zh.pm	2014/01/17 15:35:21	1.123
+++ loncom/localize/localize/zh.pm	2014/02/28 19:22:08	1.124
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.123 2014/01/17 15:35:21 bisitz Exp $
+# $Id: zh.pm,v 1.124 2014/02/28 19:22:08 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -710,9 +710,6 @@ use base qw(Apache::localize);
    'List of possible answers'
 => 'List of possible answers',
 
-   'Found no analyzable parts in this problem, currently only Numerical, Formula and String response styles are supported.'
-=> 'Found no analyzable parts in this problem, currently only Numerical, Formula and String response styles are supported.',
-
    'Response [_1] is not analyzable at this time'  #    'is not analyzable at this time'
 => 'Response [_1] is not analyzable at this time',  #   '目前没有可分析性',
 
@@ -3894,9 +3891,6 @@ use base qw(Apache::localize);
    'Found a <*response> outside of a <part> in a <part>ed problem'
 => 'Found a <*response> outside of a <part> in a <part>ed problem',
 
-   'Found no analyzable respones in this problem, currently only Numerical, Formula and String response styles are supported.'
-=> 'Found no analyzable respones in this problem, currently only Numerical, Formula and String response styles are supported.',
-
    'Generate messages from a file'
 => '从一个文件生成邮件',
 
@@ -4170,13 +4164,13 @@ use base qw(Apache::localize);
    'Paper type'
 => '纸张类型',
 
-   'PDF-Formfields'
+   'PDF Form Fields'
 => 'PDF格式字段',
 
-   'with Formfields'
+   'with Form Fields'
 => '带有格式字段',
 
-   'without Formfields'
+   'without Form Fields'
 => '不带有格式字段',
 
    'Problems from the Whole Course'
@@ -4575,8 +4569,8 @@ use base qw(Apache::localize);
    'Currently using local (institutional) authentication.'
 => 'Currently using local (institutional) authentication.', # => '目前使用的地方（机构）的认证。Derzeit lokal (institutionell) authentifiziert.',
 
-   'a comma separated list of course sections crosslisted with the current course, with each entry including the institutional course section name followed by a colon and then the (optional) sectionID to be used in LON-CAPA, e.g., fs03ent231001:ent1,fs03bot231001:bot1,fs03zol231002:zol2'
-=> 'a comma separated list of course sections crosslisted with the current course, with each entry including the institutional course section name followed by a colon and then the (optional) sectionID to be used in LON-CAPA, e.g., fs03ent231001:ent1,fs03bot231001:bot1,fs03zol231002:zol2',
+   'a comma separated list of course sections crosslisted with the current course, with each entry including the institutional course section name followed by a colon and then the (optional) section ID to be used in LON-CAPA, e.g., fs03ent231001:ent1,fs03bot231001:bot1,fs03zol231002:zol2'
+=> 'a comma separated list of course sections crosslisted with the current course, with each entry including the institutional course section name followed by a colon and then the (optional) section ID to be used in LON-CAPA, e.g., fs03ent231001:ent1,fs03bot231001:bot1,fs03zol231002:zol2',
 
    'a comma separated list of institutional section numbers, each separated by a colon from the (optional) corresponding section ID to be used in LON-CAPA e.g., 001:1,002:2'
 => 'a comma separated list of institutional section numbers, each separated by a colon from the (optional) corresponding section ID to be used in LON-CAPA e.g., 001:1,002:2',
@@ -5431,7 +5425,7 @@ use base qw(Apache::localize);
    'Current discussion settings'
 => '目前讨论的设置',
 
-   'Duedate'
+   'Due Date'
 => '截止日期',
 
    'Each post can be toggled read/unread'
@@ -6416,8 +6410,8 @@ use base qw(Apache::localize);
    'The following users could not be activated, because an error occurred:'
 => 'The following users could not be activated, because an error occurred:',
 
-   'The following users could not be reenabled, because an error occurred:'
-=> 'The following users could not be reenabled, because an error occurred:',
+   'The following users could not be re-enabled, because an error occurred:'
+=> 'The following users could not be re-enabled, because an error occurred:',
 
    'The following users could not be modified, because an error occurred:'
 => 'The following users could not be modified, because an error occurred:',
@@ -10239,11 +10233,11 @@ use base qw(Apache::localize);
    'Exam proctors'
 => '监考老师',
 
-   'Custom role'
-=> '自定义角色',
+   'Custom role defined by [_1].'
+=> 'Custom role defined by [_1].', # '自定义角色',
 
-   'Custom roles'
-=> '自定义角色',
+   'Custom role [_1][_2]defined by [_3]' # _2: <br />
+=> 'Custom role [_1][_2]defined by [_3]' # '自定义角色',
 
    'Specific sections'
 => '具体章节',
@@ -10659,8 +10653,8 @@ use base qw(Apache::localize);
    'All:'
 => '全部：',
 
-   'You have indicated that the group portfolio should be enabled, but you have set the respository quota to 0 MB.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature.'
-=> 'You have indicated that the group portfolio should be enabled, but you have set the respository quota to 0 MB.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature.',
+   'You have indicated that the group portfolio should be enabled, but you have set the repository quota to 0 MB.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature.'
+=> 'You have indicated that the group portfolio should be enabled, but you have set the repository quota to 0 MB.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature.',
 
    '[_1] [_2] was created.<br />'
 => '[_1] [_2] 已创建。<br />',
@@ -12467,7 +12461,7 @@ to access the full message.',
    'Problem Testing'
 => '问题测试',
 
-   "Don't Show Incorect/Correct Feedback"
+   "Don't Show Incorrect/Correct Feedback"
 => "不显示不正确/正确的反馈",
 
    "Don't Show Any Feedback"
@@ -14368,12 +14362,6 @@ to access the full message.',
    'No mail sent matching supplied criteria'
 => 'No mail sent matching supplied criteria',
 
-   'Customrole'
-=> 'Customrole',
-
-   'Defined by [_1] at [_2].'
-=> 'Defined by [_1] at [_2].',
-
    'No students found.'
 => 'No students found.',
 
@@ -16276,7 +16264,7 @@ to access the full message.',
    'Please choose a PDF-File.'
 => '请选择一个PDF文件。',
 
-   "Can't find any valid PDF formfields."
+   "Can't find any valid PDF form fields."
 => '找不到任何有效的PDF格式文档 。',
 
    'Results of PDF Form problems'