diff --git a/conf/locale/en/LC_MESSAGES/django.po b/conf/locale/en/LC_MESSAGES/django.po index 21ddfe48c5..fe0d3f2a29 100644 --- a/conf/locale/en/LC_MESSAGES/django.po +++ b/conf/locale/en/LC_MESSAGES/django.po @@ -32,8 +32,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1a\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-12-13 19:28+0000\n" -"PO-Revision-Date: 2018-12-13 19:28:27.772847\n" +"POT-Creation-Date: 2018-12-16 20:37+0000\n" +"PO-Revision-Date: 2018-12-16 20:37:10.730161\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: en\n" @@ -4100,7 +4100,6 @@ msgstr "" #: common/lib/xmodule/xmodule/tabs.py lms/djangoapps/courseware/tabs.py #: lms/djangoapps/courseware/views/views.py #: lms/djangoapps/shoppingcart/reports.py -#: openedx/core/djangoapps/config_model_utils/models.py #: openedx/features/course_experience/__init__.py #: cms/templates/widgets/header.html lms/templates/help_modal.html #: lms/templates/courseware/course_navigation.html @@ -9499,23 +9498,6 @@ msgid "" "catalog service." msgstr "" -#: openedx/core/djangoapps/config_model_utils/models.py -msgid "Org" -msgstr "" - -#: openedx/core/djangoapps/config_model_utils/models.py -msgid "Site" -msgstr "" - -#: openedx/core/djangoapps/config_model_utils/models.py -#: lms/templates/navigation/navigation.html -msgid "Global" -msgstr "" - -#: openedx/core/djangoapps/config_model_utils/models.py -msgid "Default" -msgstr "" - #: openedx/core/djangoapps/config_model_utils/models.py msgid "Enabled" msgstr "" @@ -18155,6 +18137,10 @@ msgstr "" msgid "Explore Courses" msgstr "" +#: lms/templates/navigation/navigation.html +msgid "Global" +msgstr "" + #: lms/templates/peer_grading/peer_grading.html msgid "" "\n" diff --git a/conf/locale/en/LC_MESSAGES/djangojs.po b/conf/locale/en/LC_MESSAGES/djangojs.po index 611f48de8e..d43f11815f 100644 --- a/conf/locale/en/LC_MESSAGES/djangojs.po +++ b/conf/locale/en/LC_MESSAGES/djangojs.po @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1a\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-12-13 19:28+0000\n" -"PO-Revision-Date: 2018-12-13 19:28:28.152220\n" +"POT-Creation-Date: 2018-12-16 20:36+0000\n" +"PO-Revision-Date: 2018-12-16 20:37:10.221428\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: en\n" diff --git a/conf/locale/eo/LC_MESSAGES/django.mo b/conf/locale/eo/LC_MESSAGES/django.mo index db464859aa..36fd436273 100644 Binary files a/conf/locale/eo/LC_MESSAGES/django.mo and b/conf/locale/eo/LC_MESSAGES/django.mo differ diff --git a/conf/locale/eo/LC_MESSAGES/django.po b/conf/locale/eo/LC_MESSAGES/django.po index 9c0642f6fa..e7faf566e3 100644 --- a/conf/locale/eo/LC_MESSAGES/django.po +++ b/conf/locale/eo/LC_MESSAGES/django.po @@ -32,8 +32,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1a\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-12-13 19:28+0000\n" -"PO-Revision-Date: 2018-12-13 19:28:27.772847\n" +"POT-Creation-Date: 2018-12-16 20:37+0000\n" +"PO-Revision-Date: 2018-12-16 20:37:10.730161\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: eo\n" @@ -5291,7 +5291,6 @@ msgstr "Hömé Ⱡ'σяєм ι#" #: common/lib/xmodule/xmodule/tabs.py lms/djangoapps/courseware/tabs.py #: lms/djangoapps/courseware/views/views.py #: lms/djangoapps/shoppingcart/reports.py -#: openedx/core/djangoapps/config_model_utils/models.py #: openedx/features/course_experience/__init__.py #: cms/templates/widgets/header.html lms/templates/help_modal.html #: lms/templates/courseware/course_navigation.html @@ -12080,23 +12079,6 @@ msgstr "" "Mäxïmüm nümßér öf réçörds ïn pägïnätéd réspönsé öf ä sïnglé réqüést tö " "çätälög sérvïçé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє#" -#: openedx/core/djangoapps/config_model_utils/models.py -msgid "Org" -msgstr "Örg Ⱡ'σяєм#" - -#: openedx/core/djangoapps/config_model_utils/models.py -msgid "Site" -msgstr "Sïté Ⱡ'σяєм ι#" - -#: openedx/core/djangoapps/config_model_utils/models.py -#: lms/templates/navigation/navigation.html -msgid "Global" -msgstr "Glößäl Ⱡ'σяєм ιρѕυ#" - -#: openedx/core/djangoapps/config_model_utils/models.py -msgid "Default" -msgstr "Défäült Ⱡ'σяєм ιρѕυм #" - #: openedx/core/djangoapps/config_model_utils/models.py msgid "Enabled" msgstr "Énäßléd Ⱡ'σяєм ιρѕυм #" @@ -23207,6 +23189,10 @@ msgstr "" msgid "Explore Courses" msgstr "Éxplöré Çöürsés Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#" +#: lms/templates/navigation/navigation.html +msgid "Global" +msgstr "Glößäl Ⱡ'σяєм ιρѕυ#" + #: lms/templates/peer_grading/peer_grading.html msgid "" "\n" diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.mo b/conf/locale/eo/LC_MESSAGES/djangojs.mo index 7b7b01dca8..cc6b929fd8 100644 Binary files a/conf/locale/eo/LC_MESSAGES/djangojs.mo and b/conf/locale/eo/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.po b/conf/locale/eo/LC_MESSAGES/djangojs.po index db1db328b7..cbe4258763 100644 --- a/conf/locale/eo/LC_MESSAGES/djangojs.po +++ b/conf/locale/eo/LC_MESSAGES/djangojs.po @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1a\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-12-13 19:28+0000\n" -"PO-Revision-Date: 2018-12-13 19:28:28.152220\n" +"POT-Creation-Date: 2018-12-16 20:36+0000\n" +"PO-Revision-Date: 2018-12-16 20:37:10.221428\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: eo\n" diff --git a/conf/locale/rtl/LC_MESSAGES/django.mo b/conf/locale/rtl/LC_MESSAGES/django.mo index 82f85ec364..dbd4a0f8a4 100644 Binary files a/conf/locale/rtl/LC_MESSAGES/django.mo and b/conf/locale/rtl/LC_MESSAGES/django.mo differ diff --git a/conf/locale/rtl/LC_MESSAGES/django.po b/conf/locale/rtl/LC_MESSAGES/django.po index 4c4f8a8700..34ee0fbdaf 100644 --- a/conf/locale/rtl/LC_MESSAGES/django.po +++ b/conf/locale/rtl/LC_MESSAGES/django.po @@ -32,8 +32,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1a\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-12-13 19:28+0000\n" -"PO-Revision-Date: 2018-12-13 19:28:27.772847\n" +"POT-Creation-Date: 2018-12-16 20:37+0000\n" +"PO-Revision-Date: 2018-12-16 20:37:10.730161\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: rtl\n" @@ -4555,7 +4555,6 @@ msgstr "اخوث" #: common/lib/xmodule/xmodule/tabs.py lms/djangoapps/courseware/tabs.py #: lms/djangoapps/courseware/views/views.py #: lms/djangoapps/shoppingcart/reports.py -#: openedx/core/djangoapps/config_model_utils/models.py #: openedx/features/course_experience/__init__.py #: cms/templates/widgets/header.html lms/templates/help_modal.html #: lms/templates/courseware/course_navigation.html @@ -10475,23 +10474,6 @@ msgstr "" "وشطهوعو رعوزثق خب قثذخقيس هر حشلهرشفثي قثسحخرسث خب ش سهرلمث قثضعثسف فخ " "ذشفشمخل سثقدهذث." -#: openedx/core/djangoapps/config_model_utils/models.py -msgid "Org" -msgstr "خقل" - -#: openedx/core/djangoapps/config_model_utils/models.py -msgid "Site" -msgstr "سهفث" - -#: openedx/core/djangoapps/config_model_utils/models.py -#: lms/templates/navigation/navigation.html -msgid "Global" -msgstr "لمخزشم" - -#: openedx/core/djangoapps/config_model_utils/models.py -msgid "Default" -msgstr "يثبشعمف" - #: openedx/core/djangoapps/config_model_utils/models.py msgid "Enabled" msgstr "ثرشزمثي" @@ -20200,6 +20182,10 @@ msgstr "" msgid "Explore Courses" msgstr "ثطحمخقث ذخعقسثس" +#: lms/templates/navigation/navigation.html +msgid "Global" +msgstr "لمخزشم" + #: lms/templates/peer_grading/peer_grading.html msgid "" "\n" diff --git a/conf/locale/rtl/LC_MESSAGES/djangojs.mo b/conf/locale/rtl/LC_MESSAGES/djangojs.mo index 52f5e0b572..b6a8d34489 100644 Binary files a/conf/locale/rtl/LC_MESSAGES/djangojs.mo and b/conf/locale/rtl/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/rtl/LC_MESSAGES/djangojs.po b/conf/locale/rtl/LC_MESSAGES/djangojs.po index 3b154e71a5..bf8764836e 100644 --- a/conf/locale/rtl/LC_MESSAGES/djangojs.po +++ b/conf/locale/rtl/LC_MESSAGES/djangojs.po @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1a\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-12-13 19:28+0000\n" -"PO-Revision-Date: 2018-12-13 19:28:28.152220\n" +"POT-Creation-Date: 2018-12-16 20:36+0000\n" +"PO-Revision-Date: 2018-12-16 20:37:10.221428\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: rtl\n" diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.mo b/conf/locale/zh_CN/LC_MESSAGES/django.mo index 61fe8811a4..2b6718d6b2 100644 Binary files a/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/conf/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.po b/conf/locale/zh_CN/LC_MESSAGES/django.po index d4e51de6c8..820bb3c08c 100644 --- a/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -715,7 +715,7 @@ msgstr "用户资料" #: common/djangoapps/student/admin.py msgid "Account recovery" -msgstr "" +msgstr "恢复账号" #. #-#-#-#-# django-partial.po (edx-platform) #-#-#-#-# #. Translators: This label appears above a field on the login form @@ -1056,11 +1056,11 @@ msgstr "此用户属性值。" #: common/djangoapps/student/models.py msgid "Secondary email address" -msgstr "" +msgstr "辅助电子邮件地址" #: common/djangoapps/student/models.py msgid "Secondary email address to recover linked account." -msgstr "" +msgstr "辅助电子邮件地址以恢复关联帐户。" #: common/djangoapps/student/views/dashboard.py msgid " and " @@ -1238,7 +1238,7 @@ msgstr "新邮件地址与旧邮件地址相同。" #: common/djangoapps/student/views/management.py msgid "Cannot be same as your sign in email address." -msgstr "" +msgstr "不能与登录邮箱相同" #: common/djangoapps/student/views/management.py msgid "Unable to send email activation link. Please try again later." @@ -3618,7 +3618,7 @@ msgstr "请描述课程教学细节。" #: common/lib/xmodule/xmodule/course_module.py msgid "Course Visibility For Unenrolled Learners" -msgstr "" +msgstr "未选课学员课程可见情况" #: common/lib/xmodule/xmodule/course_module.py msgid "" @@ -3627,18 +3627,20 @@ msgid "" "enrolled students), 'public_outline' (allow access to course outline) and " "'public' (allow access to both outline and course content)." msgstr "" +"定义未登记学员的访问权限。这可以设置为三个值之一： “private” （默认可见性，只允许在册学生使用）、“public_outline” " +"（允许访问课程概述）和 “public”（允许访问概述和课程内容）。" #: common/lib/xmodule/xmodule/course_module.py msgid "private" -msgstr "" +msgstr "不公开" #: common/lib/xmodule/xmodule/course_module.py msgid "public_outline" -msgstr "" +msgstr "公开概述" #: common/lib/xmodule/xmodule/course_module.py msgid "public" -msgstr "" +msgstr "公开" #: common/lib/xmodule/xmodule/course_module.py msgid "Course Instructor" @@ -11319,7 +11321,7 @@ msgstr "对{course_name}的访问已于 {expiration_date}过期" #: openedx/features/course_duration_limits/access.py #, python-brace-format msgid "Access to the course you were looking for expired on {expiration_date}" -msgstr "" +msgstr "您要查看的课程访问已于 {expiration_date} 过期" #: openedx/features/course_duration_limits/access.py #, python-brace-format @@ -11335,6 +11337,8 @@ msgid "" "{expiration_date}{strong_close}{line_break}You lose all access to this " "course, including your progress, on {expiration_date}." msgstr "" +"{strong_open} 旁听访问入口过期 {expiration_date}{strong_close}{line_break}. 您已于 " +"{expiration_date} 失去课程访问权限，包括正在上的课程。" #: openedx/features/course_duration_limits/access.py #, python-brace-format @@ -11344,6 +11348,9 @@ msgid "" "now{sronly_span_open} to retain access past " "{expiration_date}{span_close}{a_close}" msgstr "" +"{line_break} 在 {upgrade_deadline} 前升级，获取网站内课程的无限访问权， " +"{a_open}现在升级{sronly_span_open} 以确保{expiration_date}前保留访问权 " +"{span_close}{a_close}。" #: openedx/features/course_experience/plugins.py #: cms/templates/widgets/header.html diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo b/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo index 1be9f8492d..68f6ec1a31 100644 Binary files a/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo and b/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po index 0a9a9022cd..bee2d7e4d1 100644 --- a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po +++ b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po @@ -69,6 +69,7 @@ # 周歆荷 , 2015 # 周歆荷 , 2015 # 张太红 , 2014,2017 +# 微 李 , 2018 # 汤和果 , 2015,2017 # 沈世奇 , 2013 # 熊冬升 , 2013 @@ -133,6 +134,7 @@ # 嘉杰 李 , 2018 # 张太红 , 2014,2017 # 张 山 <496733089@qq.com>, 2016 +# 微 李 , 2018 # 沈世奇 , 2013 # 熊冬升 , 2013 # 竹轩 , 2014 @@ -4746,11 +4748,11 @@ msgstr "此邮箱地址用于接收来自{platform_name}和课程团队的信息 #: lms/static/js/student_account/views/account_settings_factory.js msgid "Secondary Email Address" -msgstr "" +msgstr "备选邮箱地址" #: lms/static/js/student_account/views/account_settings_factory.js msgid "You may access your account when single-sign on is not available." -msgstr "" +msgstr "如果单点登录不可用，您可以访问自己的帐户。" #: lms/static/js/student_account/views/account_settings_factory.js #: openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js @@ -6084,11 +6086,11 @@ msgstr "可见性" #: cms/static/js/views/modals/edit_xblock.js msgid "Editing: {title}" -msgstr "" +msgstr "正在编辑：{title}" #: cms/static/js/views/modals/edit_xblock.js msgid "Plugins" -msgstr "" +msgstr "插件" #: cms/static/js/views/modals/edit_xblock.js #: lms/templates/ccx/schedule.underscore diff --git a/conf/locale/zh_HANS/LC_MESSAGES/django.mo b/conf/locale/zh_HANS/LC_MESSAGES/django.mo index 61fe8811a4..2b6718d6b2 100644 Binary files a/conf/locale/zh_HANS/LC_MESSAGES/django.mo and b/conf/locale/zh_HANS/LC_MESSAGES/django.mo differ diff --git a/conf/locale/zh_HANS/LC_MESSAGES/django.po b/conf/locale/zh_HANS/LC_MESSAGES/django.po index d4e51de6c8..820bb3c08c 100644 --- a/conf/locale/zh_HANS/LC_MESSAGES/django.po +++ b/conf/locale/zh_HANS/LC_MESSAGES/django.po @@ -715,7 +715,7 @@ msgstr "用户资料" #: common/djangoapps/student/admin.py msgid "Account recovery" -msgstr "" +msgstr "恢复账号" #. #-#-#-#-# django-partial.po (edx-platform) #-#-#-#-# #. Translators: This label appears above a field on the login form @@ -1056,11 +1056,11 @@ msgstr "此用户属性值。" #: common/djangoapps/student/models.py msgid "Secondary email address" -msgstr "" +msgstr "辅助电子邮件地址" #: common/djangoapps/student/models.py msgid "Secondary email address to recover linked account." -msgstr "" +msgstr "辅助电子邮件地址以恢复关联帐户。" #: common/djangoapps/student/views/dashboard.py msgid " and " @@ -1238,7 +1238,7 @@ msgstr "新邮件地址与旧邮件地址相同。" #: common/djangoapps/student/views/management.py msgid "Cannot be same as your sign in email address." -msgstr "" +msgstr "不能与登录邮箱相同" #: common/djangoapps/student/views/management.py msgid "Unable to send email activation link. Please try again later." @@ -3618,7 +3618,7 @@ msgstr "请描述课程教学细节。" #: common/lib/xmodule/xmodule/course_module.py msgid "Course Visibility For Unenrolled Learners" -msgstr "" +msgstr "未选课学员课程可见情况" #: common/lib/xmodule/xmodule/course_module.py msgid "" @@ -3627,18 +3627,20 @@ msgid "" "enrolled students), 'public_outline' (allow access to course outline) and " "'public' (allow access to both outline and course content)." msgstr "" +"定义未登记学员的访问权限。这可以设置为三个值之一： “private” （默认可见性，只允许在册学生使用）、“public_outline” " +"（允许访问课程概述）和 “public”（允许访问概述和课程内容）。" #: common/lib/xmodule/xmodule/course_module.py msgid "private" -msgstr "" +msgstr "不公开" #: common/lib/xmodule/xmodule/course_module.py msgid "public_outline" -msgstr "" +msgstr "公开概述" #: common/lib/xmodule/xmodule/course_module.py msgid "public" -msgstr "" +msgstr "公开" #: common/lib/xmodule/xmodule/course_module.py msgid "Course Instructor" @@ -11319,7 +11321,7 @@ msgstr "对{course_name}的访问已于 {expiration_date}过期" #: openedx/features/course_duration_limits/access.py #, python-brace-format msgid "Access to the course you were looking for expired on {expiration_date}" -msgstr "" +msgstr "您要查看的课程访问已于 {expiration_date} 过期" #: openedx/features/course_duration_limits/access.py #, python-brace-format @@ -11335,6 +11337,8 @@ msgid "" "{expiration_date}{strong_close}{line_break}You lose all access to this " "course, including your progress, on {expiration_date}." msgstr "" +"{strong_open} 旁听访问入口过期 {expiration_date}{strong_close}{line_break}. 您已于 " +"{expiration_date} 失去课程访问权限，包括正在上的课程。" #: openedx/features/course_duration_limits/access.py #, python-brace-format @@ -11344,6 +11348,9 @@ msgid "" "now{sronly_span_open} to retain access past " "{expiration_date}{span_close}{a_close}" msgstr "" +"{line_break} 在 {upgrade_deadline} 前升级，获取网站内课程的无限访问权， " +"{a_open}现在升级{sronly_span_open} 以确保{expiration_date}前保留访问权 " +"{span_close}{a_close}。" #: openedx/features/course_experience/plugins.py #: cms/templates/widgets/header.html diff --git a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.mo b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.mo index 1be9f8492d..68f6ec1a31 100644 Binary files a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.mo and b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po index 0a9a9022cd..bee2d7e4d1 100644 --- a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po +++ b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po @@ -69,6 +69,7 @@ # 周歆荷 , 2015 # 周歆荷 , 2015 # 张太红 , 2014,2017 +# 微 李 , 2018 # 汤和果 , 2015,2017 # 沈世奇 , 2013 # 熊冬升 , 2013 @@ -133,6 +134,7 @@ # 嘉杰 李 , 2018 # 张太红 , 2014,2017 # 张 山 <496733089@qq.com>, 2016 +# 微 李 , 2018 # 沈世奇 , 2013 # 熊冬升 , 2013 # 竹轩 , 2014 @@ -4746,11 +4748,11 @@ msgstr "此邮箱地址用于接收来自{platform_name}和课程团队的信息 #: lms/static/js/student_account/views/account_settings_factory.js msgid "Secondary Email Address" -msgstr "" +msgstr "备选邮箱地址" #: lms/static/js/student_account/views/account_settings_factory.js msgid "You may access your account when single-sign on is not available." -msgstr "" +msgstr "如果单点登录不可用，您可以访问自己的帐户。" #: lms/static/js/student_account/views/account_settings_factory.js #: openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js @@ -6084,11 +6086,11 @@ msgstr "可见性" #: cms/static/js/views/modals/edit_xblock.js msgid "Editing: {title}" -msgstr "" +msgstr "正在编辑：{title}" #: cms/static/js/views/modals/edit_xblock.js msgid "Plugins" -msgstr "" +msgstr "插件" #: cms/static/js/views/modals/edit_xblock.js #: lms/templates/ccx/schedule.underscore