--- loncom/localize/localize/zh.pm	2011/10/01 15:48:08	1.105
+++ loncom/localize/localize/zh.pm	2013/11/29 14:07:09	1.113
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.105 2011/10/01 15:48:08 raeburn Exp $
+# $Id: zh.pm,v 1.113 2013/11/29 14:07:09 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,6 @@ use base qw(Apache::localize);
 'date_days'    => '星期日,星期一,星期二,星期三,星期四,星期五,星期六',
 'date_am' => '上午',
 'date_pm' => '下午',
-'textual_remote_display' => 'on',
 'htmlarea_lang' => 'zh-cn',
 
    'Domain'
@@ -210,7 +209,7 @@ use base qw(Apache::localize);
    'Supplemental Course Documents'
 => '附加的课程文件',
 
-   'Bulletin Board'
+   'Discussion Board'
 => '公告板',
 
    'Published Resources'
@@ -942,8 +941,8 @@ use base qw(Apache::localize);
    'Customized right of use ...'
 => 'Customized right of use ...',
 
-   'Delete messages from bulletin boards'
-=> 'Delete messages from bulletin boards',
+   'Delete messages from discussion boards'
+=> 'Delete messages from discussion boards',
 
    'Domain only - use limited to courses in the domain'
 => 'Domain only - use limited to courses in the domain',
@@ -1621,8 +1620,8 @@ use base qw(Apache::localize);
    'About Me'
 => '关于我',
 
-   'Bulletin Board/Discussion'
-=> 'Bulletin Board/Discussion',
+   'Discussion Board/Discussion'
+=> 'Discussion Board/Discussion',
 
    'Clear All'
 => '全部清除',
@@ -3871,51 +3870,6 @@ use base qw(Apache::localize);
    'Generate messages from a file'
 => '从一个文件生成邮件',
 
-   'Arabic - UTF'
-=> 'ﺎﻠﻋﺮﺒﻳﺓ - UTF',
-
-   'German - UTF'
-=> 'Deutsch - UTF',
-
-   'English - UTF'
-=> 'English - UTF',
-
-   'Spanish (Castellan) - UTF'
-=> 'español (castellano) - UTF',
-
-   'Persian - UTF'
-=> 'ﺍیﺭﺎﻧی - UTF',
-
-   'French - UTF'
-=> 'français - UTF',
-
-   'Hebrew - UTF'
-=> 'עברית - UTF',
-
-   'Japanese - UTF'
-=> '日本語 - UTF',
-
-   'Portuguese - UTF'
-=> 'Português - UTF',
-
-   'Russian - UTF'
-=> 'Русский - UTF',
-
-   'Turkish - UTF'
-=> 'türkçe - UTF',
-
-   'Chinese Simplified - UTF'
-=> '简体中文 - UTF',
-
-   'Swedish Chef - UTF'
-=> 'Swedish Chef - UTF',
-
-   'Undetermined - ISO'
-=> 'Undetermined - ISO',
-
-   'Interlingua (International Auxiliary Language Association) - ISO'
-=> 'Interlingua (International Auxiliary Language Association) - ISO',
-
    'Go'
 => 'Go',
 
@@ -6594,8 +6548,8 @@ use base qw(Apache::localize);
    'Source Custom Distribution File'
 => '源代码的访问权限',
 
-   'Start new page<br />before selected'
-=> 'Start new page<br />before selected',
+   'Start new page[_1]before selected'
+=> 'Start new page[_1]before selected',
 
    'on'
 => '开',
@@ -7982,25 +7936,25 @@ use base qw(Apache::localize);
 => 'horizontal',
 
    'Script'
-=> 'Script', # n.t.
+=> 'Script',
 
    'Problem Editing'
 => '问题编辑',
 
    'Hint'
-=> '提示', # n.t.
+=> '提示',
 
    'Show hint even if problem Correct:'
 => 'Show hint even if problem Correct:',
 
    'Single Line Text Entry Area'
-=> 'Single Line Text Entry Area', # n.t.
+=> 'Single Line Text Entry Area',
 
    'Parameters for a response'
-=> 'Parameters for a response', # n.t.
+=> 'Parameters for a response',
 
    'Problem Part'
-=> '问题部分', # n.t.
+=> '问题部分',
 
    'Part ID:'
 => '问题部分编号：',
