--- loncom/localize/localize/zh.pm	2011/01/16 00:55:36	1.99
+++ loncom/localize/localize/zh.pm	2011/10/21 15:30:53	1.106
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.99 2011/01/16 00:55:36 raeburn Exp $
+# $Id: zh.pm,v 1.106 2011/10/21 15:30:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2377,8 +2377,8 @@ use base qw(Apache::localize);
    'Generate Spreadsheet'
 => '生成报告表',
 
-   'Grant/revoke role of Scantron Operator'
-=> 'Grant/revoke role of Scantron Operator',
+   'Grant/revoke role of Bubblesheet Operator'
+=> 'Grant/revoke role of Bubblesheet Operator',
 
    'HTML'
 => 'HTML',
@@ -2410,8 +2410,8 @@ use base qw(Apache::localize);
    'Save as & Make This Sheet the Default'
 => '另存为 ＆ 使此工作表作为一个默认使用',
 
-   'Scantron Operator'
-=> 'Scantron Operator',
+   'Bubblesheet Operator'
+=> 'Bubblesheet Operator',
 
    'Select All'
 => '全选',
@@ -2422,8 +2422,8 @@ use base qw(Apache::localize);
    'Select Spreadsheet File'
 => '选择电子表格文件',
 
-   'Send Scantron data to a course'
-=> 'Send Scantron data to a course',
+   'Send bubblesheet data to a course'
+=> 'Send bubblesheet data to a course',
 
    'Spreadsheet Computation'
 => 'Spreadsheet Computation',
@@ -2446,8 +2446,8 @@ use base qw(Apache::localize);
    'Unselect All Students'
 => 'Unselect All Students',
 
-   'Upload Scantron data'
-=> 'Upload Scantron data',
+   'Upload bubblesheet data'
+=> 'Upload bubblesheet data',
 
    'You must choose at least one student to continue.'
 => 'You must choose at least one student to continue.',
@@ -2745,7 +2745,7 @@ use base qw(Apache::localize);
 => '全面更新',
 
    'Full update (also print list of users not enrolled anymore)'
-=> '全面更新 (auch Liste von Benutzern ausgeben, die den Kurs nicht mehr belegt haben)',
+=> 'Full update (also print list of users not enrolled anymore)', # => '全面更新 (auch Liste von Benutzern ausgeben, die den Kurs nicht mehr belegt haben)',
 
    'Generation'
 => '生成',
@@ -2924,7 +2924,7 @@ use base qw(Apache::localize);
    'Welcome'
 => '欢迎',
 
-   'Welcome to the Learning<i>Online</i> Network with CAPA. Please wait while your session is being set up.'
+   'Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.'
 => '欢迎您到在线网络 LON-CAPA 学习。请稍候，您的会话正在建立。',
 
    'You must choose an authentication type.'
@@ -3479,7 +3479,7 @@ use base qw(Apache::localize);
 => '(输入最大[_1]同事的用户名或用户名@域名，例如：smithje or smithje@[_2]。)',
 
    '(Hand in a file you have prepared on your computer)'
-=> '(Reichen Sie eine Datei ein, die Sie auf Ihrem Computer vorbereitet haben)',
+=> '(Hand in a file you have prepared on your computer)',
 
    ', select a template from the pull-down menu below.'
 => ', select a template from the pull-down menu below.',
@@ -4589,7 +4589,7 @@ use base qw(Apache::localize);
 => '[_1] 局部认证带 [_2]',
 
    'Currently using local (institutional) authentication.'
-=> '目前使用的地方（机构）的认证。Derzeit lokal (institutionell) authentifiziert.',
+=> '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',
@@ -4628,7 +4628,7 @@ use base qw(Apache::localize);
 => 'currently does not exist',
 
    'custom'
-=> "自定义", # 'anpassbar', # individuell ???
+=> "自定义",
 
    'custom distribution file'
 => '自定义文件', # ???
@@ -4760,10 +4760,10 @@ use base qw(Apache::localize);
 => 'Changes will not show until next login.',
 
    '[_1] if allowed, anything else if not'
-=> '[_1], um zu erlauben. Alles andere, um nicht zu erlauben.',
+=> '[_1] if allowed, anything else if not',
 
    '"[_1]" to disable, anything else if not'
-=> '"[_1]", um zu deaktivieren. Alles andere, um zu aktivieren.',
+=> '"[_1]" to disable, anything else if not',
 
    '[_1] to suppress, anything else to not suppress'
 => '[_1] to suppress, anything else to not suppress',
