Merge branch 'select' of github.com:Man2Life/edx-platform into select

conf/locale/babel.cfg

@@ -5,9 +5,9 @@
 
 # Extraction from Javscript source files
 [javascript: cms/**.js]
-[javascript: lms/admin/**.js]
-[javascript: lms/js/*.js]
-[javascript: lms/js/wiki/*.js]
+[javascript: lms/static/admin/**.js]
+[javascript: lms/static/js/*.js]
+[javascript: lms/static/js/wiki/*.js]
 [javascript: common/static/js/capa/**.js]
 [javascript: common/static/js/course_groups/**.js]
 # do not extract from common/static/js/vendor/**

conf/locale/ru/LC_MESSAGES/django-partial.po

@@ -10,14 +10,18 @@ msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: translation_team@edx.org\n"
 "POT-Creation-Date: 2013-08-16 13:50-0400\n"
-"PO-Revision-Date: 2013-08-16 18:10+0000\n"
-"Last-Translator: jtauber <jtauber@jtauber.com>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/edx-platform/language/ru/)\n"
+"PO-Revision-Date: 2013-08-29 12:12+0400\n"
+"Last-Translator: cher <blackav@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/edx-"
+"platform/language/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.5.0-rc1\n"
+"X-POOTLE-MTIME: 1377763956.134254\n"
 
 #: cms/djangoapps/contentstore/utils.py:17
 msgid "Open Ended Panel"
@@ -33,6 +37,9 @@ msgid ""
 "\n"
 "{err}"
 msgstr ""
+"Невозможно создать курс '{name}'.\n"
+"\n"
+"{err}"
 
 #: cms/djangoapps/contentstore/views/course.py:126
 msgid ""