@@ -8009,10 +7963,10 @@ use base qw(Apache::localize);
 => 'Displayed Part Description:',
 
    'Readonly:'
-=> 'Readonly:', # n.t.
+=> 'Readonly:',
 
    'Response: Numerical'
-=> 'Response: Numerical', # n.t.
+=> 'Response: Numerical',
 
    'random'
 => 'random',
@@ -8027,13 +7981,13 @@ use base qw(Apache::localize);
 => 'Add new Option:',
 
    'Delete an Option:'
-=> 'Delete an Option:', # n.t.
+=> 'Delete an Option:',
 
    'Print options:'
 => 'Print options:',
 
    "Don't show option list"
-=> "Don't show option list", # n.t.
+=> "Don't show option list",
 
    'Display of options when printed'
 => 'Display of options when printed',
@@ -8048,10 +8002,10 @@ use base qw(Apache::localize);
 => 'Multiple Option Response Question',
 
    'Select Options'
-=> 'Select Options', # n.t.
+=> 'Select Options',
 
    'Image'
-=> 'Image', # n.t.
+=> 'Image',
 
    'Image Url:'
 => 'Image Url:',
@@ -8063,34 +8017,34 @@ use base qw(Apache::localize);
 => 'height (pixel):',
 
    'Alignment:'
-=> 'Alignment:', # n.t.
+=> 'Alignment:',
 
    'Encrypt URL:'
-=> 'Encrypt URL:', # n.t.
+=> 'Encrypt URL:',
 
    'no'
 => 'no',
 
    'Location:'
-=> 'Location:', # n.t.
+=> 'Location:',
 
    'Randomly labeled image'
-=> 'Randomly labeled image', # n.t.
+=> 'Randomly labeled image',
 
    'Response: Click on Image'
-=> 'Response: Click on Image', # n.t.
+=> 'Response: Click on Image',
 
    'Collection of Imageresponse foils'
-=> 'Collection of Imageresponse foils', # n.t.
+=> 'Collection of Imageresponse foils',
 
    'Image response foil'
-=> 'Image response foil', # n.t.
+=> 'Image response foil',
 
-   'Enter Coordinates' # n.t.
+   'Enter Coordinates'
 => 'Enter Coordinates',
 
    'Rectangle'
-=> 'Rectangle', # n.t.
+=> 'Rectangle',
 
    'Coordinate Pairs'
 => 'Coordinate Pairs',
@@ -8099,19 +8053,19 @@ use base qw(Apache::localize);
 => 'Polygon',
 
    'Coordinate list'
-=> 'Coordinate list', # n.t.
+=> 'Coordinate list',
 
    'Create Polygon Data'
-=> 'Create Polygon Data', # n.t.
+=> 'Create Polygon Data',
 
    'Task Description'
-=> '问题描述', # n.t.
+=> '问题描述',
 
    'Clickable Image'
-=> 'Clickable Image', # n.t.
+=> 'Clickable Image',
 
    'Image Source File'
-=> 'Image Source File', # n.t.
+=> 'Image Source File',
 
    'Select Position on Image'
 => 'Select Position on Image',
@@ -8141,16 +8095,16 @@ use base qw(Apache::localize);
 => 'Set Margins',
 
    'How should each column be formatted?'
-=> 'How should each column be formatted?', # n.t.
+=> 'How should each column be formatted?',
 
    'Width:'
-=> '宽：', # n.t.
+=> '宽：',
 
    'Height:'
-=> '高：', # n.t.
+=> '高：',
 
    'Left Margin:'
-=> 'Left Margin:', # n.t.
+=> 'Left Margin:',
 
    'Username and/or password could not be authenticated.'
 => '用户名和（或）密码无法验证。',
@@ -8591,13 +8545,13 @@ use base qw(Apache::localize);
 => 'No map selected.',
 
    'Most Recent:'
-=> '最新：', # n.t.
+=> '最新：',
 
    'In Course:'
-=> '课程：', # n.t.
+=> '课程：',
 
    'Use:'
-=> '使用：', # n.t.
+=> '使用：',
 
    'Search LON-CAPA help'
 => '搜索 LON-CAPA 帮助',
@@ -8630,7 +8584,7 @@ use base qw(Apache::localize);
 => '错误：',
 
    'occurred while running'
-=> 'occurred while running', # n.t.
+=> 'occurred while running',
 
    '(click for example)'
 => '(click for example)',
@@ -8645,7 +8599,7 @@ use base qw(Apache::localize);
 => 'Script Functions',
 
    'Image Options'
-=> '图像选项', # n.t.
+=> '图像选项',
 
    'left'
 => '左边',
@@ -8660,13 +8614,13 @@ use base qw(Apache::localize);
 => 'TeX-高 (mm)：',
 
    'TeXwrap:'
-=> 'TeXwrap:', # n.t., ??? [SB 2007-07-11]
+=> 'TeXwrap:',
 
    'Sorry!'
 => '对不起...',
 
    'Resource not available.'
-=> 'Resource not available.', # n.t.
+=> 'Resource not available.',
 
    'File Type'
 => 'File Type',
@@ -8732,10 +8686,10 @@ use base qw(Apache::localize);
 => '注册',
 
    'New Link'
-=> '新的书签', # n.t.
+=> '新的书签',
 
    'Refresh'
-=> '更新', # n.t.
+=> '更新',
 
    'Custom metadata [_1]'
 => '自定义元数据 [_1]',
@@ -8846,7 +8800,7 @@ use base qw(Apache::localize);
 => 'Directory search available?',
 
    'Back to actions menu'
-=> 'Back to actions menu', # n.t.
+=> 'Back to actions menu',
 
    'Edit action'
 => 'Edit action',
@@ -8891,7 +8845,7 @@ use base qw(Apache::localize);
 => 'The error occurred on host [_1]',
 
    'This error occurred on machine [_1]'
-=> 'This error occurred on machine [_1]', # n.t.
+=> 'This error occurred on machine [_1]',
 
    'Clear all Messages in Subdirectory'
 => 'Clear all Messages in Subdirectory',
@@ -9110,7 +9064,7 @@ use base qw(Apache::localize);
 => 'Not enabled',
 
    'section:'
-=> 'section:', # n.t.
+=> 'section:',
 
    'Previous access'
 => 'Previous access',
@@ -9281,16 +9235,16 @@ use base qw(Apache::localize);
 => 'Result of Changes to Automated Enrollment Settings.',
 
    'The following automated enrollment parameters have been changed:'
-=> 'The following automated enrollment parameters have been changed:', # n.t.
+=> 'The following automated enrollment parameters have been changed:',
 
    'now set to'
-=> 'now set to', # n.t.
+=> 'now set to',
 
    'still set to'
-=> 'still set to', # n.t.
+=> 'still set to',
 
    'The following automated enrollment parameters remain unchanged:'
-=> 'The following automated enrollment parameters remain unchanged:', # n.t.
+=> 'The following automated enrollment parameters remain unchanged:',
 
    'Change settings'
 => 'Change settings',
@@ -9353,7 +9307,7 @@ use base qw(Apache::localize);
 => '在选定的域中的研究所列表',
 
    'No exact match found for the username ([_1]) in LON-CAPA domain: [_2]'
-=> '没有找到完全匹配的用户名（[_1] ）在LON-CAPA-域：', # n.t.
+=> '没有找到完全匹配的用户名（[_1] ）在LON-CAPA-域：',
 
    'Creating new account.'
 => '创建新帐户。',
@@ -9797,10 +9751,10 @@ use base qw(Apache::localize);
 => 'Auto-enrollment settings',
 
    'Configuration setting'
-=> '配置设置', # n.t.
+=> '配置设置',
 
    'Value(s)'
-=> 'Value(s)', # n.t.
+=> 'Value(s)',
 
    'Auto-enrollment active?'
 => 'Auto-enrollment active?',
@@ -9859,9 +9813,6 @@ use base qw(Apache::localize);
    'Please try again.'
 => '请再试一次。',
 
-   'Please try again'
-=> '请再试一次',
-
    'in this course'
 => '在该课程中',
 
@@ -10174,7 +10125,7 @@ use base qw(Apache::localize);
    'Preferences can be set for this discussion that determine ....'
 => '这个讨论可以设置使用偏好',
 
-   'Which posts are displayed when you display this bulletin board or resource, and'
+   'Which posts are displayed when you display this discussion board or resource, and'
 => '哪些讨论将被显示在您的公告栏或资源里',
 
    'Under what circumstances posts are identified as "NEW", and'
@@ -10348,8 +10299,8 @@ use base qw(Apache::localize);
    'As this is not the case, most functionality in the system will be unavailable.'
 => 'As this is not the case, most functionality in the system will be unavailable.',
 
-   "You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested file name."
-=> "You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested file name.",
+   "You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested filename."
+=> "You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested filename.",
 
    'Directory'
 => '目录',
@@ -10396,8 +10347,8 @@ use base qw(Apache::localize);
    'Change discussion display'
 => 'Change discussion display',
 
-   'Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.'
-=> 'Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.',
+   'Choose whether or not to display a count of the number of new posts for each resource or discussion board which has unread posts.'
+=> 'Choose whether or not to display a count of the number of new posts for each resource or discussion board which has unread posts.',
 
    "This can increase the time taken to gather data for the '<i>What's New?</i>' page by a few seconds."
 => "This can increase the time taken to gather data for the '<i>What's New?</i>' page by a few seconds.",
@@ -10621,8 +10572,8 @@ use base qw(Apache::localize);
    'Default access dates'
 => '默认访问日期',
 
-   'Different collaborative tools<br />for different members:'
-=> '不同的协作工具<br />对不同的成员组成：',
+   'Different collaborative tools[_1]for different members:'
+=> '不同的协作工具[_1]对不同的成员组成：',
 
    'Start date'
 => '开始日期',
@@ -10956,34 +10907,34 @@ use base qw(Apache::localize);
 => '激活？',
 
    'Send group message'
-=> '发送组邮件', # .n.t.
+=> '发送组邮件',
 
    'Create boards'
-=> '创建论坛', # n.t.
+=> '创建论坛',
 
    'Edit own posts'
-=> '编辑自己的帖子', # .n.t.
+=> '编辑自己的帖子',
 
    'Hide/Delete any post'
 => '隐藏/删除 任意帖子',
 
    'View boards'
-=> '查看论坛', # .n.t.
+=> '查看论坛',
 
    'Control Access'
-=> '访问控制', # .n.t.
+=> '访问控制',
 
    'Basic Display'
-=> '基本显示', # .n.t.
+=> '基本显示',
 
    'Detailed Display'
-=> '详细显示', # .n.t.
+=> '详细显示',
 
    'View page'
-=> '查看网页', # .n.t.
+=> '查看网页',
 
    'Modify page'
-=> '修改网页', # .n.t.
+=> '修改网页',
 
    'email'
 => 'email',
@@ -11012,11 +10963,11 @@ use base qw(Apache::localize);
    'You received a message from [_1] in LON-CAPA.'
 => 'You received a message from [_1] in LON-CAPA.',
 
-   "'New'  critical message from "
-=> "'New'  critical message from ",
+   "'New' critical message from [_1]"
+=> "'New' critical message from [_1]",
 
-   "'New'  message from "
-=> "'New'  message from ",
+   "'New' message from [_1]"
+=> "'New' message from [_1]",
 
    'Refers to'
 => 'Refers to',
@@ -11368,7 +11319,7 @@ to access the full message.',
 => 'Manage',
 
    'saved CODEs' # View saved CODEs
-=> 'saved CODEs', # n.t.
+=> 'saved CODEs',
 
    'Specify a file containing the clicker information for this resource'
 => 'Specify a file containing the clicker information for this resource',
@@ -11427,8 +11378,8 @@ to access the full message.',
    'Found [_1] registered and [_2] unregistered clickers.'
 => 'Found [_1] registered and [_2] unregistered clickers.',
 
-   'Found no correct answers answers for grading!'
-=> 'Found no correct answers answers for grading!',
+   'Found no correct answers for grading!'
+=> 'Found no correct answers for grading!',
 
    'Found [_1] entries for grading!'
 => 'Found [_1] entries for grading!',
@@ -11505,8 +11456,8 @@ to access the full message.',
    'enroll type/action'
 => '注册类型/行动',
 
-   '<br />Map not loaded: The file <tt>[_1]</tt> does not exist.'
-=> '<br />Map not loaded: The file <tt>[_1]</tt> does not exist.',
+   'Map not loaded: The file [_1] does not exist.'
+=> 'Map not loaded: The file [_1] does not exist.',
 
    'Saved.'
 => '保存的。',