@@ -4784,7 +4784,7 @@ use base qw(Apache::localize);
 => '<b>HTML allowed</b>: Discussion participants can use limited HTML in their postings.',
 
    '<b>HTML banned</b>: HTML will not be allowed in discussion postings.'
-=> '<b>HTML verboten</b>: HTML wird in Diskussionen nicht zugelassen.',
+=> '<b>HTML banned</b>: HTML will not be allowed in discussion postings.',
 
    '<b>Instructor</b> - instructors will not be able to participate in discussions'
 => '<b>Instructor</b> - instructors will not be able to participate in discussions',
@@ -5079,7 +5079,7 @@ use base qw(Apache::localize);
 => 'Set problem weight for the selected problem for ...',
 
    'Set value to [_1] to allow.'
-=> '[_1], um zu erlauben.',
+=> 'Set value to [_1] to allow.',
 
    'Setting the [_1]'
 => 'Setting the [_1]',
@@ -5641,7 +5641,7 @@ use base qw(Apache::localize);
 => 'Please [_1]go back[_2] to select either content items or discussions for export.',
 
    '[_1]Your IMS package[_2] is ready for download.'
-=> '[_1]Ihr IMS-Paket[_2] steht zum Download bereit.',
+=> '[_1]Your IMS package[_2] is ready for download.',
 
    'Import a document'
 => 'LON-CAPA-内部文件',
@@ -5829,9 +5829,6 @@ use base qw(Apache::localize);
    'Not specified'
 => '未指定',
 
-   'Once marked as read'
-=> '一旦标记为已读',
-
    'Open - XML source is open to people who want to use it'
 => '开放 - XML的源代码开放给想要使用它的人',
 
@@ -5889,7 +5886,7 @@ use base qw(Apache::localize);
    'The preferences you set here can be overridden within each individual discussion.'
 => '您的喜好设定这里可以适用在每个讨论。', # '您的喜好设定可以被每个讨论更改。',
 
-   'Under what circumstances posts are identfied as "New"'
+   'Under what circumstances posts are identified as "NEW"'
 => '在什么情况下讨论被设定为“新”',
 
    'Upload a new document'
@@ -6208,7 +6205,7 @@ use base qw(Apache::localize);
 => '这一行动目前是不被允许的。',
 
    'Time of last post'
-=> '最后发表的帖子的时间', #??? [SB 20.10.2006]
+=> '最后发表的帖子的时间',
 
    'Title of document goes here'
 => 'Title of document goes here',
@@ -6583,7 +6580,7 @@ use base qw(Apache::localize);
 => 'Resources used by this resource',
 
    'Resources using or importing resource'
-=> '资源使用或导入', #??? [SB 18.10.2006]
+=> '资源使用或导入',
 
    'Return'
 => '后退',
@@ -7303,7 +7300,7 @@ use base qw(Apache::localize);
 => 'LON-CAPA 目录搜索',
 
    '[_1] include external resources'
-=> '[_1] externe Ressourcen mit einbeziehen',
+=> '[_1] include external resources',
 
    'Change Course Initialization Preference'
 => '课程初始化设置',
@@ -7713,9 +7710,6 @@ use base qw(Apache::localize);
    'will override current values'
 => 'will override current values',
 
-   'Set a quota for the total disk space available for storage of course group portfolio files.'
-=> 'Set a quota for the total disk space available for storage of course group portfolio files.',
-
    'Section Numbers and corresponding LON-CAPA section IDs'
 => 'Section Numbers and corresponding LON-CAPA section IDs',
 
@@ -8324,7 +8318,7 @@ use base qw(Apache::localize);
 => 'Post announcements to the system login and roles screen',
 
    '(leave blank to delete announcement)'
-=> '(leer lassen, um Bekanntmachung zu entfernen)',
+=> '(leave blank to delete announcement)',
 
    'Check machines:'
 => 'Check machines:',
@@ -9566,7 +9560,7 @@ use base qw(Apache::localize);
 => 'Getting started guide',
 
    '[_1] [_2] [_3] [_4] [_5]m [_6]s ' # "mm dd yyyy hh mi ss" (1:month, 2:day, 3:year, 4:hour, 5:minute, 6:second)
-=> '[_2]. [_1] [_3], [_4]:[_5]:[_6] ', # "dd. mm yyyy, hh:mi:ss"
+=> '[_1] [_2] [_3] [_4] [_5]m [_6]s ', # => '[_2]. [_1] [_3], [_4]:[_5]:[_6] ', # "dd. mm yyyy, hh:mi:ss" (German date format)
 
    '[_1]Select Date[_2]'
 => '[_1]请选择日期[_2]',
@@ -9599,7 +9593,7 @@ use base qw(Apache::localize);
 => 'Instructors and TAs in sections, when grading bridge tasks, should be allowed to grade other sections.',
 
    '[_1]: they are allowed (this is the default). [_2]: no, they can only grade their own section.'
-=> '[_1]: erlauben (voreingestellt). [_2]: nur eigene Sektion.',
+=> '[_1]: they are allowed (this is the default). [_2]: no, they can only grade their own section.',
 
    'Calendar Announcement for '
 => 'Calendar Announcement for ',
@@ -9865,9 +9859,6 @@ use base qw(Apache::localize);
    'Please try again.'
 => '请再试一次。',
 
-   'Please try again'
-=> '请再试一次',
-
    'in this course'
 => '在该课程中',
 
@@ -9917,7 +9908,7 @@ use base qw(Apache::localize);
 => '广播消息',
 
    'randomly pick [quant,_1,resource]'
-=> '随机挑选 [quant,_1,resource,resource]',
+=> 'randomly pick [quant,_1,resource]', # => '随机挑选 [quant,_1,resource,resource]',
 
    'contents hidden'
 => '隐藏的内容',
@@ -10192,9 +10183,6 @@ use base qw(Apache::localize);
    'Posts not marked read'
 => '讨论没有标记为已读',
 
-   'New posts cease to be identified as "New"?'
-=> '新的讨论不再被标识为“新”？',
-
    'New posts cease to be identified as "NEW"?'
 => '新的讨论不再被标识为“新”？',
 
@@ -10571,10 +10559,10 @@ use base qw(Apache::localize);
 => '曾获得',
 
    'Course roles'
-=> '课程角色', # 'Benutzerrollen im Kurs',
+=> '课程角色',
 
    'Course sections'
-=> '课程章节', # 'Sektionen im Kurs',
+=> '课程章节',
 
    'all sections'
 => '所有章节',
@@ -11364,8 +11352,8 @@ to access the full message.',
    'Grade'
 => 'Grade',
 
-   'scantron forms' # Grade scantron forms
-=> 'scantron forms',
+   'bubblesheet forms' # Grade scantron forms
+=> 'bubblesheet forms',
 
    'Verify'
 => 'Verify',
@@ -12172,7 +12160,7 @@ to access the full message.',
 => '[_1]: Unable to add user. No password specified.',
 
    'Processed [quant,_1,user].'
-=> '[quant,_1,Benutzer,Benutzer] verarbeitet.',
+=> 'Processed [quant,_1,user].',
 
    'Roles added for [quant,_1,user].'
 => 'Roles added for [quant,_1,user].',
@@ -12678,8 +12666,8 @@ to access the full message.',
    'In discussions: new posts will be cease to be identified as "NEW" after display.'
 => 'In discussions: new posts will be cease to be identified as "NEW" after display.',
 
-   'In discussions: posts will be identified as "NEW" until marked as read by the reader.'
-=> 'In discussions: posts will be identified as "NEW" until marked as read by the reader.',
+   'In discussions: posts will be identified as "NEW" until marked as not "NEW".'
+=> 'In discussions: posts will be identified as "NEW" until marked as not "NEW".',
 
    'The e-mail address entered in row '
 => '电子邮件地址输入行 ',
@@ -13098,8 +13086,8 @@ to access the full message.',
    'User modification'
 => '用户设置',
 
-   'Scantron format file'
-=> 'Scantron format file',
+   'Bubblesheet format file'
+=> 'Bubblesheet format file',
 
    'Cataloging of courses'
 => '课程目录',
@@ -13558,7 +13546,7 @@ to access the full message.',
 => '返回到目录信息',
 
    ' at '
-=> ' in ',
+=> ' at ',
 
    "Computer's answer is incorrect ([_1])."
 => "Computer's answer is incorrect ([_1]).",
@@ -13593,8 +13581,8 @@ to access the full message.',
    'LON-CAPA User Message'
 => 'LON-CAPA 用户邮件',
 
-   '<b>Message: </b> No more students for this section or class.'
-=> '<b>Message: </b> No more students for this section or class.',
+   '[_1]Message:[_2] No more students for this section or class.'
+=> '[_1]Message:[_2] No more students for this section or class.',
 
    'Click on the button below to return to the grading menu.'
 => 'Click on the button below to return to the grading menu.',
@@ -13835,7 +13823,7 @@ to access the full message.',
    'Use slot based access controls'
 => 'Use slot based access controls',
 
