Commit 2e5bac4d by shuangcheng

Merge branch 'open-release/ginkgo.master' of…

Merge branch 'open-release/ginkgo.master' of https://git.orhontech.com/edx/edx-platform into open-release/ginkgo.master
parents f0039776 aafee4c7
......@@ -350,10 +350,10 @@
msgid ""
msgstr ""
"Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"Report-Msgid-Bugs-To: xys@orhonit.com\n"
"POT-Creation-Date: 2017-06-08 14:59+0000\n"
"PO-Revision-Date: 2018-10-11 16:57+0800\n"
"Language-Team: Chinese (China) (http://www.transifex.com/open-edx/edx-platform/language/zh_CN/)\n"
"PO-Revision-Date: 2018-10-20 21:25+0800\n"
"Language-Team: OrhonTeam (China) (http://www.orhonit.com/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
......@@ -4884,8 +4884,9 @@ msgid "Unable to get git log"
msgstr "git ᠡᠳᠦᠷ ᠦᠨ ᠲᠡᠮᠳᠡᠭᠯᠡᠯ ᠢ ᠣᠯᠬᠤ ᠠᠷᠭ᠎ᠠ ᠦᠭᠡᠶ᠃"
#: lms/djangoapps/dashboard/git_import.py
#, fuzzy
msgid "git clone or pull failed!"
msgstr ""
msgstr "git clone ᠪᠤᠶᠤ pullᠢᠯᠠᠭᠳᠠᠪᠠ!"
#: lms/djangoapps/dashboard/git_import.py
msgid "Unable to run import command."
......@@ -18051,8 +18052,9 @@ msgid "No changes made. Nothing to save."
msgstr "ᠬᠤᠪᠢᠷᠠᠯᠲᠠ ᠦᠭᠡᠶ᠂ ᠬᠠᠳᠠᠭᠠᠯᠠᠬᠤ ᠴᠢᠬᠤᠯᠠ ᠦᠭᠡᠶ"
#: wiki/forms.py
#, fuzzy
msgid "Slug"
msgstr ""
msgstr "ᠦᠭᠡᠷ᠎ᠡ ᠨᠡᠷ᠎ᠡ"
#: wiki/forms.py
msgid "This will be the address where your article can be found. Use only alphanumeric characters and - or _. Note that you cannot change the slug after creating the article."
......@@ -18278,8 +18280,9 @@ msgid "Cache lookup value for articles"
msgstr "ᠳ᠋ᠣᠺᠦ᠋ᠮᠧᠨ᠋ᠲ ᠦᠨ ᠨᠠᠮᠬᠠᠳᠬᠠᠬᠤ ᠬᠠᠶᠢᠬᠤ ᠬᠡᠮᠵᠢᠭᠳᠡᠯ"
#: wiki/models/urlpath.py
#, fuzzy
msgid "slug"
msgstr ""
msgstr "ᠨᠢᠯᠴᠠᠭᠠᠢ ᠪᠡᠶᠠᠳᠠᠨ"
#: wiki/models/urlpath.py
msgid "(root)"
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment