Merge pull request #2741 from edx/sarina/update-translations

Fix password reset i18n

conf/locale/eo/LC_MESSAGES/django.po

@@ -37,8 +37,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-02-25 14:01-0500\n"
-"PO-Revision-Date: 2014-02-25 19:01:45.523355\n"
+"POT-Creation-Date: 2014-02-26 16:15-0500\n"
+"PO-Revision-Date: 2014-02-26 21:15:47.512922\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -304,6 +304,14 @@ msgid "A country is required"
 msgstr "À çöüntrý ïs réqüïréd Ⱡ'σя#"
 
 #: common/djangoapps/student/views.py
+msgid "Username cannot be more than {0} characters long"
+msgstr "Ûsérnämé çännöt ßé möré thän {0} çhäräçtérs löng Ⱡ'σяєм ιρѕυм #"
+
+#: common/djangoapps/student/views.py
+msgid "Email cannot be more than {0} characters long"
+msgstr "Émäïl çännöt ßé möré thän {0} çhäräçtérs löng Ⱡ'σяєм ιρѕυм#"
+
+#: common/djangoapps/student/views.py
 msgid "Valid e-mail is required."
 msgstr "Välïd é-mäïl ïs réqüïréd. Ⱡ'σяєм#"
 
@@ -2906,6 +2914,14 @@ msgstr ""
 "∂σłσ#"
 
 #: lms/templates/registration/password_reset_email.html
+msgid ""
+"If you didn't request this change, you can disregard this email - we have "
+"not yet reset your password."
+msgstr ""
+"Ìf ýöü dïdn't réqüést thïs çhängé, ýöü çän dïsrégärd thïs émäïl - wé hävé "
+"nöt ýét rését ýöür pässwörd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
+
+#: lms/templates/registration/password_reset_email.html
 msgid "Thanks for using our site!"
 msgstr "Thänks för üsïng öür sïté! Ⱡ'σяєм#"
 
@@ -2989,6 +3005,8 @@ msgstr "Ýöü äré délétïng än ärtïçlé. Pléäsé çönfïrm. Ⱡ'σя
 #: lms/templates/wiki/edit.html cms/templates/component.html
 #: lms/templates/discussion/_underscore_templates.html
 #: lms/templates/discussion/_underscore_templates.html
+#: lms/templates/discussion/_underscore_templates.html
+#: lms/templates/discussion/_underscore_templates.html
 #: lms/templates/discussion/mustache/_inline_thread_show.mustache
 #: lms/templates/wiki/includes/article_menu.html
 msgid "Edit"
@@ -3348,6 +3366,15 @@ msgstr "révïsïöns #"
 msgid "There are no attachments for this article."
 msgstr "Théré äré nö ättäçhménts för thïs ärtïçlé. Ⱡ'σяєм ιρѕυ#"
 
+#: cms/djangoapps/contentstore/course_info_model.py
+#: cms/djangoapps/contentstore/course_info_model.py
+msgid "Invalid course update id."
+msgstr "Ìnvälïd çöürsé üpdäté ïd. Ⱡ'σяєм#"
+
+#: cms/djangoapps/contentstore/course_info_model.py
+msgid "Course update not found."
+msgstr "Çöürsé üpdäté nöt föünd. Ⱡ'σяє#"
+
 #: cms/djangoapps/contentstore/git_export_utils.py
 msgid ""
 "GIT_REPO_EXPORT_DIR not set or path {0} doesn't exist, please create it, or "
@@ -3621,6 +3648,7 @@ msgstr "Sävé Ⱡ'σяєм#"
 #: lms/templates/discussion/_new_post.html
 #: lms/templates/discussion/_underscore_templates.html
 #: lms/templates/discussion/_underscore_templates.html
+#: lms/templates/discussion/_underscore_templates.html
 #: lms/templates/discussion/mustache/_inline_discussion.mustache
 #: lms/templates/discussion/mustache/_inline_discussion_cohorted.mustache
 #: lms/templates/verify_student/face_upload.html
@@ -7091,16 +7119,15 @@ msgid "Report Misuse"
 msgstr "Répört Mïsüsé Ⱡ'#"
 
 #: lms/templates/discussion/_underscore_templates.html