-  'Client IP/Name Access Control (acc)'
+   'Client IP/Name Access Control (acc)'
 => 'Client IP/Name Access Control (acc)',
 
    'Client IP/Name Access Control'
@@ -13989,7 +13977,7 @@ to access the full message.',
 => 'Error saving updated parent folder.',
 
    'Parameters not set for [_1] because the resource was not recognized as part of the course.'
-=> '',
+=> 'Parameters not set for [_1] because the resource was not recognized as part of the course.',
 
    'Message not moved, Attempted to move message to the same folder as it already is in.'
 => 'Message not moved, Attempted to move message to the same folder as it already is in.',
@@ -14292,7 +14280,7 @@ to access the full message.',
 => 'The total disk space allocated for storage of portfolio files in all groups in a course.',
 
    'No existing sections'
-=> '(Keine Sektionen vorhanden)', # n.t.
+=> 'No existing sections',
 
    'Broadcast e-mail to users'
 => 'Broadcast e-mail to users',
@@ -14658,8 +14646,7 @@ to access the full message.',
 => 'Unable to understand the search phrase [_1]: [_2]',
 
    'You did not fill in enough information for the search to be started. You need to fill in relevant fields on the search page in order for a query to be processed.'
-=> '搜寻无法完成，因为您没有足够的数据。您必须在搜索页面的搜索栏里填写关键词，从而使您的要求可以得到处理。',
-# '您没有填写足够的信息进行搜索的开始。您需要填写在有关领域在搜寻网页上，以便查询处理。'
+=> '搜寻无法完成，因为您没有足够的数据。您必须在搜索页面的搜索栏里填写关键词，从而使您的要求可以得到处理。', # '您没有填写足够的信息进行搜索的开始。您需要填写在有关领域在搜寻网页上，以便查询处理。'
 
    'conditionally hidden'
 => '有条件的隐藏',
@@ -14881,7 +14868,7 @@ to access the full message.',
 => "Retain each user's current section affiliations?",
 
    '(Does not apply to student roles).'
-=> '(Betrifft nicht Studentenrollen).',
+=> '(Does not apply to student roles).',
 
    '[_1]Show[_2] clicker id'
 => '[_1]Show[_2] clicker id',
@@ -15553,12 +15540,9 @@ to access the full message.',
    'Select a user to enroll as a student'
 => 'Select a user to enroll as a student',
 
-   'modify' #Kontext? breadcrumb_text
+   'modify' #context? breadcrumb_text
 => 'modify',
 
-#   'userpicked' #Kontext?
-#=> '',
-
    'as a student'
 => '作为一名学生',
 
@@ -15732,17 +15716,6 @@ to access the full message.',
    'modifiable fields (if institutional data blank): '
 => 'modifiable fields (if institutional data blank): ',
 
-# domainprefs.pm
-#   'Formats disallowed for $text{$type}: '
-#=> 'Formats disallowed for $text{$type}: ',
-#
-#   'Format rules to check for $text{$type}: '
-#=> 'Format rules to check for $text{$type}: ',
-
-# loncommon.pm
-#   "You must either choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or leave the ID field blank."
-# => "You must either choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or leave the ID field blank."
-
    'Source Code'
 => 'Source Code',
 
@@ -15837,7 +15810,7 @@ to access the full message.',
 => 'Your course/community currently appears in the Course/Community Catalog for this domain.',
 
    'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.'
-=> '课程可自我编目的基础的研究所代码（例如， fbi_ws20082009_linalg ）或可通过域的定义分配类别界定。',
+=> '课程可自我编目的基础的研究所代码（例如， inf_20112012_math1 ）或可通过域的定义分配类别界定。',
 
    'Your course/community does not currently appear in the Course/Community Catalog for this domain.'
 => 'Your course/community does not currently appear in the Course/Community Catalog for this domain.',
@@ -15903,10 +15876,10 @@ to access the full message.',
 => 'You can only use this screen to select courses in the current domain.',
 
    '[_1]Your Excel spreadsheet[_2] is ready for download.'
-=> '[_1]Ihre Exceldatei[_2] steht zum Download bereit.',
+=> '[_1]Your Excel spreadsheet[_2] is ready for download.',
 
    '[_1]Your CSV file[_2] is ready for download.'
-=> '[_1]Ihre CSV-Datei[_2] steht zum Download bereit.',
+=> '[_1]Your CSV file[_2] is ready for download.',
 
    'Name (username)'
 => 'Name (username)',