diff --git a/conf/locale/ar/LC_MESSAGES/django.mo b/conf/locale/ar/LC_MESSAGES/django.mo index 1e0d055037..6d24a423af 100644 Binary files a/conf/locale/ar/LC_MESSAGES/django.mo and b/conf/locale/ar/LC_MESSAGES/django.mo differ diff --git a/conf/locale/ar/LC_MESSAGES/django.po b/conf/locale/ar/LC_MESSAGES/django.po index 36b9c083fd..081ce32f61 100644 --- a/conf/locale/ar/LC_MESSAGES/django.po +++ b/conf/locale/ar/LC_MESSAGES/django.po @@ -198,7 +198,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:51+0000\n" "Last-Translator: ali fakih \n" "Language-Team: Arabic (http://www.transifex.com/open-edx/edx-platform/language/ar/)\n" @@ -576,15 +576,6 @@ msgstr "للتسجيل، يجب عليك اتّباع ميثاق الشرف ال msgid "You are missing one or more required fields" msgstr "لم تقم بتعبئة واحد أو أكثر من الحقول المطلوبة" -#: common/djangoapps/student/forms.py -msgid "Username and password fields cannot match" -msgstr "ﻻ يسمحُ بتطابق حقليّ كلمة المرور واسم المستخدم" - -#: common/djangoapps/student/forms.py -#: common/djangoapps/student/views/management.py -msgid "Password: " -msgstr "كلمة المرور:" - #: common/djangoapps/student/forms.py msgid "Unauthorized email address." msgstr "عنوان بريد إلكتروني محظور." @@ -1075,60 +1066,6 @@ msgid "" "enrolled in. Sign In to continue." msgstr "" -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct password before reusing a previous password." -msgid_plural "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct passwords before reusing a previous password." -msgstr[0] "" -"إنّك تعيد استخدام كلمة مرور كنت قد استخدمتها مؤخّرًا. يجب استخدام {num} كلمة" -" سر مختلفة لتتمكّن من إعادة استخدام كلمة مرور مستخدمة مسبقًا." -msgstr[1] "" -"إنّك تعيد استخدام كلمة مرور كنت قد استخدمتها مؤخّرًا. يجب استخدام {num} كلمة" -" سر مختلفة لتتمكّن من إعادة استخدام كلمة مرور مستخدمة مسبقًا." -msgstr[2] "" -"إنّك تعيد استخدام كلمة مرور كنت قد استخدمتها مؤخّرًا. يجب استخدام {num} كلمة" -" سر مختلفة لتتمكّن من إعادة استخدام كلمة مرور مستخدمة مسبقًا." -msgstr[3] "" -"إنّك تعيد استخدام كلمة مرور كنت قد استخدمتها مؤخّرًا. يجب استخدام {num} كلمة" -" سر مختلفة لتتمكّن من إعادة استخدام كلمة مرور مستخدمة مسبقًا." -msgstr[4] "" -"إنّك تعيد استخدام كلمة مرور كنت قد استخدمتها مؤخّرًا. يجب استخدام {num} كلمة" -" سر مختلفة لتتمكّن من إعادة استخدام كلمة سر مستخدمة مسبقًا." -msgstr[5] "" -"أنت تحاول إعادة استخدام كلمة مرور كنت قد استعملتها مؤخّراً. يجب أن تستخدم " -"{num} كلمات مرور مميّزة قبل إعادة استخدام واحدة مستخدمة مسبقاً." - -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"day must elapse between password resets." -msgid_plural "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"days must elapse between password resets." -msgstr[0] "" -"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " -"الأمن، يجب أن يمرّ {num} يوم بين كلّ تغييرين متتاليتين للكلمة." -msgstr[1] "" -"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " -"الأمن، يجب أن يمرّ {num} يوم بين كلّ تغييرين متتاليتين للكلمة." -msgstr[2] "" -"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " -"الأمن، يجب أن يمرّ {num} يوم بين كلّ تغييرين متتاليتين للكلمة." -msgstr[3] "" -"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " -"الأمن، يجب أن يمرّ {num} أيام بين كلّ تغييرين متتاليتين للكلمة." -msgstr[4] "" -"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " -"الأمن، يجب أن يمرّ {num} يوماً بين كلّ تغييرين متتاليتين للكلمة." -msgstr[5] "" -"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " -"الأمن، يجب أن يمرّ {num} يوم بين كلّ تغييرين متتاليتين للكلمة." - #: common/djangoapps/student/views/management.py msgid "Password reset unsuccessful" msgstr "عذرًا، لم تنجح عملية تغيير كلمة المرور" @@ -1629,71 +1566,218 @@ msgstr "يستوجب المساق {course_id} المتطلّب {prerequisite_cou msgid "System defined milestone" msgstr "إنجاز مهمّ يحدّده النظام" +#. Translators: This appears in a list of password requirements #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Invalid Length ({0})" -msgstr "عدد الأحرف غير صحيح ({0})" +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "يجب أن يتألّف من {0} حرفًا أو أكثر" +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or fewer" -msgstr "يجب أن يتألّف من {0} أحرف أو أقل" +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Must be more complex ({0})" -msgstr "يجب أن تكون الأحرف أكثر تعقيداً ({0})" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more uppercase characters" -msgstr "يجب أن يتألّف من {0} حرف كبير أو أكثر " - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "يجب أن يتألّف من {0} حرف صغير أو أكثر" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more digits" -msgstr "يجب أن يتألّف من {0} رقمًا أو أكثر" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "يجب أن يتألّف من {0} علامة ترقيم أو أكثر" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "" -"يجب أن يتألّف من {0} رمز أو أكثر، لا تنتمي إلى مجموعة نظام الترميز أسكي " -"ASCII" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "يجب أن يتألّف من {0} كلمة مميّزة أو أكثر" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" +msgid "Enter a password with at least {requirements}." msgstr "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more letters" +msgid "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct password before reusing a previous password." +msgid_plural "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct passwords before reusing a previous password." +msgstr[0] "" +"إنّك تعيد استخدام كلمة مرور كنت قد استخدمتها مؤخّرًا. يجب استخدام {num} كلمة" +" سر مختلفة لتتمكّن من إعادة استخدام كلمة مرور مستخدمة مسبقًا." +msgstr[1] "" +"إنّك تعيد استخدام كلمة مرور كنت قد استخدمتها مؤخّرًا. يجب استخدام {num} كلمة" +" سر مختلفة لتتمكّن من إعادة استخدام كلمة مرور مستخدمة مسبقًا." +msgstr[2] "" +"إنّك تعيد استخدام كلمة مرور كنت قد استخدمتها مؤخّرًا. يجب استخدام {num} كلمة" +" سر مختلفة لتتمكّن من إعادة استخدام كلمة مرور مستخدمة مسبقًا." +msgstr[3] "" +"إنّك تعيد استخدام كلمة مرور كنت قد استخدمتها مؤخّرًا. يجب استخدام {num} كلمة" +" سر مختلفة لتتمكّن من إعادة استخدام كلمة مرور مستخدمة مسبقًا." +msgstr[4] "" +"إنّك تعيد استخدام كلمة مرور كنت قد استخدمتها مؤخّرًا. يجب استخدام {num} كلمة" +" سر مختلفة لتتمكّن من إعادة استخدام كلمة سر مستخدمة مسبقًا." +msgstr[5] "" +"أنت تحاول إعادة استخدام كلمة مرور كنت قد استعملتها مؤخّراً. يجب أن تستخدم " +"{num} كلمات مرور مميّزة قبل إعادة استخدام واحدة مستخدمة مسبقاً." + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"day must elapse between password resets." +msgid_plural "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"days must elapse between password resets." +msgstr[0] "" +"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " +"الأمن، يجب أن يمرّ {num} يوم بين كلّ تغييرين متتاليتين للكلمة." +msgstr[1] "" +"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " +"الأمن، يجب أن يمرّ {num} يوم بين كلّ تغييرين متتاليتين للكلمة." +msgstr[2] "" +"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " +"الأمن، يجب أن يمرّ {num} يوم بين كلّ تغييرين متتاليتين للكلمة." +msgstr[3] "" +"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " +"الأمن، يجب أن يمرّ {num} أيام بين كلّ تغييرين متتاليتين للكلمة." +msgstr[4] "" +"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " +"الأمن، يجب أن يمرّ {num} يوماً بين كلّ تغييرين متتاليتين للكلمة." +msgstr[5] "" +"لقد قمت بإعادة ضبط كلمة المرور بشكل متكرّر أكثر من اللازم. ونظراً لسياسات " +"الأمن، يجب أن يمرّ {num} يوم بين كلّ تغييرين متتاليتين للكلمة." + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#. Translators: This message is shown to users who enter a password matching +#. the username they enter(ed). +#: common/djangoapps/util/password_policy_validators.py +msgid "Password cannot be the same as the username." msgstr "" #: common/djangoapps/util/password_policy_validators.py -msgid "Too similar to a restricted dictionary word." -msgstr "تُشبه إلى حدّ كبير إحدى كلمات القاموس المحظورة." +msgid "Password is too similar to a dictionary word." +msgstr "" #: common/djangoapps/xblock_django/admin.py msgid "" @@ -5882,10 +5966,8 @@ msgstr "" "الإلكترونية." #: lms/djangoapps/commerce/models.py -msgid "Path to single course checkout page hosted by the E-Commerce service." +msgid "Path to course(s) checkout page hosted by the E-Commerce service." msgstr "" -"مسار صفحة ’السحب لفحص المراجعة‘ الخاصة بمساق واحد، والمُستضافة من قبل خدمة " -"التجارة الإلكترونية." #: lms/djangoapps/commerce/models.py openedx/core/djangoapps/catalog/models.py #: openedx/core/djangoapps/credentials/models.py @@ -11199,25 +11281,6 @@ msgstr "" msgid "Enter a valid email address that contains at least {min} characters." msgstr "" -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Enter a password." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password is not long enough." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -#, python-brace-format -msgid "Password cannot be longer than {max} character." -msgstr "" - -#. Translators: This message is shown to users who enter a password matching -#. the username they enter(ed). -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password cannot be the same as the username." -msgstr "" - #. Translators: These messages are shown to users who do not enter information #. into the required field or enter it incorrectly. #: openedx/core/djangoapps/user_api/accounts/__init__.py @@ -12520,7 +12583,6 @@ msgid "Reset" msgstr "إعادة الضبط" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "القانوني" @@ -12724,8 +12786,8 @@ msgstr "" #: lms/templates/_gated_content.html msgid "" -"You must complete the section '{prereq_section_name}' with the required " -"score before you are able to view this content." +"You must earn a passing score for '{prereq_section_name}' to access this " +"content." msgstr "" #: lms/templates/_gated_content.html @@ -18931,6 +18993,10 @@ msgstr "" "لن تتلقّى إشعارًا بعناوين الطلاب الاكترونية الخاطئة التي لم تضف الى الشعبة، " "لذا يُرجى إعادة التحقّق من عدم وجود أخطاء إملائية." +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -20981,18 +21047,6 @@ msgid "" "粤ICP备17044299号-2. " msgstr "" -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "لمحة عن edX" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" - #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" msgstr "" @@ -21005,6 +21059,10 @@ msgid "" "their identity." msgstr "" +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "لمحة عن edX" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.mo b/conf/locale/ar/LC_MESSAGES/djangojs.mo index a8b4415796..0623322346 100644 Binary files a/conf/locale/ar/LC_MESSAGES/djangojs.mo and b/conf/locale/ar/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.po b/conf/locale/ar/LC_MESSAGES/djangojs.po index 1cf79ed135..5c2af6216c 100644 --- a/conf/locale/ar/LC_MESSAGES/djangojs.po +++ b/conf/locale/ar/LC_MESSAGES/djangojs.po @@ -138,7 +138,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:50+0000\n" "Last-Translator: Roy Zakka\n" "Language-Team: Arabic (http://www.transifex.com/open-edx/edx-platform/language/ar/)\n" @@ -2614,6 +2614,10 @@ msgstr "نأسف لتعذّر إيجاد مستخدمين يحملون الأر msgid "Reason field should not be left blank." msgstr "لا يمكن ترك حقل السبب فارغًا." +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "نأسف لحدوث خطأ في تسجيل/إلغاء تسجيل المستخدمين." @@ -3229,35 +3233,6 @@ msgstr "" msgid "Could not override problem score for {user}." msgstr "" -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "تعذّر حفظ البيانات." - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "يُرجى إدخال عنوان صحيح للبريد الإلكتروني." - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "يُرجى إدخال كلمة مرور صحيحة. " - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "" -"تم إرسال بريد إلكتروني لتغيير كلمة المرور. يُرجى اتّباع الرابط الوارد في " -"الرسالة لاستكمال العملية . " - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "" -"عذرًا، لم نتمكّن من مراسلتك عبر البريد الإلكتروني لتغيير كلمة المرور. " - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "يُرجى التحقق من بريدك الإلكتروني لتأكيد التغيير." - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "" diff --git a/conf/locale/en/LC_MESSAGES/django.po b/conf/locale/en/LC_MESSAGES/django.po index 8a07a1f8af..65771a4c7a 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-03-18 20:36+0000\n" -"PO-Revision-Date: 2018-03-18 20:36:06.141838\n" +"POT-Creation-Date: 2018-04-01 20:36+0000\n" +"PO-Revision-Date: 2018-04-01 20:36:11.596134\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: en\n" @@ -920,6 +920,12 @@ msgid "" "email, and their account will be activated immediately upon registration." msgstr "" +#: common/djangoapps/third_party_auth/models.py +msgid "" +"If this option is selected, users will be sent a welcome email upon " +"registration." +msgstr "" + #: common/djangoapps/third_party_auth/models.py msgid "" "If this option is not selected, users will not be presented with the " @@ -1337,6 +1343,93 @@ msgstr "" msgid "System defined milestone" msgstr "" +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "" +msgstr[1] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" +msgstr[1] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" +msgstr[1] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at least {requirements}." +msgstr "" + #: common/djangoapps/util/password_policy_validators.py #, python-brace-format msgid "" @@ -1361,72 +1454,26 @@ msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Password: Invalid Length ({0})" -msgstr "" +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must be {0} characters or fewer" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "Password: Must be more complex ({0})" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more uppercase characters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more digits" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more letters" -msgstr "" +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" +msgstr[1] "" #. Translators: This message is shown to users who enter a password matching #. the username they enter(ed). #: common/djangoapps/util/password_policy_validators.py -msgid "Password cannot be the same as the username" +msgid "Password cannot be the same as the username." msgstr "" #: common/djangoapps/util/password_policy_validators.py -msgid "Password: Too similar to a restricted dictionary word." +msgid "Password is too similar to a dictionary word." msgstr "" #: common/djangoapps/xblock_django/admin.py @@ -4631,7 +4678,7 @@ msgid "Open edX" msgstr "" #: lms/djangoapps/branding/api.py -msgid "Trademarks" +msgid "Trademark Policy" msgstr "" #: lms/djangoapps/branding/api.py @@ -6098,6 +6145,10 @@ msgid "" "review provider." msgstr "" +#: lms/djangoapps/instructor/settings/common.py +msgid "Your Platform Insights" +msgstr "" + #: lms/djangoapps/instructor/views/api.py #, python-brace-format msgid "" @@ -8318,6 +8369,15 @@ msgstr "" msgid "Disable User Account" msgstr "" +#: lms/djangoapps/support/views/index.py +#: lms/templates/support/entitlement.html +msgid "Entitlements" +msgstr "" + +#: lms/djangoapps/support/views/index.py +msgid "View, create, and reissue learner entitlements" +msgstr "" + #: lms/djangoapps/support/views/manage_user.py msgid "user_support_url" msgstr "" @@ -8641,10 +8701,6 @@ msgstr "" msgid "Subscribe to the {platform_name} YouTube channel" msgstr "" -#: lms/envs/common.py -msgid "Your Platform Insights" -msgstr "" - #: lms/envs/common.py msgid "Kosovo" msgstr "" @@ -11358,7 +11414,6 @@ msgid "Reset" msgstr "" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "" @@ -17107,6 +17162,10 @@ msgid "" " spelling." msgstr "" +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -18508,10 +18567,6 @@ msgstr "" msgid "Student Support: Enrollment" msgstr "" -#: lms/templates/support/entitlement.html -msgid "Entitlements" -msgstr "" - #: lms/templates/support/manage_user.html msgid "Student Support: Manage User" msgstr "" @@ -19003,21 +19058,7 @@ msgid "© 2012–{year} edX Inc. " msgstr "" #: themes/edx.org/lms/templates/footer.html -msgid "" -"EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. " -"粤ICP备17044299号-2. " -msgstr "" - -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." +msgid "EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. " msgstr "" #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html @@ -19032,6 +19073,10 @@ msgid "" "their identity." msgstr "" +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " @@ -22176,6 +22221,10 @@ msgstr "" msgid "Accessibility Accommodation Request" msgstr "" +#: cms/templates/widgets/footer.html +msgid "LMS" +msgstr "" + #. Translators: 'EdX', 'edX', 'Studio', and 'Open edX' are trademarks of 'edX #. Inc.'. Please do not translate any of these trademarks and company names. #: cms/templates/widgets/footer.html diff --git a/conf/locale/en/LC_MESSAGES/djangojs.po b/conf/locale/en/LC_MESSAGES/djangojs.po index 54675ae4dc..1d1117a59f 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-03-18 20:35+0000\n" -"PO-Revision-Date: 2018-03-18 20:36:05.979346\n" +"POT-Creation-Date: 2018-04-01 20:35+0000\n" +"PO-Revision-Date: 2018-04-01 20:36:10.994975\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: en\n" @@ -2269,6 +2269,10 @@ msgstr "" msgid "Reason field should not be left blank." msgstr "" +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "" @@ -2825,32 +2829,6 @@ msgstr "" msgid "Could not override problem score for {user}." msgstr "" -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "" - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "" - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "" - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "" - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "" diff --git a/conf/locale/eo/LC_MESSAGES/django.mo b/conf/locale/eo/LC_MESSAGES/django.mo index b1ec521f32..b29af1aac1 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 3e4f1c1279..ea11c443ac 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-03-18 20:36+0000\n" -"PO-Revision-Date: 2018-03-18 20:36:06.141838\n" +"POT-Creation-Date: 2018-04-01 20:36+0000\n" +"PO-Revision-Date: 2018-04-01 20:36:11.596134\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: en\n" @@ -1158,6 +1158,14 @@ msgstr "" "¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт ¢υρι∂αтαт " "ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι σƒƒι¢ια ∂єѕєяυηт мσłłιт αηιм ι∂#" +#: common/djangoapps/third_party_auth/models.py +msgid "" +"If this option is selected, users will be sent a welcome email upon " +"registration." +msgstr "" +"Ìf thïs öptïön ïs séléçtéd, üsérs wïll ßé sént ä wélçömé émäïl üpön " +"régïsträtïön. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#" + #: common/djangoapps/third_party_auth/models.py msgid "" "If this option is not selected, users will not be presented with the " @@ -1616,6 +1624,103 @@ msgstr "" msgid "System defined milestone" msgstr "Sýstém défïnéd mïléstöné Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢ση#" +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "{num} léttér Ⱡ'σяєм ιρѕυм ∂σłσ#" +msgstr[1] "{num} léttérs Ⱡ'σяєм ιρѕυм ∂σłσя #" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "{num} üppérçäsé léttér Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #" +msgstr[1] "{num} üppérçäsé léttérs Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "{num} löwérçäsé léttér Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #" +msgstr[1] "{num} löwérçäsé léttérs Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "{num} dïgït Ⱡ'σяєм ιρѕυм ∂σł#" +msgstr[1] "{num} dïgïts Ⱡ'σяєм ιρѕυм ∂σłσ#" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "{num} nümßér Ⱡ'σяєм ιρѕυм ∂σłσ#" +msgstr[1] "{num} nümßérs Ⱡ'σяєм ιρѕυм ∂σłσя #" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "{num} pünçtüätïön märk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #" +msgstr[1] "{num} pünçtüätïön märks Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "{num} sýmßöl Ⱡ'σяєм ιρѕυм ∂σłσ#" +msgstr[1] "{num} sýmßöls Ⱡ'σяєм ιρѕυм ∂σłσя #" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "{num} wörd Ⱡ'σяєм ιρѕυм ∂#" +msgstr[1] "{num} wörds Ⱡ'σяєм ιρѕυм ∂σł#" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" +"Ýöür pässwörd müst çöntäïn ät léäst {num} çhäräçtér. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт " +"αмєт, ¢σηѕє¢тєтυя α#" +msgstr[1] "" +"Ýöür pässwörd müst çöntäïn ät léäst {num} çhäräçtérs. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт" +" αмєт, ¢σηѕє¢тєтυя α#" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" +"Ýöür pässwörd müst çöntäïn ät léäst {num} çhäräçtér, ïnçlüdïng " +"{requirements}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α#" +msgstr[1] "" +"Ýöür pässwörd müst çöntäïn ät léäst {num} çhäräçtérs, ïnçlüdïng " +"{requirements}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя #" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at least {requirements}." +msgstr "" +"Éntér ä pässwörd wïth ät léäst {requirements}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " +"¢σηѕє¢тєт#" + #: common/djangoapps/util/password_policy_validators.py #, python-brace-format msgid "" @@ -1648,91 +1753,35 @@ msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Password: Invalid Length ({0})" -msgstr "Pässwörd: Ìnvälïd Léngth ({0}) Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#" +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "{num} çhäräçtér Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#" +msgstr[1] "{num} çhäräçtérs Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "müst ßé {0} çhäräçtérs ör möré Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must be {0} characters or fewer" -msgstr "müst ßé {0} çhäräçtérs ör féwér Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "Password: Must be more complex ({0})" -msgstr "" -"Pässwörd: Müst ßé möré çömpléx ({0}) Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " -"¢σηѕє¢тєтυ#" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more uppercase characters" -msgstr "" -"müst çöntäïn {0} ör möré üppérçäsé çhäräçtérs Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" +"Éntér ä pässwörd wïth ät möst {num} çhäräçtér. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " "¢σηѕє¢тєтυя #" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "" -"müst çöntäïn {0} ör möré löwérçäsé çhäräçtérs Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " -"¢σηѕє¢тєтυя #" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more digits" -msgstr "müst çöntäïn {0} ör möré dïgïts Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "" -"müst çöntäïn {0} ör möré pünçtüätïön çhäräçtérs Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт," -" ¢σηѕє¢тєтυя α#" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "" -"müst çöntäïn {0} ör möré nön äsçïï çhäräçtérs Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " -"¢σηѕє¢тєтυя #" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "" -"müst çöntäïn {0} ör möré ünïqüé wörds Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " -"¢σηѕє¢тєтυ#" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" -msgstr "" -"müst çöntäïn {0} ör möré nümßérs Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more letters" -msgstr "" -"müst çöntäïn {0} ör möré léttérs Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#" +msgstr[1] "" +"Éntér ä pässwörd wïth ät möst {num} çhäräçtérs. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт," +" ¢σηѕє¢тєтυя #" #. Translators: This message is shown to users who enter a password matching #. the username they enter(ed). #: common/djangoapps/util/password_policy_validators.py -msgid "Password cannot be the same as the username" +msgid "Password cannot be the same as the username." msgstr "" -"Pässwörd çännöt ßé thé sämé äs thé üsérnämé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " +"Pässwörd çännöt ßé thé sämé äs thé üsérnämé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " "¢σηѕє¢тєтυя #" #: common/djangoapps/util/password_policy_validators.py -msgid "Password: Too similar to a restricted dictionary word." +msgid "Password is too similar to a dictionary word." msgstr "" -"Pässwörd: Töö sïmïlär tö ä réstrïçtéd dïçtïönärý wörd. Ⱡ'σяєм ιρѕυм ∂σłσя " -"ѕιт αмєт, ¢σηѕє¢тєтυя α#" +"Pässwörd ïs töö sïmïlär tö ä dïçtïönärý wörd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " +"¢σηѕє¢тєтυя #" #: common/djangoapps/xblock_django/admin.py msgid "" @@ -6022,8 +6071,8 @@ msgid "Open edX" msgstr "Öpén édX Ⱡ'σяєм ιρѕυм ∂#" #: lms/djangoapps/branding/api.py -msgid "Trademarks" -msgstr "Trädémärks Ⱡ'σяєм ιρѕυм ∂σłσ#" +msgid "Trademark Policy" +msgstr "Trädémärk Pölïçý Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#" #: lms/djangoapps/branding/api.py #, python-brace-format @@ -7865,6 +7914,10 @@ msgstr "" "{student_username} wäs révïéwéd äs {review_status} ßý thé pröçtöréd éxäm " "révïéw prövïdér. Ⱡ'σяєм ιρѕυм ∂σł#" +#: lms/djangoapps/instructor/settings/common.py +msgid "Your Platform Insights" +msgstr "Ýöür Plätförm Ìnsïghts Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#" + #: lms/djangoapps/instructor/views/api.py #, python-brace-format msgid "" @@ -10712,6 +10765,17 @@ msgstr "Mänägé Ûsér Ⱡ'σяєм ιρѕυм ∂σłσя #" msgid "Disable User Account" msgstr "Dïsäßlé Ûsér Àççöünt Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #" +#: lms/djangoapps/support/views/index.py +#: lms/templates/support/entitlement.html +msgid "Entitlements" +msgstr "Éntïtléménts Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#" + +#: lms/djangoapps/support/views/index.py +msgid "View, create, and reissue learner entitlements" +msgstr "" +"Vïéw, çréäté, änd réïssüé léärnér éntïtléménts Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " +"¢σηѕє¢тєтυя α#" + #: lms/djangoapps/support/views/manage_user.py msgid "user_support_url" msgstr "üsér_süppört_ürl Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#" @@ -11082,10 +11146,6 @@ msgstr "" "Süßsçrïßé tö thé {platform_name} ÝöüTüßé çhännél Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт " "αмєт, ¢σηѕє¢тєтυ#" -#: lms/envs/common.py -msgid "Your Platform Insights" -msgstr "Ýöür Plätförm Ìnsïghts Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#" - #: lms/envs/common.py msgid "Kosovo" msgstr "Kösövö Ⱡ'σяєм ιρѕυ#" @@ -14446,7 +14506,6 @@ msgid "Reset" msgstr "Rését Ⱡ'σяєм ιρѕ#" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "Légäl Ⱡ'σяєм ιρѕ#" @@ -21830,6 +21889,11 @@ msgstr "" "Ýöü wïll nöt gét nötïfïçätïön för émäïls thät ßöünçé, sö pléäsé döüßlé-çhéçk" " spéllïng. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#" +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" +"Rölé öf thé üsérs ßéïng énrölléd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -23611,10 +23675,6 @@ msgstr "Çöntäçt {platform_name} Süppört Ⱡ'σяєм ιρѕυм ∂σłσ msgid "Student Support: Enrollment" msgstr "Stüdént Süppört: Énröllmént Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє#" -#: lms/templates/support/entitlement.html -msgid "Entitlements" -msgstr "Éntïtléménts Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#" - #: lms/templates/support/manage_user.html msgid "Student Support: Manage User" msgstr "Stüdént Süppört: Mänägé Ûsér Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#" @@ -24208,32 +24268,10 @@ msgid "© 2012–{year} edX Inc. " msgstr "© 2012–{year} édX Ìnç. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #" #: themes/edx.org/lms/templates/footer.html -msgid "" -"EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. " -"粤ICP备17044299号-2. " +msgid "EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. " msgstr "" -"ÉdX, Öpén édX, änd MïçröMästérs äré régïstéréd trädémärks öf édX Ìnç. " -"粤ÌÇP备17044299号-2. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#" - -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "Àßöüt édX Ⱡ'σяєм ιρѕυм ∂σł#" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" -"© 2012–{year} édX Ìnç. Àll rïghts résérvéd éxçépt whéré nötéd. ÉdX, Öpén " -"édX änd thé édX änd Öpén édX lögös äré régïstéréd trädémärks ör trädémärks " -"öf édX Ìnç. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ " -"∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ " -"мιηιм νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ ηιѕι υт αłιqυιρ єχ " -"єα ¢σммσ∂σ ¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη νσłυρтαтє " -"νєłιт єѕѕє ¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт " -"¢υρι∂αтαт ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι σƒƒι¢ια ∂єѕєяυηт#" +"ÉdX, Öpén édX, änd MïçröMästérs äré régïstéréd trädémärks öf édX Ìnç. " +"Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя #" #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" @@ -24255,6 +24293,10 @@ msgstr "" "єχ єα ¢σммσ∂σ ¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη νσłυρтαтє" " νєłιт #" +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "Àßöüt édX Ⱡ'σяєм ιρѕυм ∂σł#" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " @@ -28655,6 +28697,10 @@ msgid "Accessibility Accommodation Request" msgstr "" "Àççéssïßïlïtý Àççömmödätïön Réqüést Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєт#" +#: cms/templates/widgets/footer.html +msgid "LMS" +msgstr "LMS Ⱡ'σяєм#" + #. Translators: 'EdX', 'edX', 'Studio', and 'Open edX' are trademarks of 'edX #. Inc.'. Please do not translate any of these trademarks and company names. #: cms/templates/widgets/footer.html diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.mo b/conf/locale/eo/LC_MESSAGES/djangojs.mo index 4f18953ce5..34321d6aa5 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 893f4460cd..287ff03d16 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-03-18 20:35+0000\n" -"PO-Revision-Date: 2018-03-18 20:36:05.979346\n" +"POT-Creation-Date: 2018-04-01 20:35+0000\n" +"PO-Revision-Date: 2018-04-01 20:36:10.994975\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: en\n" @@ -2820,6 +2820,12 @@ msgstr "" "Réäsön fïéld shöüld nöt ßé léft ßlänk. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " "¢σηѕє¢тєтυя#" +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" +"Rölé fïéld shöüld nöt ßé léft ünséléçtéd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " +"¢σηѕє¢тєтυя #" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "" @@ -3577,39 +3583,6 @@ msgstr "" "Çöüld nöt övérrïdé prößlém sçöré för {user}. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " "¢σηѕє¢тєтυя #" -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "Thé dätä çöüld nöt ßé sävéd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "" -"Pléäsé éntér ä välïd émäïl äddréss Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєт#" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "Pléäsé éntér ä välïd pässwörd Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#" - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "" -"Pässwörd rését émäïl sént. Föllöw thé lïnk ïn thé émäïl tö çhängé ýöür " -"pässwörd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#" - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "" -"Wé wérén't äßlé tö sénd ýöü ä pässwörd rését émäïl. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт " -"αмєт, ¢σηѕє¢тєтυя α#" - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "" -"Pléäsé çhéçk ýöür émäïl tö çönfïrm thé çhängé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, " -"¢σηѕє¢тєтυя #" - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "Térms öf Sérvïçé änd Hönör Çödé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢т#" diff --git a/conf/locale/es_419/LC_MESSAGES/django.mo b/conf/locale/es_419/LC_MESSAGES/django.mo index 35c7220245..b511526213 100644 Binary files a/conf/locale/es_419/LC_MESSAGES/django.mo and b/conf/locale/es_419/LC_MESSAGES/django.mo differ diff --git a/conf/locale/es_419/LC_MESSAGES/django.po b/conf/locale/es_419/LC_MESSAGES/django.po index 85b896a827..626da98b52 100644 --- a/conf/locale/es_419/LC_MESSAGES/django.po +++ b/conf/locale/es_419/LC_MESSAGES/django.po @@ -210,16 +210,17 @@ # Translators: # Cristian Salamea , 2015 # Diego Rojas , 2017 -# Juan Camilo Montoya Franco , 2018 +# Juan Camilo Montoya Franco , 2014,2018 # Juan Camilo Montoya Franco , 2014 # Laura Silva , 2016 +# Leonardo J. Caballero G. , 2018 msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" -"PO-Revision-Date: 2018-03-13 13:51+0000\n" -"Last-Translator: karlman72 \n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" +"PO-Revision-Date: 2018-03-23 23:51+0000\n" +"Last-Translator: Leonardo J. Caballero G. \n" "Language-Team: Spanish (Latin America) (http://www.transifex.com/open-edx/edx-platform/language/es_419/)\n" "Language: es_419\n" "MIME-Version: 1.0\n" @@ -599,15 +600,6 @@ msgstr "Para inscribirse, debe aceptar el Código de Honor." msgid "You are missing one or more required fields" msgstr "No ha llenado uno o más campos requeridos" -#: common/djangoapps/student/forms.py -msgid "Username and password fields cannot match" -msgstr "Los campos de usuario y contraseña no concuerdan" - -#: common/djangoapps/student/forms.py -#: common/djangoapps/student/views/management.py -msgid "Password: " -msgstr "Contraseña:" - #: common/djangoapps/student/forms.py msgid "Unauthorized email address." msgstr "Dirección de correo electrónico no autorizada" @@ -1117,38 +1109,6 @@ msgstr "" "relación a los cursos en los cuales está inscrito/a. Inicie Sesión para " "continuar." -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct password before reusing a previous password." -msgid_plural "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct passwords before reusing a previous password." -msgstr[0] "" -"Está reutilizando una contraseña usada recientemente. Debe utilizar al menos" -" {num} contraseña diferente antes de reutilizar la misma." -msgstr[1] "" -"Está reutilizando una contraseña usada recientemente. Debe utilizar al menos" -" {num} contraseñas diferentes antes de reutilizar la misma." - -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"day must elapse between password resets." -msgid_plural "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"days must elapse between password resets." -msgstr[0] "" -"Está solicitando cambiar de contraseña con demasiada frecuencia. Por " -"políticas de seguridad, debe dejar transcurrir al menos {num} día antes de " -"hacer otra solicitud." -msgstr[1] "" -"Está solicitando cambiar de contraseña con demasiada frecuencia. Debido a " -"políticas de seguridad, debe dejar transcurrir al menos {num} días antes de " -"hacer otra solicitud." - #: common/djangoapps/student/views/management.py msgid "Password reset unsuccessful" msgstr "El cambio de contraseña no ha sido exitoso" @@ -1666,69 +1626,148 @@ msgstr "" msgid "System defined milestone" msgstr "Sistema de hito definido" +#. Translators: This appears in a list of password requirements #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Invalid Length ({0})" -msgstr "Longitud inválida ({0})" +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "debe tener {0} caracteres o más" +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or fewer" -msgstr "debe tener {0} caracteres o menos" +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Must be more complex ({0})" -msgstr "Debe ser más compleja ({0})" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more uppercase characters" -msgstr "debe contener {0} o más caracteres en mayúscula" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "debe contener {0} o más caracteres en minúscula" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more digits" -msgstr "debe contener {0} o más dígitos" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "debe contener {0} o más signos de puntuación" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "debe contener {0} o más caracteres no ascii" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "debe contener {0} o más palabras únicas" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" +msgid "Enter a password with at least {requirements}." msgstr "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more letters" +msgid "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct password before reusing a previous password." +msgid_plural "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct passwords before reusing a previous password." +msgstr[0] "" +"Está reutilizando una contraseña usada recientemente. Debe utilizar al menos" +" {num} contraseña diferente antes de reutilizar la misma." +msgstr[1] "" +"Está reutilizando una contraseña usada recientemente. Debe utilizar al menos" +" {num} contraseñas diferentes antes de reutilizar la misma." + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"day must elapse between password resets." +msgid_plural "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"days must elapse between password resets." +msgstr[0] "" +"Está solicitando cambiar de contraseña con demasiada frecuencia. Por " +"políticas de seguridad, debe dejar transcurrir al menos {num} día antes de " +"hacer otra solicitud." +msgstr[1] "" +"Está solicitando cambiar de contraseña con demasiada frecuencia. Debido a " +"políticas de seguridad, debe dejar transcurrir al menos {num} días antes de " +"hacer otra solicitud." + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "" +msgstr[1] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" +msgstr[1] "" + +#. Translators: This message is shown to users who enter a password matching +#. the username they enter(ed). +#: common/djangoapps/util/password_policy_validators.py +msgid "Password cannot be the same as the username." msgstr "" #: common/djangoapps/util/password_policy_validators.py -msgid "Too similar to a restricted dictionary word." -msgstr "Demasiado similar a una palabra restringida del diccionario." +msgid "Password is too similar to a dictionary word." +msgstr "" #: common/djangoapps/xblock_django/admin.py msgid "" @@ -6042,10 +6081,8 @@ msgstr "" "Use la página de compra proveída por el servicio de comercio electrónico." #: lms/djangoapps/commerce/models.py -msgid "Path to single course checkout page hosted by the E-Commerce service." +msgid "Path to course(s) checkout page hosted by the E-Commerce service." msgstr "" -"Camino a la página de compra de cursos individuales proveída por el servicio" -" de comercio electrónico." #: lms/djangoapps/commerce/models.py openedx/core/djangoapps/catalog/models.py #: openedx/core/djangoapps/credentials/models.py @@ -11620,25 +11657,6 @@ msgid "Enter a valid email address that contains at least {min} characters." msgstr "" "Ingrese un correo electrónico válido que contenga al menos {min} caracteres." -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Enter a password." -msgstr "Entra una contraseña." - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password is not long enough." -msgstr "La contraseña está muy larga." - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -#, python-brace-format -msgid "Password cannot be longer than {max} character." -msgstr "La contraseña no puede ser mayor a {max} caracteres." - -#. Translators: This message is shown to users who enter a password matching -#. the username they enter(ed). -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password cannot be the same as the username." -msgstr "La contraseña no puede ser igual al nombre de usuario." - #. Translators: These messages are shown to users who do not enter information #. into the required field or enter it incorrectly. #: openedx/core/djangoapps/user_api/accounts/__init__.py @@ -13023,7 +13041,6 @@ msgid "Reset" msgstr "Reiniciar" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "Legal" @@ -13226,11 +13243,9 @@ msgstr "Contenido Bloqueado" #: lms/templates/_gated_content.html msgid "" -"You must complete the section '{prereq_section_name}' with the required " -"score before you are able to view this content." +"You must earn a passing score for '{prereq_section_name}' to access this " +"content." msgstr "" -"Debes completar la sección '{prereq_section_name}' con la calificación " -"requerida antes de poder ver este contenido." #: lms/templates/_gated_content.html msgid "Go to Prerequisite Section" @@ -19659,6 +19674,10 @@ msgstr "" "No recibirás notificaciones de los correos con rebotes, por lo tanto, debes " "asegurarse de que los correos estén bien escritos." +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -21815,21 +21834,6 @@ msgid "" "粤ICP备17044299号-2. " msgstr "" -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "Acerca de edX" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" -"© 2012–{year} edX Inc. Todos los derechos reservados excepto donde se " -"indica. EdX, Open edX y los logotipos edX y Open edX son marcas registradas " -"o marcas comerciales de edX Inc." - #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" msgstr "Acerca de los Certificados Verificados de edX" @@ -21846,6 +21850,10 @@ msgstr "" "requeridas de este curso según sus pautas, además de que se ha verificado su" " identidad con foto para verificar su identidad." +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "Acerca de edX" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " diff --git a/conf/locale/es_419/LC_MESSAGES/djangojs.mo b/conf/locale/es_419/LC_MESSAGES/djangojs.mo index 8f7c58223a..b6daea0456 100644 Binary files a/conf/locale/es_419/LC_MESSAGES/djangojs.mo and b/conf/locale/es_419/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/es_419/LC_MESSAGES/djangojs.po b/conf/locale/es_419/LC_MESSAGES/djangojs.po index e52d470f42..6992d38500 100644 --- a/conf/locale/es_419/LC_MESSAGES/djangojs.po +++ b/conf/locale/es_419/LC_MESSAGES/djangojs.po @@ -140,7 +140,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:50+0000\n" "Last-Translator: Juan Camilo Montoya Franco \n" "Language-Team: Spanish (Latin America) (http://www.transifex.com/open-edx/edx-platform/language/es_419/)\n" @@ -2603,6 +2603,10 @@ msgstr "No se puede encontrar el usuario asociado al siguiente identificador:" msgid "Reason field should not be left blank." msgstr "El campo de Razón no pude dejarse vacío." +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "Error al inscribir o desinscribir usuarios." @@ -3263,34 +3267,6 @@ msgid "Could not override problem score for {user}." msgstr "" "No fue posible sobreescribir el puntaje del problema para el usuario {user}." -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "Los datos no pudieron ser guardados." - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "Por favor ingresa una dirección de correo electrónico válida." - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "Por favor ingresa una contraseña válida" - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "" -"Se ha enviado el correo para restablecer tu contraseña. Sigue el vínculo " -"enviado en el correo para realizar el cambio." - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "No se ha podido enviar el correo para restablecer tu contraseña." - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "Por favor revisa tu correo para confirmar el cambio" - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "Términos del servicio y código de honor" diff --git a/conf/locale/fr/LC_MESSAGES/django.mo b/conf/locale/fr/LC_MESSAGES/django.mo index c9863de09d..82898bf019 100644 Binary files a/conf/locale/fr/LC_MESSAGES/django.mo and b/conf/locale/fr/LC_MESSAGES/django.mo differ diff --git a/conf/locale/fr/LC_MESSAGES/django.po b/conf/locale/fr/LC_MESSAGES/django.po index 256c2a1882..6cd005a20d 100644 --- a/conf/locale/fr/LC_MESSAGES/django.po +++ b/conf/locale/fr/LC_MESSAGES/django.po @@ -264,7 +264,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:51+0000\n" "Last-Translator: Isabelle Gonon \n" "Language-Team: French (http://www.transifex.com/open-edx/edx-platform/language/fr/)\n" @@ -647,16 +647,6 @@ msgstr "Pour vous inscrire, vous devez accepter le code d'honneur." msgid "You are missing one or more required fields" msgstr "Il vous manque un ou plusieurs champs obligatoires" -#: common/djangoapps/student/forms.py -msgid "Username and password fields cannot match" -msgstr "" -"Le nom d'utilisateur et le mot de passe ne peuvent pas être identiques " - -#: common/djangoapps/student/forms.py -#: common/djangoapps/student/views/management.py -msgid "Password: " -msgstr "Mot de passe : " - #: common/djangoapps/student/forms.py msgid "Unauthorized email address." msgstr "Adresse email non autorisée." @@ -1151,40 +1141,6 @@ msgid "" "enrolled in. Sign In to continue." msgstr "" -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct password before reusing a previous password." -msgid_plural "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct passwords before reusing a previous password." -msgstr[0] "" -"Vous tentez de réutiliser un mot de passe que vous avez employé récemment. " -"Vous devez définir un {num} mot de passe différent avant de pouvoir " -"réutiliser un ancien mot de passe." -msgstr[1] "" -"Vous tentez de réutiliser un mot de passe que vous avez employé récemment. " -"Vous devez définir {num} mots de passe différents avant de pouvoir " -"réutiliser un ancien mot de passe." - -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"day must elapse between password resets." -msgid_plural "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"days must elapse between password resets." -msgstr[0] "" -"Vous réinitialisez votre mot de passe trop souvent. En raison de politiques " -"de sécurité, {num} jour doivent s'écouler entre les réinitialisations de mot" -" de passe." -msgstr[1] "" -"Vous réinitialisez votre mot de passe trop souvent. En raison de politiques " -"de sécurité, {num} jours doivent s'écouler entre les réinitialisations de " -"mot de passe." - #: common/djangoapps/student/views/management.py msgid "Password reset unsuccessful" msgstr "La réinitialisation du mot de passe a échoué." @@ -1684,69 +1640,150 @@ msgstr "Le cours {course_id} a pour pré-requis {prerequisite_course_id}" msgid "System defined milestone" msgstr "Étape définie par le système" +#. Translators: This appears in a list of password requirements #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Invalid Length ({0})" -msgstr "Longueur invalide ({0})" +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "doit contenir {0} caractères ou plus" +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or fewer" -msgstr "doit être de {0} caractères ou moins" +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Must be more complex ({0})" -msgstr "Doit être plus complexe ({0})" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more uppercase characters" -msgstr "doit contenir {0} ou plus de lettres majuscules" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "doit contenir {0} lettres minuscules ou plus" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more digits" -msgstr "doit contenir {0} chiffres ou plus" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "doit contenir {0} d'éléments de ponctuation ou plus " - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "doit contenir {0} caractères non ascii ou plus" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" +msgid "Enter a password with at least {requirements}." msgstr "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more numbers" -msgstr "" +msgid "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct password before reusing a previous password." +msgid_plural "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct passwords before reusing a previous password." +msgstr[0] "" +"Vous tentez de réutiliser un mot de passe que vous avez employé récemment. " +"Vous devez définir un {num} mot de passe différent avant de pouvoir " +"réutiliser un ancien mot de passe." +msgstr[1] "" +"Vous tentez de réutiliser un mot de passe que vous avez employé récemment. " +"Vous devez définir {num} mots de passe différents avant de pouvoir " +"réutiliser un ancien mot de passe." #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more letters" +msgid "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"day must elapse between password resets." +msgid_plural "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"days must elapse between password resets." +msgstr[0] "" +"Vous réinitialisez votre mot de passe trop souvent. En raison de politiques " +"de sécurité, {num} jour doivent s'écouler entre les réinitialisations de mot" +" de passe." +msgstr[1] "" +"Vous réinitialisez votre mot de passe trop souvent. En raison de politiques " +"de sécurité, {num} jours doivent s'écouler entre les réinitialisations de " +"mot de passe." + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "" +msgstr[1] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" +msgstr[1] "" + +#. Translators: This message is shown to users who enter a password matching +#. the username they enter(ed). +#: common/djangoapps/util/password_policy_validators.py +msgid "Password cannot be the same as the username." msgstr "" #: common/djangoapps/util/password_policy_validators.py -msgid "Too similar to a restricted dictionary word." -msgstr "Trop semblable à un mot interdit du dictionnaire" +msgid "Password is too similar to a dictionary word." +msgstr "" #: common/djangoapps/xblock_django/admin.py msgid "" @@ -5773,7 +5810,7 @@ msgstr "" "électronique." #: lms/djangoapps/commerce/models.py -msgid "Path to single course checkout page hosted by the E-Commerce service." +msgid "Path to course(s) checkout page hosted by the E-Commerce service." msgstr "" #: lms/djangoapps/commerce/models.py openedx/core/djangoapps/catalog/models.py @@ -10861,25 +10898,6 @@ msgstr "" msgid "Enter a valid email address that contains at least {min} characters." msgstr "" -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Enter a password." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password is not long enough." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -#, python-brace-format -msgid "Password cannot be longer than {max} character." -msgstr "" - -#. Translators: This message is shown to users who enter a password matching -#. the username they enter(ed). -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password cannot be the same as the username." -msgstr "" - #. Translators: These messages are shown to users who do not enter information #. into the required field or enter it incorrectly. #: openedx/core/djangoapps/user_api/accounts/__init__.py @@ -12191,7 +12209,6 @@ msgid "Reset" msgstr "Réinitialiser" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "Légal" @@ -12387,8 +12404,8 @@ msgstr "" #: lms/templates/_gated_content.html msgid "" -"You must complete the section '{prereq_section_name}' with the required " -"score before you are able to view this content." +"You must earn a passing score for '{prereq_section_name}' to access this " +"content." msgstr "" #: lms/templates/_gated_content.html @@ -18195,6 +18212,10 @@ msgstr "" "Vous ne recevrez pas de notification pour les e-mails rejetés, donc soyez " "doublement attentif à l'orthographe." +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -20192,18 +20213,6 @@ msgid "" "粤ICP备17044299号-2. " msgstr "" -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "A propos d'edX" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" - #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" msgstr "" @@ -20216,6 +20225,10 @@ msgid "" "their identity." msgstr "" +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "A propos d'edX" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " diff --git a/conf/locale/fr/LC_MESSAGES/djangojs.mo b/conf/locale/fr/LC_MESSAGES/djangojs.mo index 60f7ea4d3b..66286ce1ec 100644 Binary files a/conf/locale/fr/LC_MESSAGES/djangojs.mo and b/conf/locale/fr/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/fr/LC_MESSAGES/djangojs.po b/conf/locale/fr/LC_MESSAGES/djangojs.po index 10c90d0485..6ec709de79 100644 --- a/conf/locale/fr/LC_MESSAGES/djangojs.po +++ b/conf/locale/fr/LC_MESSAGES/djangojs.po @@ -172,7 +172,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:50+0000\n" "Last-Translator: moocit-france \n" "Language-Team: French (http://www.transifex.com/open-edx/edx-platform/language/fr/)\n" @@ -2554,6 +2554,10 @@ msgstr "Impossible de trouver des utilisateurs associés à ces identifiants :" msgid "Reason field should not be left blank." msgstr "Le champ Raison ne doit pas être laissé vide." +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "Erreur lors de l'inscription/désinscription d'utilisateurs." @@ -3159,36 +3163,6 @@ msgstr "" msgid "Could not override problem score for {user}." msgstr "" -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "Les données n'ont pas pu être enregistrées" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "Veuillez entrer une adresse email valide" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "Veuillez entrer un mot de passe valide" - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "" -"Email de réinitialisation du mot de passe envoyé. Suivez le lien dans " -"l'email pour changer votre mot de passe." - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "" -"Il ne nous a pas été possible de vous envoyer un mail de réinitialisation du" -" mot de passe." - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "Veuillez vérifier votre email pour confirmer les changements" - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "" diff --git a/conf/locale/he/LC_MESSAGES/django.mo b/conf/locale/he/LC_MESSAGES/django.mo index a893bcd301..c124e99008 100644 Binary files a/conf/locale/he/LC_MESSAGES/django.mo and b/conf/locale/he/LC_MESSAGES/django.mo differ diff --git a/conf/locale/he/LC_MESSAGES/django.po b/conf/locale/he/LC_MESSAGES/django.po index 77ee9ad305..114ee79ec1 100644 --- a/conf/locale/he/LC_MESSAGES/django.po +++ b/conf/locale/he/LC_MESSAGES/django.po @@ -84,7 +84,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:51+0000\n" "Last-Translator: Nadav Stark \n" "Language-Team: Hebrew (http://www.transifex.com/open-edx/edx-platform/language/he/)\n" @@ -454,15 +454,6 @@ msgstr "על מנת להירשם, עליך לפעול בהתאם לקוד האת msgid "You are missing one or more required fields" msgstr "שכחת למלא אחד משדות החובה" -#: common/djangoapps/student/forms.py -msgid "Username and password fields cannot match" -msgstr "שם משתמש וסיסמה אינם יכולים להיות זהים" - -#: common/djangoapps/student/forms.py -#: common/djangoapps/student/views/management.py -msgid "Password: " -msgstr "סיסמה:" - #: common/djangoapps/student/forms.py msgid "Unauthorized email address." msgstr "כתובת דואר אלקטרוני אינה מאושרת." @@ -954,36 +945,6 @@ msgstr "" "{html_start}הצלחה! הפעלת את החשבון שלך.{html_end} את/ה תקבל/י מאיתנו עדכונים" " והתראות הקשורים לקורסים שאת/ה רשומ/ה אליהם. להמשך התחבר/י." -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct password before reusing a previous password." -msgid_plural "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct passwords before reusing a previous password." -msgstr[0] "" -"אתה ממחזר סיסמה שהשתמשת בה לאחרונה. עליך ליצור סיסמה ייחודית {num} לפני " -"שתמחזר סיסמה קודמת." -msgstr[1] "" -"הינך ממחזר סיסמה שהשתמשת בה לאחרונה. עליך ליצור {num} סיסמאות ייחודיות בטרם " -"תמחזר סיסמה קודמת." - -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"day must elapse between password resets." -msgid_plural "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"days must elapse between password resets." -msgstr[0] "" -"אתה מאפס סיסמאות לעיתים קרובות מדי. בשל מדיניות אבטחה, חייב לעבור יום {num} " -"בין איפוסי הסיסמה." -msgstr[1] "" -"אתה מאפס סיסמאות לעיתים קרובות מדי. בשל מדיניות אבטחה, חייבים לעבור {num} " -"ימים בין איפוסי הסיסמה." - #: common/djangoapps/student/views/management.py msgid "Password reset unsuccessful" msgstr "איפוס סיסמה נכשל" @@ -1485,69 +1446,146 @@ msgstr "קורס {course_id} מחייב {prerequisite_course_id}" msgid "System defined milestone" msgstr "אבן דרך שהוגדרה בידי המערכת" +#. Translators: This appears in a list of password requirements #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Invalid Length ({0})" -msgstr "אורך לא תקין ({0})" +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "חייב להיות {0} תווים או יותר " +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or fewer" -msgstr "חייב להיות {0} תווים או פחות" +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Must be more complex ({0})" -msgstr "חייב להיות מסובך יותר ({0})" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more uppercase characters" -msgstr "חייב להכיל {0} אותיות גדולות או יותר " - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "חייב להכיל {0} או יותר אותיות קטנות" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more digits" -msgstr "חייב להכיל {0} מספרים או יותר " - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "חייב להכיל {0} או יותר סימני פיסוק " - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "חייב להכיל {0}תווי ASCII או יותר " - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "חייב להכיל {0} מילים ייחודיות או יותר" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" +msgid "Enter a password with at least {requirements}." msgstr "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more letters" +msgid "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct password before reusing a previous password." +msgid_plural "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct passwords before reusing a previous password." +msgstr[0] "" +"אתה ממחזר סיסמה שהשתמשת בה לאחרונה. עליך ליצור סיסמה ייחודית {num} לפני " +"שתמחזר סיסמה קודמת." +msgstr[1] "" +"הינך ממחזר סיסמה שהשתמשת בה לאחרונה. עליך ליצור {num} סיסמאות ייחודיות בטרם " +"תמחזר סיסמה קודמת." + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"day must elapse between password resets." +msgid_plural "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"days must elapse between password resets." +msgstr[0] "" +"אתה מאפס סיסמאות לעיתים קרובות מדי. בשל מדיניות אבטחה, חייב לעבור יום {num} " +"בין איפוסי הסיסמה." +msgstr[1] "" +"אתה מאפס סיסמאות לעיתים קרובות מדי. בשל מדיניות אבטחה, חייבים לעבור {num} " +"ימים בין איפוסי הסיסמה." + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "" +msgstr[1] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" +msgstr[1] "" + +#. Translators: This message is shown to users who enter a password matching +#. the username they enter(ed). +#: common/djangoapps/util/password_policy_validators.py +msgid "Password cannot be the same as the username." msgstr "" #: common/djangoapps/util/password_policy_validators.py -msgid "Too similar to a restricted dictionary word." -msgstr "דומה מדי למילה אסורה במילון." +msgid "Password is too similar to a dictionary word." +msgstr "" #: common/djangoapps/xblock_django/admin.py msgid "" @@ -5591,8 +5629,8 @@ msgid "Use the checkout page hosted by the E-Commerce service." msgstr "השתמש בעמוד היציאה המאוחסן בשירות מסחר אלקטרוני." #: lms/djangoapps/commerce/models.py -msgid "Path to single course checkout page hosted by the E-Commerce service." -msgstr "נתיב לקורס יחיד בעמוד היציאה המאוחסן בשירות מסחר אלקטרוני." +msgid "Path to course(s) checkout page hosted by the E-Commerce service." +msgstr "" #: lms/djangoapps/commerce/models.py openedx/core/djangoapps/catalog/models.py #: openedx/core/djangoapps/credentials/models.py @@ -10801,25 +10839,6 @@ msgstr "" msgid "Enter a valid email address that contains at least {min} characters." msgstr "" -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Enter a password." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password is not long enough." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -#, python-brace-format -msgid "Password cannot be longer than {max} character." -msgstr "" - -#. Translators: This message is shown to users who enter a password matching -#. the username they enter(ed). -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password cannot be the same as the username." -msgstr "" - #. Translators: These messages are shown to users who do not enter information #. into the required field or enter it incorrectly. #: openedx/core/djangoapps/user_api/accounts/__init__.py @@ -12124,7 +12143,6 @@ msgid "Reset" msgstr "אתחל" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "משפטי" @@ -12320,8 +12338,8 @@ msgstr "" #: lms/templates/_gated_content.html msgid "" -"You must complete the section '{prereq_section_name}' with the required " -"score before you are able to view this content." +"You must earn a passing score for '{prereq_section_name}' to access this " +"content." msgstr "" #: lms/templates/_gated_content.html @@ -12567,7 +12585,7 @@ msgid "" msgstr "" "יש לך {strong_start}שאלות כלליות על {platform_name}{strong_end}? בקרוב נוסיף" " עמוד שאלות ותשובות ובו תוכל למצוא מידע רב ומועיל ב{platform_name} " -"{link_start}שאלות הנפוצות{link_end}." +"{link_start}שאלות נפוצות{link_end}." #: lms/templates/help_modal.html msgid "" @@ -18370,6 +18388,10 @@ msgstr "" "לא תקבל התראות על הודעות דואר אלקטרוני שלא יגיעו ליעדם, אז אנא בדוק את " "האיות. " +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -20385,18 +20407,6 @@ msgid "" "粤ICP备17044299号-2. " msgstr "" -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "אודות edX" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" - #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" msgstr "" @@ -20409,6 +20419,10 @@ msgid "" "their identity." msgstr "" +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "אודות edX" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " diff --git a/conf/locale/he/LC_MESSAGES/djangojs.mo b/conf/locale/he/LC_MESSAGES/djangojs.mo index 54025043ac..1be248b10f 100644 Binary files a/conf/locale/he/LC_MESSAGES/djangojs.mo and b/conf/locale/he/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/he/LC_MESSAGES/djangojs.po b/conf/locale/he/LC_MESSAGES/djangojs.po index dd05e28eba..6dee54fbed 100644 --- a/conf/locale/he/LC_MESSAGES/djangojs.po +++ b/conf/locale/he/LC_MESSAGES/djangojs.po @@ -66,7 +66,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:50+0000\n" "Last-Translator: e2f_HE c1 \n" "Language-Team: Hebrew (http://www.transifex.com/open-edx/edx-platform/language/he/)\n" @@ -2384,6 +2384,10 @@ msgstr "לא הצלחתי למצוא משתמשים המשוייכים למזה msgid "Reason field should not be left blank." msgstr "שדה הסיבה אינו יכול להישאר ריק." +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "שגיאה בהרשמה/ביטול הרשמה של משתמשים." @@ -2988,34 +2992,6 @@ msgstr "" msgid "Could not override problem score for {user}." msgstr "" -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "המידע לא נשמר " - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "אנא הזן כתובת דואר אלקטרוני תקפה" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "אנא הזן סיסמה תקפה" - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "" -"דואר אלקטרוני לאיפוס סיסמה נשלח. לחץ על הקישור בדואר האלקטרוני כדי לשנות את " -"סיסמתך." - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "לא הצלחנו לשלוח לך דואר אלקטרוני לאיפוס סיסמה." - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "בדוק את הדואר האלקטרוני שלך כדי לאשר את השינוי" - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "תנאי שימוש וקוד אתי" diff --git a/conf/locale/hi/LC_MESSAGES/django.mo b/conf/locale/hi/LC_MESSAGES/django.mo index 896911108a..f16f0fe02c 100644 Binary files a/conf/locale/hi/LC_MESSAGES/django.mo and b/conf/locale/hi/LC_MESSAGES/django.mo differ diff --git a/conf/locale/hi/LC_MESSAGES/django.po b/conf/locale/hi/LC_MESSAGES/django.po index 2b79f8dd68..68c0962161 100644 --- a/conf/locale/hi/LC_MESSAGES/django.po +++ b/conf/locale/hi/LC_MESSAGES/django.po @@ -71,7 +71,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:51+0000\n" "Last-Translator: ria1234 \n" "Language-Team: Hindi (http://www.transifex.com/open-edx/edx-platform/language/hi/)\n" @@ -425,15 +425,6 @@ msgstr "" msgid "You are missing one or more required fields" msgstr "" -#: common/djangoapps/student/forms.py -msgid "Username and password fields cannot match" -msgstr "" - -#: common/djangoapps/student/forms.py -#: common/djangoapps/student/views/management.py -msgid "Password: " -msgstr "" - #: common/djangoapps/student/forms.py msgid "Unauthorized email address." msgstr "" @@ -893,28 +884,6 @@ msgid "" "enrolled in. Sign In to continue." msgstr "" -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct password before reusing a previous password." -msgid_plural "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct passwords before reusing a previous password." -msgstr[0] "" -msgstr[1] "" - -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"day must elapse between password resets." -msgid_plural "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"days must elapse between password resets." -msgstr[0] "" -msgstr[1] "" - #: common/djangoapps/student/views/management.py msgid "Password reset unsuccessful" msgstr "" @@ -1399,68 +1368,137 @@ msgstr "" msgid "System defined milestone" msgstr "" +#. Translators: This appears in a list of password requirements #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Invalid Length ({0})" +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "" +msgstr[1] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" +msgstr[1] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" +msgstr[1] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at least {requirements}." msgstr "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "" +msgid "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct password before reusing a previous password." +msgid_plural "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct passwords before reusing a previous password." +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or fewer" -msgstr "" +msgid "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"day must elapse between password resets." +msgid_plural "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"days must elapse between password resets." +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Must be more complex ({0})" -msgstr "" +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more uppercase characters" +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" +msgstr[1] "" + +#. Translators: This message is shown to users who enter a password matching +#. the username they enter(ed). +#: common/djangoapps/util/password_policy_validators.py +msgid "Password cannot be the same as the username." msgstr "" #: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more digits" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more letters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -msgid "Too similar to a restricted dictionary word." +msgid "Password is too similar to a dictionary word." msgstr "" #: common/djangoapps/xblock_django/admin.py @@ -5130,7 +5168,7 @@ msgid "Use the checkout page hosted by the E-Commerce service." msgstr "" #: lms/djangoapps/commerce/models.py -msgid "Path to single course checkout page hosted by the E-Commerce service." +msgid "Path to course(s) checkout page hosted by the E-Commerce service." msgstr "" #: lms/djangoapps/commerce/models.py openedx/core/djangoapps/catalog/models.py @@ -10022,25 +10060,6 @@ msgstr "" msgid "Enter a valid email address that contains at least {min} characters." msgstr "" -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Enter a password." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password is not long enough." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -#, python-brace-format -msgid "Password cannot be longer than {max} character." -msgstr "" - -#. Translators: This message is shown to users who enter a password matching -#. the username they enter(ed). -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password cannot be the same as the username." -msgstr "" - #. Translators: These messages are shown to users who do not enter information #. into the required field or enter it incorrectly. #: openedx/core/djangoapps/user_api/accounts/__init__.py @@ -11299,7 +11318,6 @@ msgid "Reset" msgstr "रीसेट करें" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "" @@ -11495,8 +11513,8 @@ msgstr "" #: lms/templates/_gated_content.html msgid "" -"You must complete the section '{prereq_section_name}' with the required " -"score before you are able to view this content." +"You must earn a passing score for '{prereq_section_name}' to access this " +"content." msgstr "" #: lms/templates/_gated_content.html @@ -17112,6 +17130,10 @@ msgstr "" "बाउंस अथवा वापिस आई हुई ई-मेल की सूचना नहीं दी जायेगी, कृपया वर्तनी की दोहरी" " जांच कर लें। " +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -19045,18 +19067,6 @@ msgid "" "粤ICP备17044299号-2. " msgstr "" -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" - #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" msgstr "" @@ -19069,6 +19079,10 @@ msgid "" "their identity." msgstr "" +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " diff --git a/conf/locale/hi/LC_MESSAGES/djangojs.mo b/conf/locale/hi/LC_MESSAGES/djangojs.mo index bafb995407..c92325a5be 100644 Binary files a/conf/locale/hi/LC_MESSAGES/djangojs.mo and b/conf/locale/hi/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/hi/LC_MESSAGES/djangojs.po b/conf/locale/hi/LC_MESSAGES/djangojs.po index 8f6e4b47dc..8d3f699a54 100644 --- a/conf/locale/hi/LC_MESSAGES/djangojs.po +++ b/conf/locale/hi/LC_MESSAGES/djangojs.po @@ -48,7 +48,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:50+0000\n" "Last-Translator: edx_transifex_bot \n" "Language-Team: Hindi (http://www.transifex.com/open-edx/edx-platform/language/hi/)\n" @@ -2273,6 +2273,10 @@ msgstr "" msgid "Reason field should not be left blank." msgstr "" +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "उपयोगकर्ताओं का नामांकन/अनामांकन करने में त्रुटि। " @@ -2840,32 +2844,6 @@ msgstr "" msgid "Could not override problem score for {user}." msgstr "" -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "" - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "" - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "" - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "" - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "" diff --git a/conf/locale/ko_KR/LC_MESSAGES/django.mo b/conf/locale/ko_KR/LC_MESSAGES/django.mo index 4051c1e311..ea81647e68 100644 Binary files a/conf/locale/ko_KR/LC_MESSAGES/django.mo and b/conf/locale/ko_KR/LC_MESSAGES/django.mo differ diff --git a/conf/locale/ko_KR/LC_MESSAGES/django.po b/conf/locale/ko_KR/LC_MESSAGES/django.po index a6b096a1a0..03e5b68f7c 100644 --- a/conf/locale/ko_KR/LC_MESSAGES/django.po +++ b/conf/locale/ko_KR/LC_MESSAGES/django.po @@ -90,7 +90,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:51+0000\n" "Last-Translator: kmooc \n" "Language-Team: Korean (Korea) (http://www.transifex.com/open-edx/edx-platform/language/ko_KR/)\n" @@ -416,15 +416,6 @@ msgstr "" msgid "You are missing one or more required fields" msgstr "" -#: common/djangoapps/student/forms.py -msgid "Username and password fields cannot match" -msgstr "" - -#: common/djangoapps/student/forms.py -#: common/djangoapps/student/views/management.py -msgid "Password: " -msgstr "" - #: common/djangoapps/student/forms.py msgid "Unauthorized email address." msgstr "" @@ -884,26 +875,6 @@ msgid "" "enrolled in. Sign In to continue." msgstr "" -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct password before reusing a previous password." -msgid_plural "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct passwords before reusing a previous password." -msgstr[0] "" - -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"day must elapse between password resets." -msgid_plural "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"days must elapse between password resets." -msgstr[0] "" - #: common/djangoapps/student/views/management.py msgid "Password reset unsuccessful" msgstr "" @@ -1386,68 +1357,123 @@ msgstr "" msgid "System defined milestone" msgstr "" +#. Translators: This appears in a list of password requirements #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Invalid Length ({0})" +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at least {requirements}." msgstr "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "" +msgid "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct password before reusing a previous password." +msgid_plural "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct passwords before reusing a previous password." +msgstr[0] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or fewer" -msgstr "" +msgid "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"day must elapse between password resets." +msgid_plural "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"days must elapse between password resets." +msgstr[0] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Must be more complex ({0})" -msgstr "" +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more uppercase characters" +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" + +#. Translators: This message is shown to users who enter a password matching +#. the username they enter(ed). +#: common/djangoapps/util/password_policy_validators.py +msgid "Password cannot be the same as the username." msgstr "" #: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more digits" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more letters" -msgstr "" - -#: common/djangoapps/util/password_policy_validators.py -msgid "Too similar to a restricted dictionary word." +msgid "Password is too similar to a dictionary word." msgstr "" #: common/djangoapps/xblock_django/admin.py @@ -5098,7 +5124,7 @@ msgid "Use the checkout page hosted by the E-Commerce service." msgstr "" #: lms/djangoapps/commerce/models.py -msgid "Path to single course checkout page hosted by the E-Commerce service." +msgid "Path to course(s) checkout page hosted by the E-Commerce service." msgstr "" #: lms/djangoapps/commerce/models.py openedx/core/djangoapps/catalog/models.py @@ -9950,25 +9976,6 @@ msgstr "" msgid "Enter a valid email address that contains at least {min} characters." msgstr "" -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Enter a password." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password is not long enough." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -#, python-brace-format -msgid "Password cannot be longer than {max} character." -msgstr "" - -#. Translators: This message is shown to users who enter a password matching -#. the username they enter(ed). -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password cannot be the same as the username." -msgstr "" - #. Translators: These messages are shown to users who do not enter information #. into the required field or enter it incorrectly. #: openedx/core/djangoapps/user_api/accounts/__init__.py @@ -11222,7 +11229,6 @@ msgid "Reset" msgstr "초기화" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "법률적" @@ -11416,8 +11422,8 @@ msgstr "" #: lms/templates/_gated_content.html msgid "" -"You must complete the section '{prereq_section_name}' with the required " -"score before you are able to view this content." +"You must earn a passing score for '{prereq_section_name}' to access this " +"content." msgstr "" #: lms/templates/_gated_content.html @@ -17052,6 +17058,10 @@ msgid "" " spelling." msgstr "이메일 주소가 정확한지 확인해야 합니다. " +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -18987,18 +18997,6 @@ msgid "" "粤ICP备17044299号-2. " msgstr "" -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "edX 소개" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" - #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" msgstr "" @@ -19011,6 +19009,10 @@ msgid "" "their identity." msgstr "" +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "edX 소개" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " diff --git a/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo b/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo index 9e433a5f04..6a4cde5f3e 100644 Binary files a/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo and b/conf/locale/ko_KR/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/ko_KR/LC_MESSAGES/djangojs.po b/conf/locale/ko_KR/LC_MESSAGES/djangojs.po index 2d36e35948..1667477640 100644 --- a/conf/locale/ko_KR/LC_MESSAGES/djangojs.po +++ b/conf/locale/ko_KR/LC_MESSAGES/djangojs.po @@ -62,7 +62,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:50+0000\n" "Last-Translator: kmooc \n" "Language-Team: Korean (Korea) (http://www.transifex.com/open-edx/edx-platform/language/ko_KR/)\n" @@ -2229,6 +2229,10 @@ msgstr "다음 식별자와 연관된 사용자를 찾을 수 없습니다." msgid "Reason field should not be left blank." msgstr "이유를 입력하는 필드는 비워둘 수 없습니다." +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "사용자 등록/삭제 시 발생한 오류" @@ -2789,32 +2793,6 @@ msgstr "" msgid "Could not override problem score for {user}." msgstr "" -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "자료가 저장되지 않았습니다." - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "유효한 이메일 주소를 입력하세요." - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "유효한 비밀번호를 입력하세요." - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "비밀번호를 재설정하기 위한 이메일을 보냈습니다. 비밀번호를 변경하기 위해 이메일에 있는 링크를 클릭하세요." - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "귀하에게 비밀번호 재설정 이메일을 보낼 수 없었습니다." - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "변경을 확인하기 위해 이메일을 확인하세요." - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "" diff --git a/conf/locale/pt_BR/LC_MESSAGES/django.mo b/conf/locale/pt_BR/LC_MESSAGES/django.mo index 840b332d1b..8478ac4300 100644 Binary files a/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/conf/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/conf/locale/pt_BR/LC_MESSAGES/django.po b/conf/locale/pt_BR/LC_MESSAGES/django.po index a6b61ede14..6646570d0f 100644 --- a/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -266,7 +266,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:51+0000\n" "Last-Translator: javiercencig \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/open-edx/edx-platform/language/pt_BR/)\n" @@ -639,15 +639,6 @@ msgstr "Para inscrever-se, é preciso seguir o código de honra." msgid "You are missing one or more required fields" msgstr "Você não está preenchendo um ou mais campos" -#: common/djangoapps/student/forms.py -msgid "Username and password fields cannot match" -msgstr "O nome de usuário e a senha não conferem" - -#: common/djangoapps/student/forms.py -#: common/djangoapps/student/views/management.py -msgid "Password: " -msgstr "Senha: " - #: common/djangoapps/student/forms.py msgid "Unauthorized email address." msgstr "Endereço de e-mail não autorizado" @@ -1131,37 +1122,6 @@ msgid "" "enrolled in. Sign In to continue." msgstr "" -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct password before reusing a previous password." -msgid_plural "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct passwords before reusing a previous password." -msgstr[0] "" -"Você está reutilizando uma senha que você usou recentemente. Você de ter " -"{num} diferente de senhas anteriores para usar nas próximas senhas." -msgstr[1] "" -"Você está reutilizando uma senha que você já usou recentemente. Você deve " -"ter {num} senhas diferentes anteriores para reutilizar uma senha já " -"utilizada." - -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"day must elapse between password resets." -msgid_plural "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"days must elapse between password resets." -msgstr[0] "" -"Você está redefinindo suas senhas com muita frequência. Devido a politica de" -" segurança, devem decorrer {num} dias entre a troca de senhas." -msgstr[1] "" -"Você está redefinindo suas senhas com muita frequência. Devido a politica de" -" segurança, devem decorrer {num} dias entre a troca de senhas." - #: common/djangoapps/student/views/management.py msgid "Password reset unsuccessful" msgstr "A redefinição de senha não foi realizada" @@ -1658,70 +1618,148 @@ msgstr "O curso {course_id} necessita {prerequisite_course_id}" msgid "System defined milestone" msgstr "Marcação definida pelo sistema" +#. Translators: This appears in a list of password requirements #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Invalid Length ({0})" -msgstr "Comprimento inválido ({0})" +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "" +msgstr[1] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "precisa ter {0} caracteres ou mais" +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or fewer" +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" +msgstr[1] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at least {requirements}." msgstr "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Must be more complex ({0})" -msgstr "precisa ser mais difícil ({0})" +msgid "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct password before reusing a previous password." +msgid_plural "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct passwords before reusing a previous password." +msgstr[0] "" +"Você está reutilizando uma senha que você usou recentemente. Você de ter " +"{num} diferente de senhas anteriores para usar nas próximas senhas." +msgstr[1] "" +"Você está reutilizando uma senha que você já usou recentemente. Você deve " +"ter {num} senhas diferentes anteriores para reutilizar uma senha já " +"utilizada." #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more uppercase characters" -msgstr "precisa conter {0} ou mais caracteres maiúsculos" +msgid "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"day must elapse between password resets." +msgid_plural "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"days must elapse between password resets." +msgstr[0] "" +"Você está redefinindo suas senhas com muita frequência. Devido a politica de" +" segurança, devem decorrer {num} dias entre a troca de senhas." +msgstr[1] "" +"Você está redefinindo suas senhas com muita frequência. Devido a politica de" +" segurança, devem decorrer {num} dias entre a troca de senhas." #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "precisa conter {0} ou mais caracteres em minúscula" +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "" +msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more digits" -msgstr "precisa conter {0} ou mais dígitos" +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" +msgstr[1] "" +#. Translators: This message is shown to users who enter a password matching +#. the username they enter(ed). #: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "precisa conter {0} ou mais caracteres de pontuação" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "precisa conter {0} ou mais caracteres não ascii" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "precisa conter {0} ou mais palavras únicas" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" +msgid "Password cannot be the same as the username." msgstr "" #: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more letters" +msgid "Password is too similar to a dictionary word." msgstr "" -#: common/djangoapps/util/password_policy_validators.py -msgid "Too similar to a restricted dictionary word." -msgstr "Muito parecida com uma palavra restrita." - #: common/djangoapps/xblock_django/admin.py msgid "" "To disable the XBlock and prevent rendering in the LMS, leave \"Enabled\" " @@ -5834,7 +5872,7 @@ msgid "Use the checkout page hosted by the E-Commerce service." msgstr "" #: lms/djangoapps/commerce/models.py -msgid "Path to single course checkout page hosted by the E-Commerce service." +msgid "Path to course(s) checkout page hosted by the E-Commerce service." msgstr "" #: lms/djangoapps/commerce/models.py openedx/core/djangoapps/catalog/models.py @@ -11202,25 +11240,6 @@ msgstr "" msgid "Enter a valid email address that contains at least {min} characters." msgstr "" -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Enter a password." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password is not long enough." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -#, python-brace-format -msgid "Password cannot be longer than {max} character." -msgstr "" - -#. Translators: This message is shown to users who enter a password matching -#. the username they enter(ed). -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password cannot be the same as the username." -msgstr "" - #. Translators: These messages are shown to users who do not enter information #. into the required field or enter it incorrectly. #: openedx/core/djangoapps/user_api/accounts/__init__.py @@ -12533,7 +12552,6 @@ msgid "Reset" msgstr "Redefinir" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "Legal" @@ -12729,8 +12747,8 @@ msgstr "" #: lms/templates/_gated_content.html msgid "" -"You must complete the section '{prereq_section_name}' with the required " -"score before you are able to view this content." +"You must earn a passing score for '{prereq_section_name}' to access this " +"content." msgstr "" #: lms/templates/_gated_content.html @@ -18707,6 +18725,10 @@ msgstr "" "Você não receberá notificações caso as mensagens para o seu e-mail retornem," " por favor, certifique-se que o seu e-mail foi digitado corretamente." +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -20739,18 +20761,6 @@ msgid "" "粤ICP备17044299号-2. " msgstr "" -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "Sobre o edX" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" - #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" msgstr "" @@ -20763,6 +20773,10 @@ msgid "" "their identity." msgstr "" +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "Sobre o edX" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " diff --git a/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo b/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo index a85a2984de..422e1fce0a 100644 Binary files a/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo and b/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/pt_BR/LC_MESSAGES/djangojs.po b/conf/locale/pt_BR/LC_MESSAGES/djangojs.po index f8cc746281..0da4387e8d 100644 --- a/conf/locale/pt_BR/LC_MESSAGES/djangojs.po +++ b/conf/locale/pt_BR/LC_MESSAGES/djangojs.po @@ -202,7 +202,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:50+0000\n" "Last-Translator: Mariana Jó de Souza \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/open-edx/edx-platform/language/pt_BR/)\n" @@ -2508,6 +2508,10 @@ msgstr "" msgid "Reason field should not be left blank." msgstr "O campo de motivo não deve ser deixado em branco." +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "Erro ao fazer inscrição/cancelar inscrição de usuários." @@ -3097,34 +3101,6 @@ msgstr "" msgid "Could not override problem score for {user}." msgstr "" -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "Não foi possível salvar os dados." - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "Insira um endereço de e-mail válido" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "Insira uma senha válida" - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "" -"Email de recuperação de senha enviado. Siga o link no email para mudar sua " -"senha" - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "Não foi possível enviar um e-mail para redefinição de sua senha." - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "Por favor verifique seu email para confirmar a alteração" - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "" diff --git a/conf/locale/rtl/LC_MESSAGES/django.mo b/conf/locale/rtl/LC_MESSAGES/django.mo index 8043ec995e..4e939787fa 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 d45d84bd6e..9ae8d2cfd1 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-03-18 20:36+0000\n" -"PO-Revision-Date: 2018-03-18 20:36:06.141838\n" +"POT-Creation-Date: 2018-04-01 20:36+0000\n" +"PO-Revision-Date: 2018-04-01 20:36:11.596134\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: en\n" @@ -989,6 +989,14 @@ msgstr "" "هب فاهس خحفهخر هس سثمثذفثي, عسثقس صهمم رخف زث قثضعهقثي فخ ذخربهقو فاثهق " "ثوشهم, شري فاثهق شذذخعرف صهمم زث شذفهدشفثي هووثيهشفثمغ عحخر قثلهسفقشفهخر." +#: common/djangoapps/third_party_auth/models.py +msgid "" +"If this option is selected, users will be sent a welcome email upon " +"registration." +msgstr "" +"هب فاهس خحفهخر هس سثمثذفثي, عسثقس صهمم زث سثرف ش صثمذخوث ثوشهم عحخر " +"قثلهسفقشفهخر." + #: common/djangoapps/third_party_auth/models.py msgid "" "If this option is not selected, users will not be presented with the " @@ -1421,6 +1429,97 @@ msgstr "ذخعقسث {course_id} قثضعهقثس {prerequisite_course_id}" msgid "System defined milestone" msgstr "سغسفثو يثبهرثي وهمثسفخرث" +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "{num} مثففثق" +msgstr[1] "{num} مثففثقس" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "{num} عححثقذشسث مثففثق" +msgstr[1] "{num} عححثقذشسث مثففثقس" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "{num} مخصثقذشسث مثففثق" +msgstr[1] "{num} مخصثقذشسث مثففثقس" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "{num} يهلهف" +msgstr[1] "{num} يهلهفس" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "{num} رعوزثق" +msgstr[1] "{num} رعوزثقس" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "{num} حعرذفعشفهخر وشقن" +msgstr[1] "{num} حعرذفعشفهخر وشقنس" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "{num} سغوزخم" +msgstr[1] "{num} سغوزخمس" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "{num} صخقي" +msgstr[1] "{num} صخقيس" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "غخعق حشسسصخقي وعسف ذخرفشهر شف مثشسف {num} ذاشقشذفثق." +msgstr[1] "غخعق حشسسصخقي وعسف ذخرفشهر شف مثشسف {num} ذاشقشذفثقس." + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" +"غخعق حشسسصخقي وعسف ذخرفشهر شف مثشسف {num} ذاشقشذفثق, هرذمعيهرل " +"{requirements}." +msgstr[1] "" +"غخعق حشسسصخقي وعسف ذخرفشهر شف مثشسف {num} ذاشقشذفثقس, هرذمعيهرل " +"{requirements}." + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at least {requirements}." +msgstr "ثرفثق ش حشسسصخقي صهفا شف مثشسف {requirements}." + #: common/djangoapps/util/password_policy_validators.py #, python-brace-format msgid "" @@ -1453,73 +1552,27 @@ msgstr[1] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Password: Invalid Length ({0})" -msgstr "حشسسصخقي: هردشمهي مثرلفا ({0})" +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "{num} ذاشقشذفثق" +msgstr[1] "{num} ذاشقشذفثقس" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "وعسف زث {0} ذاشقشذفثقس خق وخقث" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must be {0} characters or fewer" -msgstr "وعسف زث {0} ذاشقشذفثقس خق بثصثق" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "Password: Must be more complex ({0})" -msgstr "حشسسصخقي: وعسف زث وخقث ذخوحمثط ({0})" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more uppercase characters" -msgstr "وعسف ذخرفشهر {0} خق وخقث عححثقذشسث ذاشقشذفثقس" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "وعسف ذخرفشهر {0} خق وخقث مخصثقذشسث ذاشقشذفثقس" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more digits" -msgstr "وعسف ذخرفشهر {0} خق وخقث يهلهفس" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "وعسف ذخرفشهر {0} خق وخقث حعرذفعشفهخر ذاشقشذفثقس" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "وعسف ذخرفشهر {0} خق وخقث رخر شسذهه ذاشقشذفثقس" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "وعسف ذخرفشهر {0} خق وخقث عرهضعث صخقيس" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" -msgstr "وعسف ذخرفشهر {0} خق وخقث رعوزثقس" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more letters" -msgstr "وعسف ذخرفشهر {0} خق وخقث مثففثقس" +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "ثرفثق ش حشسسصخقي صهفا شف وخسف {num} ذاشقشذفثق." +msgstr[1] "ثرفثق ش حشسسصخقي صهفا شف وخسف {num} ذاشقشذفثقس." #. Translators: This message is shown to users who enter a password matching #. the username they enter(ed). #: common/djangoapps/util/password_policy_validators.py -msgid "Password cannot be the same as the username" -msgstr "حشسسصخقي ذشررخف زث فاث سشوث شس فاث عسثقرشوث" +msgid "Password cannot be the same as the username." +msgstr "حشسسصخقي ذشررخف زث فاث سشوث شس فاث عسثقرشوث." #: common/djangoapps/util/password_policy_validators.py -msgid "Password: Too similar to a restricted dictionary word." -msgstr "حشسسصخقي: فخخ سهوهمشق فخ ش قثسفقهذفثي يهذفهخرشقغ صخقي." +msgid "Password is too similar to a dictionary word." +msgstr "حشسسصخقي هس فخخ سهوهمشق فخ ش يهذفهخرشقغ صخقي." #: common/djangoapps/xblock_django/admin.py msgid "" @@ -5167,8 +5220,8 @@ msgid "Open edX" msgstr "خحثر ثيط" #: lms/djangoapps/branding/api.py -msgid "Trademarks" -msgstr "فقشيثوشقنس" +msgid "Trademark Policy" +msgstr "فقشيثوشقن حخمهذغ" #: lms/djangoapps/branding/api.py #, python-brace-format @@ -6755,6 +6808,10 @@ msgstr "" "{student_username} صشس قثدهثصثي شس {review_status} زغ فاث حقخذفخقثي ثطشو " "قثدهثص حقخدهيثق." +#: lms/djangoapps/instructor/settings/common.py +msgid "Your Platform Insights" +msgstr "غخعق حمشفبخقو هرسهلافس" + #: lms/djangoapps/instructor/views/api.py #, python-brace-format msgid "" @@ -9274,6 +9331,15 @@ msgstr "وشرشلث عسثق" msgid "Disable User Account" msgstr "يهسشزمث عسثق شذذخعرف" +#: lms/djangoapps/support/views/index.py +#: lms/templates/support/entitlement.html +msgid "Entitlements" +msgstr "ثرفهفمثوثرفس" + +#: lms/djangoapps/support/views/index.py +msgid "View, create, and reissue learner entitlements" +msgstr "دهثص, ذقثشفث, شري قثهسسعث مثشقرثق ثرفهفمثوثرفس" + #: lms/djangoapps/support/views/manage_user.py msgid "user_support_url" msgstr "عسثق_سعححخقف_عقم" @@ -9602,10 +9668,6 @@ msgstr "غخعفعزث" msgid "Subscribe to the {platform_name} YouTube channel" msgstr "سعزسذقهزث فخ فاث {platform_name} غخعفعزث ذاشررثم" -#: lms/envs/common.py -msgid "Your Platform Insights" -msgstr "غخعق حمشفبخقو هرسهلافس" - #: lms/envs/common.py msgid "Kosovo" msgstr "نخسخدخ" @@ -12555,7 +12617,6 @@ msgid "Reset" msgstr "قثسثف" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "مثلشم" @@ -19031,6 +19092,10 @@ msgstr "" "غخع صهمم رخف لثف رخفهبهذشفهخر بخق ثوشهمس فاشف زخعرذث, سخ حمثشسث يخعزمث-ذاثذن" " سحثممهرل." +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "قخمث خب فاث عسثقس زثهرل ثرقخممثي." + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -20599,10 +20664,6 @@ msgstr "ذخرفشذف {platform_name} سعححخقف" msgid "Student Support: Enrollment" msgstr "سفعيثرف سعححخقف: ثرقخمموثرف" -#: lms/templates/support/entitlement.html -msgid "Entitlements" -msgstr "ثرفهفمثوثرفس" - #: lms/templates/support/manage_user.html msgid "Student Support: Manage User" msgstr "سفعيثرف سعححخقف: وشرشلث عسثق" @@ -21132,27 +21193,9 @@ msgid "© 2012–{year} edX Inc. " msgstr "© 2012–{year} ثيط هرذ. " #: themes/edx.org/lms/templates/footer.html -msgid "" -"EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. " -"粤ICP备17044299号-2. " +msgid "EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. " msgstr "" "ثيط, خحثر ثيط, شري وهذقخوشسفثقس شقث قثلهسفثقثي فقشيثوشقنس خب ثيط هرذ. " -"粤هذح备17044299号-2. " - -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "شزخعف ثيط" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" -"© 2012–{year} ثيط هرذ. شمم قهلافس قثسثقدثي ثطذثحف صاثقث رخفثي. ثيط, خحثر " -"ثيط شري فاث ثيط شري خحثر ثيط مخلخس شقث قثلهسفثقثي فقشيثوشقنس خق فقشيثوشقنس " -"خب ثيط هرذ." #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" @@ -21170,6 +21213,10 @@ msgstr "" " عريثق هفس لعهيثمهرثس, شس صثمم شس اشدهرل فاثهق حاخفخ هي ذاثذنثي فخ دثقهبغ " "فاثهق هيثرفهفغ." +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "شزخعف ثيط" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " @@ -24843,6 +24890,10 @@ msgstr "حخمهذهثس" msgid "Accessibility Accommodation Request" msgstr "شذذثسسهزهمهفغ شذذخووخيشفهخر قثضعثسف" +#: cms/templates/widgets/footer.html +msgid "LMS" +msgstr "موس" + #. Translators: 'EdX', 'edX', 'Studio', and 'Open edX' are trademarks of 'edX #. Inc.'. Please do not translate any of these trademarks and company names. #: cms/templates/widgets/footer.html diff --git a/conf/locale/rtl/LC_MESSAGES/djangojs.mo b/conf/locale/rtl/LC_MESSAGES/djangojs.mo index 64c2a95611..c49189f344 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 ae63304910..11d2ed593f 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-03-18 20:35+0000\n" -"PO-Revision-Date: 2018-03-18 20:36:05.979346\n" +"POT-Creation-Date: 2018-04-01 20:35+0000\n" +"PO-Revision-Date: 2018-04-01 20:36:10.994975\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "Language: en\n" @@ -2416,6 +2416,10 @@ msgstr "ذخعمي رخف بهري عسثقس شسسخذهشفثي صهفا فا msgid "Reason field should not be left blank." msgstr "قثشسخر بهثمي ساخعمي رخف زث مثبف زمشرن." +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "قخمث بهثمي ساخعمي رخف زث مثبف عرسثمثذفثي." + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "ثققخق ثرقخممهرل/عرثرقخممهرل عسثقس." @@ -3043,34 +3047,6 @@ msgstr "سعذذثسسبعممغ خدثققخيث حقخزمثو سذخقث بخ msgid "Could not override problem score for {user}." msgstr "ذخعمي رخف خدثققهيث حقخزمثو سذخقث بخق {user}." -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "فاث يشفش ذخعمي رخف زث سشدثي." - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "حمثشسث ثرفثق ش دشمهي ثوشهم شييقثسس" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "حمثشسث ثرفثق ش دشمهي حشسسصخقي" - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "" -"حشسسصخقي قثسثف ثوشهم سثرف. بخممخص فاث مهرن هر فاث ثوشهم فخ ذاشرلث غخعق " -"حشسسصخقي." - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "صث صثقثر'ف شزمث فخ سثري غخع ش حشسسصخقي قثسثف ثوشهم." - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "حمثشسث ذاثذن غخعق ثوشهم فخ ذخربهقو فاث ذاشرلث" - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "فثقوس خب سثقدهذث شري اخرخق ذخيث" diff --git a/conf/locale/ru/LC_MESSAGES/django.mo b/conf/locale/ru/LC_MESSAGES/django.mo index 51c5d83997..cfe02d0385 100644 Binary files a/conf/locale/ru/LC_MESSAGES/django.mo and b/conf/locale/ru/LC_MESSAGES/django.mo differ diff --git a/conf/locale/ru/LC_MESSAGES/django.po b/conf/locale/ru/LC_MESSAGES/django.po index 8d164cdef4..a11164b83f 100644 --- a/conf/locale/ru/LC_MESSAGES/django.po +++ b/conf/locale/ru/LC_MESSAGES/django.po @@ -249,7 +249,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:51+0000\n" "Last-Translator: Maksimenkova Olga \n" "Language-Team: Russian (http://www.transifex.com/open-edx/edx-platform/language/ru/)\n" @@ -629,15 +629,6 @@ msgstr "Чтобы зарегистрироваться, вы должны сл msgid "You are missing one or more required fields" msgstr "Вы не заполнили одно или несколько обязательных полей" -#: common/djangoapps/student/forms.py -msgid "Username and password fields cannot match" -msgstr "Имя пользователя и пароль не должны совпадать" - -#: common/djangoapps/student/forms.py -#: common/djangoapps/student/views/management.py -msgid "Password: " -msgstr "Пароль:" - #: common/djangoapps/student/forms.py msgid "Unauthorized email address." msgstr "Недопустимый адрес электронной почты." @@ -1136,48 +1127,6 @@ msgid "" "enrolled in. Sign In to continue." msgstr "" -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct password before reusing a previous password." -msgid_plural "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct passwords before reusing a previous password." -msgstr[0] "" -"Вы пытаетесь установить старый пароль. Это можно сделать, только сменив " -"{num} пароль." -msgstr[1] "" -"Вы пытаетесь установить старый пароль. Это можно сделать, только сменив " -"{num} пароля." -msgstr[2] "" -"Вы пытаетесь установить старый пароль. Это можно сделать, только сменив " -"{num} паролей." -msgstr[3] "" -"Вы пытаетесь установить старый пароль. Это можно сделать, только сменив " -"{num} пароля." - -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"day must elapse between password resets." -msgid_plural "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"days must elapse between password resets." -msgstr[0] "" -"Вы слишком часто меняете пароль. По правилам безопасности между сбросами " -"пароля должно пройти хотя бы {num} день." -msgstr[1] "" -"Вы слишком часто меняете пароль. По правилам безопасности между сбросами " -"пароля должно пройти хотя бы {num} дня." -msgstr[2] "" -"Вы слишком часто меняете пароль. По правилам безопасности между сбросами " -"пароля должно пройти хотя бы {num} дней." -msgstr[3] "" -"Вы слишком часто меняете пароль. По правилам безопасности между сбросами " -"пароля должно пройти хотя бы {num} дня." - #: common/djangoapps/student/views/management.py msgid "Password reset unsuccessful" msgstr "Не удалось сбросить пароль" @@ -1674,70 +1623,183 @@ msgstr "" msgid "System defined milestone" msgstr "Системная контрольная точка" +#. Translators: This appears in a list of password requirements #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Invalid Length ({0})" -msgstr "Недопустимая длина ({0})" +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "должен состоять из {0} или более символов" +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or fewer" +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at least {requirements}." msgstr "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Must be more complex ({0})" -msgstr "Должен быть сложнее ({0})" +msgid "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct password before reusing a previous password." +msgid_plural "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct passwords before reusing a previous password." +msgstr[0] "" +"Вы пытаетесь установить старый пароль. Это можно сделать, только сменив " +"{num} пароль." +msgstr[1] "" +"Вы пытаетесь установить старый пароль. Это можно сделать, только сменив " +"{num} пароля." +msgstr[2] "" +"Вы пытаетесь установить старый пароль. Это можно сделать, только сменив " +"{num} паролей." +msgstr[3] "" +"Вы пытаетесь установить старый пароль. Это можно сделать, только сменив " +"{num} пароля." #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more uppercase characters" -msgstr "должен содержать {0} или более заглавных букв" +msgid "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"day must elapse between password resets." +msgid_plural "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"days must elapse between password resets." +msgstr[0] "" +"Вы слишком часто меняете пароль. По правилам безопасности между сбросами " +"пароля должно пройти хотя бы {num} день." +msgstr[1] "" +"Вы слишком часто меняете пароль. По правилам безопасности между сбросами " +"пароля должно пройти хотя бы {num} дня." +msgstr[2] "" +"Вы слишком часто меняете пароль. По правилам безопасности между сбросами " +"пароля должно пройти хотя бы {num} дней." +msgstr[3] "" +"Вы слишком часто меняете пароль. По правилам безопасности между сбросами " +"пароля должно пройти хотя бы {num} дня." #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "должен содержать {0} или более строчных букв" +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more digits" -msgstr "должен содержать {0} или более цифр" +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +#. Translators: This message is shown to users who enter a password matching +#. the username they enter(ed). #: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "должен содержать {0} или более символов пунктуации" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "должен содержать {0} или более символов, не входящих в ascii" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "должен содержать {0} или более неповторяющихся слов" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" +msgid "Password cannot be the same as the username." msgstr "" #: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more letters" +msgid "Password is too similar to a dictionary word." msgstr "" -#: common/djangoapps/util/password_policy_validators.py -msgid "Too similar to a restricted dictionary word." -msgstr "Слишком похоже на общеупотребительное слово." - #: common/djangoapps/xblock_django/admin.py msgid "" "To disable the XBlock and prevent rendering in the LMS, leave \"Enabled\" " @@ -5937,8 +5999,8 @@ msgid "Use the checkout page hosted by the E-Commerce service." msgstr "Для оплаты используйте страницу на E-Commerce." #: lms/djangoapps/commerce/models.py -msgid "Path to single course checkout page hosted by the E-Commerce service." -msgstr "Ссылка на страницу E-Commerce для оплаты всех выбранных курсов." +msgid "Path to course(s) checkout page hosted by the E-Commerce service." +msgstr "" #: lms/djangoapps/commerce/models.py openedx/core/djangoapps/catalog/models.py #: openedx/core/djangoapps/credentials/models.py @@ -11288,25 +11350,6 @@ msgstr "" msgid "Enter a valid email address that contains at least {min} characters." msgstr "" -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Enter a password." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password is not long enough." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -#, python-brace-format -msgid "Password cannot be longer than {max} character." -msgstr "" - -#. Translators: This message is shown to users who enter a password matching -#. the username they enter(ed). -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password cannot be the same as the username." -msgstr "" - #. Translators: These messages are shown to users who do not enter information #. into the required field or enter it incorrectly. #: openedx/core/djangoapps/user_api/accounts/__init__.py @@ -12623,7 +12666,6 @@ msgid "Reset" msgstr "Сбросить" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "Юридическая информация" @@ -12825,8 +12867,8 @@ msgstr "" #: lms/templates/_gated_content.html msgid "" -"You must complete the section '{prereq_section_name}' with the required " -"score before you are able to view this content." +"You must earn a passing score for '{prereq_section_name}' to access this " +"content." msgstr "" #: lms/templates/_gated_content.html @@ -19014,6 +19056,10 @@ msgstr "" "Вы не получите уведомлений о письмах, которые не дошли, поэтому, пожалуйста " "дважды проверьте написание." +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -21075,18 +21121,6 @@ msgid "" "粤ICP备17044299号-2. " msgstr "" -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "Об edX" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" - #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" msgstr "" @@ -21099,6 +21133,10 @@ msgid "" "their identity." msgstr "" +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "Об edX" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " diff --git a/conf/locale/ru/LC_MESSAGES/djangojs.mo b/conf/locale/ru/LC_MESSAGES/djangojs.mo index a8f403f6fd..717aea5fa4 100644 Binary files a/conf/locale/ru/LC_MESSAGES/djangojs.mo and b/conf/locale/ru/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/ru/LC_MESSAGES/djangojs.po b/conf/locale/ru/LC_MESSAGES/djangojs.po index 07015b2b0b..edaec4a1bc 100644 --- a/conf/locale/ru/LC_MESSAGES/djangojs.po +++ b/conf/locale/ru/LC_MESSAGES/djangojs.po @@ -154,7 +154,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:50+0000\n" "Last-Translator: Weyedide \n" "Language-Team: Russian (http://www.transifex.com/open-edx/edx-platform/language/ru/)\n" @@ -2571,6 +2571,10 @@ msgstr "Не удалось найти пользователей со след msgid "Reason field should not be left blank." msgstr "Поле «Причина» не должно быть пустым." +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "Ошибка при регистрации/отмене регистрации пользователей:" @@ -3169,34 +3173,6 @@ msgstr "" msgid "Could not override problem score for {user}." msgstr "" -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "Не удалось сохранить ваши данные." - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "Пожалуйста, введите корректный электронный адрес" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "Пожалуйста, введите корректный пароль" - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "" -"Отправлено электронное сообщение для сброса пароля. Проследуйте по ссылке, " -"данной в сообщении, чтобы сменить пароль." - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "Нам не удалось отправить вам электронное сообщение для сброса пароля." - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "Проверьте электронную почту для подтверждения изменений" - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "" diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.mo b/conf/locale/zh_CN/LC_MESSAGES/django.mo index dbc9be02ec..e69bcea70b 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 6249826abc..5d6177cab8 100644 --- a/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -352,7 +352,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:51+0000\n" "Last-Translator: zhaojina \n" "Language-Team: Chinese (China) (http://www.transifex.com/open-edx/edx-platform/language/zh_CN/)\n" @@ -710,15 +710,6 @@ msgstr "您必须遵循诚信准则才能选修。" msgid "You are missing one or more required fields" msgstr "您遗漏了一个或多个必须填写字段" -#: common/djangoapps/student/forms.py -msgid "Username and password fields cannot match" -msgstr "用户名和密码不能相同" - -#: common/djangoapps/student/forms.py -#: common/djangoapps/student/views/management.py -msgid "Password: " -msgstr "密码: " - #: common/djangoapps/student/forms.py msgid "Unauthorized email address." msgstr "未经授权的电子邮件地址" @@ -1179,26 +1170,6 @@ msgid "" "enrolled in. Sign In to continue." msgstr "" -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct password before reusing a previous password." -msgid_plural "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct passwords before reusing a previous password." -msgstr[0] "你正在重复使用最近已使用过的密码。在重复使用一个用过的密码之前，你必须有 {num} 个不同的密码。" - -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"day must elapse between password resets." -msgid_plural "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"days must elapse between password resets." -msgstr[0] "你设置密码的次数过于频繁。根据安全策略，重置密码必须间隔 {num} 天。" - #: common/djangoapps/student/views/management.py msgid "Password reset unsuccessful" msgstr "重新设置密码不成功" @@ -1683,70 +1654,125 @@ msgstr "课程{course_id}要求 {prerequisite_course_id}" msgid "System defined milestone" msgstr "系统定义的里程碑" +#. Translators: This appears in a list of password requirements #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Invalid Length ({0})" -msgstr "无效长度 ({0})" +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "必须包含 {0} 个或更多字符" +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or fewer" +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at least {requirements}." msgstr "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Must be more complex ({0})" -msgstr "必须更加复杂({0})" +msgid "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct password before reusing a previous password." +msgid_plural "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct passwords before reusing a previous password." +msgstr[0] "你正在重复使用最近已使用过的密码。在重复使用一个用过的密码之前，你必须有 {num} 个不同的密码。" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more uppercase characters" -msgstr "必须包含{0}个或者更多大写字母" +msgid "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"day must elapse between password resets." +msgid_plural "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"days must elapse between password resets." +msgstr[0] "你设置密码的次数过于频繁。根据安全策略，重置密码必须间隔 {num} 天。" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "必须包含{0}个或者更多小写字母" +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more digits" -msgstr "必须包含{0}个或者更多数字" +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" +#. Translators: This message is shown to users who enter a password matching +#. the username they enter(ed). #: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "必须包含{0}个或者更多标点符号" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "必须包含{0}个或更多非ASCII字符" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "必须包含{0}个或更多不重复的单词" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" +msgid "Password cannot be the same as the username." msgstr "" #: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more letters" +msgid "Password is too similar to a dictionary word." msgstr "" -#: common/djangoapps/util/password_policy_validators.py -msgid "Too similar to a restricted dictionary word." -msgstr "与受限词字典中的词语过于相似。" - #: common/djangoapps/xblock_django/admin.py msgid "" "To disable the XBlock and prevent rendering in the LMS, leave \"Enabled\" " @@ -5502,8 +5528,8 @@ msgid "Use the checkout page hosted by the E-Commerce service." msgstr "透过使用电子商务服务承载结帐页面。" #: lms/djangoapps/commerce/models.py -msgid "Path to single course checkout page hosted by the E-Commerce service." -msgstr "透过电子商务服务承载单门课程结帐页面之途径" +msgid "Path to course(s) checkout page hosted by the E-Commerce service." +msgstr "" #: lms/djangoapps/commerce/models.py openedx/core/djangoapps/catalog/models.py #: openedx/core/djangoapps/credentials/models.py @@ -10539,25 +10565,6 @@ msgstr "" msgid "Enter a valid email address that contains at least {min} characters." msgstr "" -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Enter a password." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password is not long enough." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -#, python-brace-format -msgid "Password cannot be longer than {max} character." -msgstr "" - -#. Translators: This message is shown to users who enter a password matching -#. the username they enter(ed). -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password cannot be the same as the username." -msgstr "" - #. Translators: These messages are shown to users who do not enter information #. into the required field or enter it incorrectly. #: openedx/core/djangoapps/user_api/accounts/__init__.py @@ -11831,7 +11838,6 @@ msgid "Reset" msgstr "重置" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "合法" @@ -12025,8 +12031,8 @@ msgstr "" #: lms/templates/_gated_content.html msgid "" -"You must complete the section '{prereq_section_name}' with the required " -"score before you are able to view this content." +"You must earn a passing score for '{prereq_section_name}' to access this " +"content." msgstr "" #: lms/templates/_gated_content.html @@ -17732,6 +17738,10 @@ msgid "" " spelling." msgstr "对该类问题您不会受到提示邮件，因此请仔细检查，确保拼写无误。" +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -19649,18 +19659,6 @@ msgid "" "粤ICP备17044299号-2. " msgstr "" -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "关于 edX" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" - #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" msgstr "" @@ -19673,6 +19671,10 @@ msgid "" "their identity." msgstr "" +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "关于 edX" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo b/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo index fbc4bb06ed..5054334c9a 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 92854d9965..6046ca0c5c 100644 --- a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po +++ b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po @@ -190,7 +190,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:50+0000\n" "Last-Translator: San \n" "Language-Team: Chinese (China) (http://www.transifex.com/open-edx/edx-platform/language/zh_CN/)\n" @@ -2405,6 +2405,10 @@ msgstr "未能找到与以下识别码关联的用户：" msgid "Reason field should not be left blank." msgstr "原因不能为空。" +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "用户选课／放弃选课时出错。" @@ -2961,32 +2965,6 @@ msgstr "" msgid "Could not override problem score for {user}." msgstr "" -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "该数据无法保存。" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "请输入一个有效的电子邮件地址。" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "请输入一个有效的密码。" - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "密码重置邮件已经发送。请通过点击邮件中的链接更改你的密码。" - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "密码重置邮件发送失败。" - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "请检查您的邮件以确认修改" - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr "" diff --git a/conf/locale/zh_HANS/LC_MESSAGES/django.mo b/conf/locale/zh_HANS/LC_MESSAGES/django.mo index dbc9be02ec..e69bcea70b 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 6249826abc..5d6177cab8 100644 --- a/conf/locale/zh_HANS/LC_MESSAGES/django.po +++ b/conf/locale/zh_HANS/LC_MESSAGES/django.po @@ -352,7 +352,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:51+0000\n" "Last-Translator: zhaojina \n" "Language-Team: Chinese (China) (http://www.transifex.com/open-edx/edx-platform/language/zh_CN/)\n" @@ -710,15 +710,6 @@ msgstr "您必须遵循诚信准则才能选修。" msgid "You are missing one or more required fields" msgstr "您遗漏了一个或多个必须填写字段" -#: common/djangoapps/student/forms.py -msgid "Username and password fields cannot match" -msgstr "用户名和密码不能相同" - -#: common/djangoapps/student/forms.py -#: common/djangoapps/student/views/management.py -msgid "Password: " -msgstr "密码: " - #: common/djangoapps/student/forms.py msgid "Unauthorized email address." msgstr "未经授权的电子邮件地址" @@ -1179,26 +1170,6 @@ msgid "" "enrolled in. Sign In to continue." msgstr "" -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct password before reusing a previous password." -msgid_plural "" -"You are re-using a password that you have used recently. You must have {num}" -" distinct passwords before reusing a previous password." -msgstr[0] "你正在重复使用最近已使用过的密码。在重复使用一个用过的密码之前，你必须有 {num} 个不同的密码。" - -#: common/djangoapps/student/views/management.py -#, python-brace-format -msgid "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"day must elapse between password resets." -msgid_plural "" -"You are resetting passwords too frequently. Due to security policies, {num} " -"days must elapse between password resets." -msgstr[0] "你设置密码的次数过于频繁。根据安全策略，重置密码必须间隔 {num} 天。" - #: common/djangoapps/student/views/management.py msgid "Password reset unsuccessful" msgstr "重新设置密码不成功" @@ -1683,70 +1654,125 @@ msgstr "课程{course_id}要求 {prerequisite_course_id}" msgid "System defined milestone" msgstr "系统定义的里程碑" +#. Translators: This appears in a list of password requirements #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Invalid Length ({0})" -msgstr "无效长度 ({0})" +msgid "{num} letter" +msgid_plural "{num} letters" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} uppercase letter" +msgid_plural "{num} uppercase letters" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} lowercase letter" +msgid_plural "{num} lowercase letters" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} digit" +msgid_plural "{num} digits" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} number" +msgid_plural "{num} numbers" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} punctuation mark" +msgid_plural "{num} punctuation marks" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} symbol" +msgid_plural "{num} symbols" +msgstr[0] "" + +#. Translators: This appears in a list of password requirements +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "{num} word" +msgid_plural "{num} words" +msgstr[0] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or more" -msgstr "必须包含 {0} 个或更多字符" +msgid "Your password must contain at least {num} character." +msgid_plural "Your password must contain at least {num} characters." +msgstr[0] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must be {0} characters or fewer" +msgid "" +"Your password must contain at least {num} character, including " +"{requirements}." +msgid_plural "" +"Your password must contain at least {num} characters, including " +"{requirements}." +msgstr[0] "" + +#: common/djangoapps/util/password_policy_validators.py +#, python-brace-format +msgid "Enter a password with at least {requirements}." msgstr "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "Must be more complex ({0})" -msgstr "必须更加复杂({0})" +msgid "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct password before reusing a previous password." +msgid_plural "" +"You are re-using a password that you have used recently. You must have {num}" +" distinct passwords before reusing a previous password." +msgstr[0] "你正在重复使用最近已使用过的密码。在重复使用一个用过的密码之前，你必须有 {num} 个不同的密码。" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more uppercase characters" -msgstr "必须包含{0}个或者更多大写字母" +msgid "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"day must elapse between password resets." +msgid_plural "" +"You are resetting passwords too frequently. Due to security policies, {num} " +"days must elapse between password resets." +msgstr[0] "你设置密码的次数过于频繁。根据安全策略，重置密码必须间隔 {num} 天。" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more lowercase characters" -msgstr "必须包含{0}个或者更多小写字母" +msgid "{num} character" +msgid_plural "{num} characters" +msgstr[0] "" #: common/djangoapps/util/password_policy_validators.py #, python-brace-format -msgid "must contain {0} or more digits" -msgstr "必须包含{0}个或者更多数字" +msgid "Enter a password with at most {num} character." +msgid_plural "Enter a password with at most {num} characters." +msgstr[0] "" +#. Translators: This message is shown to users who enter a password matching +#. the username they enter(ed). #: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more punctuation characters" -msgstr "必须包含{0}个或者更多标点符号" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more non ascii characters" -msgstr "必须包含{0}个或更多非ASCII字符" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more unique words" -msgstr "必须包含{0}个或更多不重复的单词" - -#: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more numbers" +msgid "Password cannot be the same as the username." msgstr "" #: common/djangoapps/util/password_policy_validators.py -#, python-brace-format -msgid "must contain {0} or more letters" +msgid "Password is too similar to a dictionary word." msgstr "" -#: common/djangoapps/util/password_policy_validators.py -msgid "Too similar to a restricted dictionary word." -msgstr "与受限词字典中的词语过于相似。" - #: common/djangoapps/xblock_django/admin.py msgid "" "To disable the XBlock and prevent rendering in the LMS, leave \"Enabled\" " @@ -5502,8 +5528,8 @@ msgid "Use the checkout page hosted by the E-Commerce service." msgstr "透过使用电子商务服务承载结帐页面。" #: lms/djangoapps/commerce/models.py -msgid "Path to single course checkout page hosted by the E-Commerce service." -msgstr "透过电子商务服务承载单门课程结帐页面之途径" +msgid "Path to course(s) checkout page hosted by the E-Commerce service." +msgstr "" #: lms/djangoapps/commerce/models.py openedx/core/djangoapps/catalog/models.py #: openedx/core/djangoapps/credentials/models.py @@ -10539,25 +10565,6 @@ msgstr "" msgid "Enter a valid email address that contains at least {min} characters." msgstr "" -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Enter a password." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password is not long enough." -msgstr "" - -#: openedx/core/djangoapps/user_api/accounts/__init__.py -#, python-brace-format -msgid "Password cannot be longer than {max} character." -msgstr "" - -#. Translators: This message is shown to users who enter a password matching -#. the username they enter(ed). -#: openedx/core/djangoapps/user_api/accounts/__init__.py -msgid "Password cannot be the same as the username." -msgstr "" - #. Translators: These messages are shown to users who do not enter information #. into the required field or enter it incorrectly. #: openedx/core/djangoapps/user_api/accounts/__init__.py @@ -11831,7 +11838,6 @@ msgid "Reset" msgstr "重置" #: cms/templates/widgets/footer.html lms/templates/footer.html -#: themes/edx.org/lms/templates/footer.html #: themes/red-theme/lms/templates/footer.html msgid "Legal" msgstr "合法" @@ -12025,8 +12031,8 @@ msgstr "" #: lms/templates/_gated_content.html msgid "" -"You must complete the section '{prereq_section_name}' with the required " -"score before you are able to view this content." +"You must earn a passing score for '{prereq_section_name}' to access this " +"content." msgstr "" #: lms/templates/_gated_content.html @@ -17732,6 +17738,10 @@ msgid "" " spelling." msgstr "对该类问题您不会受到提示邮件，因此请仔细检查，确保拼写无误。" +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Role of the users being enrolled." +msgstr "" + #: lms/templates/instructor/instructor_dashboard_2/membership.html msgid "" "Enter the reason why the students are to be manually enrolled or unenrolled." @@ -19649,18 +19659,6 @@ msgid "" "粤ICP备17044299号-2. " msgstr "" -#: themes/edx.org/lms/templates/footer.html -#: themes/edx.org/lms/templates/certificates/_about-edx.html -msgid "About edX" -msgstr "关于 edX" - -#: themes/edx.org/lms/templates/footer.html -msgid "" -"© 2012–{year} edX Inc. All rights reserved except where noted. EdX, Open " -"edX and the edX and Open edX logos are registered trademarks or trademarks " -"of edX Inc." -msgstr "" - #: themes/edx.org/lms/templates/certificates/_about-accomplishments.html msgid "About edX Verified Certificates" msgstr "" @@ -19673,6 +19671,10 @@ msgid "" "their identity." msgstr "" +#: themes/edx.org/lms/templates/certificates/_about-edx.html +msgid "About edX" +msgstr "关于 edX" + #: themes/edx.org/lms/templates/certificates/_about-edx.html msgid "" "{link_start}edX{link_end} offers interactive online classes and MOOCs from " diff --git a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.mo b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.mo index fbc4bb06ed..5054334c9a 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 92854d9965..6046ca0c5c 100644 --- a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po +++ b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po @@ -190,7 +190,7 @@ msgid "" msgstr "" "Project-Id-Version: edx-platform\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2018-03-13 15:30+0000\n" +"POT-Creation-Date: 2018-03-25 20:42+0000\n" "PO-Revision-Date: 2018-03-13 13:50+0000\n" "Last-Translator: San \n" "Language-Team: Chinese (China) (http://www.transifex.com/open-edx/edx-platform/language/zh_CN/)\n" @@ -2405,6 +2405,10 @@ msgstr "未能找到与以下识别码关联的用户：" msgid "Reason field should not be left blank." msgstr "原因不能为空。" +#: lms/static/js/instructor_dashboard/membership.js +msgid "Role field should not be left unselected." +msgstr "" + #: lms/static/js/instructor_dashboard/membership.js msgid "Error enrolling/unenrolling users." msgstr "用户选课／放弃选课时出错。" @@ -2961,32 +2965,6 @@ msgstr "" msgid "Could not override problem score for {user}." msgstr "" -#: lms/static/js/student_account/account.js -msgid "The data could not be saved." -msgstr "该数据无法保存。" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid email address" -msgstr "请输入一个有效的电子邮件地址。" - -#: lms/static/js/student_account/account.js -msgid "Please enter a valid password" -msgstr "请输入一个有效的密码。" - -#: lms/static/js/student_account/account.js -msgid "" -"Password reset email sent. Follow the link in the email to change your " -"password." -msgstr "密码重置邮件已经发送。请通过点击邮件中的链接更改你的密码。" - -#: lms/static/js/student_account/account.js -msgid "We weren't able to send you a password reset email." -msgstr "密码重置邮件发送失败。" - -#: lms/static/js/student_account/account.js -msgid "Please check your email to confirm the change" -msgstr "请检查您的邮件以确认修改" - #: lms/static/js/student_account/tos_modal.js msgid "Terms of Service and Honor Code" msgstr ""