-#: lms/templates/discussion/_underscore_templates.html
-msgid "pin this thread"
-msgstr "pïn thïs thréäd Ⱡ'#"
-
-#: lms/templates/discussion/_underscore_templates.html
-#: lms/templates/discussion/_underscore_templates.html
 msgid "Pin Thread"
 msgstr "Pïn Thréäd Ⱡ#"
 
 #: lms/templates/discussion/_underscore_templates.html
+#: lms/templates/discussion/mustache/_inline_thread_show.mustache
+msgid "Pinned"
+msgstr "Pïnnéd Ⱡ'σяєм ιρѕ#"
+
+#: lms/templates/discussion/_underscore_templates.html
 msgid "(this post is about %(courseware_title_linked)s)"
 msgstr "(thïs pöst ïs äßöüt %(courseware_title_linked)s) Ⱡ'σяє#"
 
@@ -7152,6 +7179,14 @@ msgid "-posted %(time_ago)s by"
 msgstr "-pöstéd %(time_ago)s ßý Ⱡ'#"
 
 #: lms/templates/discussion/_underscore_templates.html
+msgid "Editing comment"
+msgstr "Édïtïng çömmént Ⱡ'#"
+
+#: lms/templates/discussion/_underscore_templates.html
+msgid "Update comment"
+msgstr "Ûpdäté çömmént Ⱡ'#"
+
+#: lms/templates/discussion/_underscore_templates.html
 msgid ""
 "%(comments_count)s %(span_sr_open)scomments (%(unread_comments_count)s "
 "unread comments)%(span_close)s"
@@ -7285,10 +7320,6 @@ msgstr "Hïdé dïsçüssïön Ⱡ'#"
 msgid "This thread has been pinned by course staff."
 msgstr "Thïs thréäd häs ßéén pïnnéd ßý çöürsé stäff. Ⱡ'σяєм ιρѕυм#"
 
-#: lms/templates/discussion/mustache/_inline_thread_show.mustache
-msgid "Pinned"
-msgstr "Pïnnéd Ⱡ'σяєм ιρѕ#"
-
 #: lms/templates/discussion/mustache/_pagination.mustache
 #: lms/templates/discussion/mustache/_pagination.mustache
 msgid "…"
@@ -9853,6 +9884,28 @@ msgstr ""
 "téxtßöök çhäptérs, änd fïlés thät äppéär ön ýöür Çöürsé Händöüts sïdéßär. "
 "Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕ#"
 
+#: cms/templates/asset_index.html
+msgid "File URLs"
+msgstr "Fïlé ÛRLs #"
+
+#: cms/templates/asset_index.html
+msgid ""
+"You use the Embed URL value to link to the file or image from a component, a"
+" course update, or a course handout."
+msgstr ""
+"Ýöü üsé thé Émßéd ÛRL välüé tö lïnk tö thé fïlé ör ïmägé fröm ä çömpönént, ä"
+" çöürsé üpdäté, ör ä çöürsé händöüt. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє#"
+
+#: cms/templates/asset_index.html
+msgid ""
+"You use the External URL value to reference the file or image from outside "
+"of your course. Do not use the External URL as a link value within your "
+"course."
+msgstr ""
+"Ýöü üsé thé Éxtérnäl ÛRL välüé tö référénçé thé fïlé ör ïmägé fröm öütsïdé "
+"öf ýöür çöürsé. Dö nöt üsé thé Éxtérnäl ÛRL äs ä lïnk välüé wïthïn ýöür "
+"çöürsé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι#"
+
 #: cms/templates/asset_index.html cms/templates/overview.html
 #: cms/templates/settings_graders.html
 msgid "What can I do on this page?"
@@ -9869,15 +9922,6 @@ msgstr ""
 "äççéss thät fïlé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg#"
 
 #: cms/templates/asset_index.html
-msgid ""
-"Use the URL listed for a file to create a link to that file in the Course "
-"Handouts sidebar or in the body of the course."
-msgstr ""
-"Ûsé thé ÛRL lïstéd för ä fïlé tö çréäté ä lïnk tö thät fïlé ïn thé Çöürsé "
-"Händöüts sïdéßär ör ïn thé ßödý öf thé çöürsé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
-"¢σηѕє¢тє#"
-
-#: cms/templates/asset_index.html
 msgid "Your file has been deleted."
 msgstr "Ýöür fïlé häs ßéén délétéd. Ⱡ'σяєм#"
 