@@ -11640,8 +11591,11 @@ to access the full message.',
    'Courses/Network Hits'
 => '课程/网络访问次数',
 
-   'Already in this course:<br />[_1] in folder/map [_2].<br />'
-=> 'Already in this course:<br />[_1] in folder/map [_2].<br />',
+   'Already in this course:'
+=> 'Already in this course:',
+
+   '[_1] in folder/map [_2]'
+=> '[_1] in folder/map [_2]',
 
    'External Resource, preview not enabled'
 => 'External Resource, preview not enabled',
@@ -12666,8 +12620,8 @@ to access the full message.',
    'In discussions: all posts will be displayed.'
 => 'In discussions: all posts will be displayed.',
 
-   '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: new posts will cease to be identified as "NEW" after display.'
+=> 'In discussions: new posts will cease to be identified as "NEW" after display.',
 
    '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".',
@@ -12693,7 +12647,7 @@ to access the full message.',
    'Title for the Drop Box'
 => 'Title for the Drop Box',
 
-   'Title for the Bulletin Board'
+   'Title for the Discussion Board'
 => '公告栏的标题',
 
    'Not a valid user:domain'
@@ -12843,8 +12797,8 @@ to access the full message.',
    'An error occurred ([_1]) while trying to rename [_2] to [_3]'
 => 'An error occurred ([_1]) while trying to rename [_2] to [_3]',
 
-   'The new file name was changed from:<br />[_1] to [_2]'
-=> 'The new file name was changed from:<br />[_1] to [_2]',
+   'The new filename was changed from:<br />[_1] to [_2]'
+=> 'The new filename was changed from:<br />[_1] to [_2]',
 
    'An error occurred ([_1]) while trying to delete access control records for the old name.'
 => 'An error occurred ([_1]) while trying to delete access control records for the old name.',
@@ -14315,7 +14269,7 @@ to access the full message.',
    'Courses:'
 => '课程：',
 
-   '[_1] selected.' # n.t.
+   '[_1] selected.'
 => '[_1] 选择的。',
 
    'Access status:'
@@ -14585,14 +14539,14 @@ to access the full message.',
    'Include yourself in the roster?'
 => 'Include yourself in the roster?',
 
-   'Display of your name in the student-viewable roster set to <b>[_1]</b>.'
-=> 'Display of your name in the student-viewable roster set to <b>[_1]</b>.',
+   'Display of your name in the student-viewable roster set to [_1].'
+=> 'Display of your name in the student-viewable roster set to [_1].',
 
    'Error occurred saving display setting.'
 => 'Error occurred saving display setting.',
 
-   'Display of your name in the student-viewable roster unchanged (set to <b>[_1]</b>).'
-=> 'Display of your name in the student-viewable roster unchanged (set to <b>[_1]</b>).',
+   'Display of your name in the student-viewable roster unchanged (set to [_1]).'
+=> 'Display of your name in the student-viewable roster unchanged (set to [_1]).',
 
    'View course roster'
 => 'View course roster',
@@ -14618,8 +14572,8 @@ to access the full message.',
    'Try Selecting Again'
 => 'Try Selecting Again',
 
-   '<br />Invalid map: <tt>[_1]</tt>'
-=> '<br />Invalid map: <tt>[_1]</tt>',
+   'Invalid map: [_1]'
+=> 'Invalid map: [_1]',
 
    'Please either [_1]close this window[_2] or [_3]log in again[_4].'
 => 'Please either [_1]close this window[_2] or [_3]log in again[_4].',
@@ -15753,7 +15707,7 @@ to access the full message.',
 => 'Edit Math',
 
    'DragMath Latex Equation Editor'
-=> 'DragMath Latex Equation Editor', # n.t.
+=> 'DragMath Latex Equation Editor',
 
    '[_1]Return[_2] to editing resource.'
 => '[_1]Return[_2] to editing resource.',
@@ -15974,8 +15928,8 @@ to access the full message.',
    'Time Period'
 => '周期',
 
-   'Rsource is undefined.'
-=> 'Rsource is undefined.',
+   'Resource is undefined.'
+=> 'Resource is undefined.',
 
    'Plot Graph'
 => 'Plot Graph',