conf/locale/eo/LC_MESSAGES/djangojs.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2014-02-25 14:01-0500\n"
-"PO-Revision-Date: 2014-02-25 19:01:45.260096\n"
+"POT-Creation-Date: 2014-02-26 16:14-0500\n"
+"PO-Revision-Date: 2014-02-26 21:15:47.937196\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -362,6 +362,12 @@ msgstr ""
 "¢σηѕє¢т#"
 
 #: common/static/coffee/src/discussion/utils.js
+msgid "We had some trouble processing your request. Please try again."
+msgstr ""
+"Wé häd sömé tröüßlé pröçéssïng ýöür réqüést. Pléäsé trý ägäïn. Ⱡ'σяєм ιρѕυм "
+"∂σłσя#"
+
+#: common/static/coffee/src/discussion/utils.js
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
 #: common/static/coffee/src/discussion/views/discussion_thread_list_view.js
@@ -437,12 +443,14 @@ msgstr "Löädïng thréäd lïst Ⱡ'σя#"
 msgid "Click to remove report"
 msgstr "Çlïçk tö rémövé répört Ⱡ'σяє#"
 
+#. Translators: The text between start_sr_span and end_span is not shown
+#. in most browsers but will be read by screen readers.
 #: common/static/coffee/src/discussion/views/discussion_thread_show_view.js
 #: common/static/coffee/src/discussion/views/thread_response_show_view.js
-msgid "Misuse Reported, %(start_sr_span)s click to remove report%(end_span)s"
+msgid "Misuse Reported%(start_sr_span)s, click to remove report%(end_span)s"
 msgstr ""
-"Mïsüsé Répörtéd, %(start_sr_span)s çlïçk tö rémövé répört%(end_span)s Ⱡ'σяєм"
-" ιρѕυм #"
+"Mïsüsé Répörtéd%(start_sr_span)s, çlïçk tö rémövé répört%(end_span)s Ⱡ'σяєм "
+"ιρѕυм#"
 
 #: common/static/coffee/src/discussion/views/discussion_thread_show_view.js
 #: common/static/coffee/src/discussion/views/response_comment_show_view.js
@@ -451,6 +459,16 @@ msgstr ""
 msgid "Report Misuse"
 msgstr "Répört Mïsüsé Ⱡ'#"
 
+#. Translators: The text between start_sr_span and end_span is not shown
+#. in most browsers but will be read by screen readers.
+#: common/static/coffee/src/discussion/views/discussion_thread_show_view.js
+msgid "Pinned%(start_sr_span)s, click to unpin%(end_span)s"
+msgstr "Pïnnéd%(start_sr_span)s, çlïçk tö ünpïn%(end_span)s Ⱡ'σяєм #"
+
+#: common/static/coffee/src/discussion/views/discussion_thread_show_view.js
+msgid "Click to unpin"
+msgstr "Çlïçk tö ünpïn Ⱡ'#"
+
 #: common/static/coffee/src/discussion/views/discussion_thread_show_view.js
 msgid "Pinned"
 msgstr "Pïnnéd Ⱡ'σяєм ιρѕ#"
@@ -459,10 +477,6 @@ msgstr "Pïnnéd Ⱡ'σяєм ιρѕ#"
 msgid "Pin Thread"
 msgstr "Pïn Thréäd Ⱡ#"
 
-#: common/static/coffee/src/discussion/views/discussion_thread_show_view.js
-msgid "Pinning is not currently available"
-msgstr "Pïnnïng ïs nöt çürréntlý äväïläßlé Ⱡ'σяєм ιρ#"
-
 #: common/static/coffee/src/discussion/views/discussion_thread_view.js
 msgid "We had some trouble loading responses. Please reload the page."
 msgstr ""

lms/templates/registration/password_reset_email.html

@@ -6,7 +6,7 @@
 https://{{domain}}{% url 'student.views.password_reset_confirm_wrapper' uidb36=uid token=token %}
 {% endblock %}
 
-If you didn't request this change, you can disregard this email - we have not yet reset your password.
+{% trans "If you didn't request this change, you can disregard this email - we have not yet reset your password." %}
 
 {% trans "Thanks for using our site!" %}