Commit ed86f258 authored by Michal Čihař's avatar Michal Čihař

Merge remote-tracking branch 'weblate/master'

Conflicts:
	locale/pt_BR/LC_MESSAGES/django.po
	locale/zh_CN/LC_MESSAGES/django.po
	locale/zh_CN/LC_MESSAGES/djangojs.po
	locale/zh_TW/LC_MESSAGES/django.po
parents 65534a39 67724b2b
......@@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: Weblate 1.2\n"
"Report-Msgid-Bugs-To: weblate@lists.cihar.com\n"
"POT-Creation-Date: 2013-08-15 09:41+0200\n"
"PO-Revision-Date: 2013-07-30 16:29+0200\n"
"Last-Translator: Marcelo Camargo <marcelocamargo@linuxmail.org>\n"
"Language-Team: Portuguese (Brazil) <http://l10n.cihar.com/projects/weblate/"
"master/pt_BR/>\n"
"PO-Revision-Date: 2013-08-14 16:49+0200\n"
"Last-Translator: Stephan Souza <blad3d@gmail.com>\n"
"Language-Team: Portuguese (Brazil) "
"<http://l10n.cihar.com/projects/weblate/master/pt_BR/>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 1.6-dev\n"
"X-Generator: Weblate 1.7-dev\n"
#: accounts/forms.py:169 accounts/forms.py:216
msgid "First name"
......@@ -1762,29 +1762,27 @@ msgid "Please fix errors in the form."
msgstr "Por favor, corrija os erros no formulário."
#: trans/views/files.py:128
#, fuzzy, python-format
#, python-format
#| msgid ""
#| "File content successfully merged into translation, processed %d string."
msgid "File content successfully merged into translation, processed %d string."
msgid_plural ""
"File content successfully merged into translation, processed %d strings."
msgstr[0] ""
"O conteúdo do arquivo foi mesclado na tradução com sucesso, na string %d "
"processada."
"O conteúdo do arquivo foi mesclado na tradução com sucesso, processada %d "
"string."
msgstr[1] ""
"O conteúdo do arquivo foi mesclado na tradução com sucesso, na string %d "
"processada."
"O conteúdo do arquivo foi mesclado na tradução com sucesso, processadas %d "
"strings."
#: trans/views/files.py:139
#, fuzzy, python-format
#, python-format
#| msgid "There were no new strings in uploaded file, processed %d string."
msgid "There were no new strings in uploaded file, processed %d string."
msgid_plural ""
"There were no new strings in uploaded file, processed %d strings."
msgstr[0] ""
"Não haviam novas strings no arquivo enviado, na string %d processada."
msgstr[1] ""
"Não haviam novas strings no arquivo enviado, na string %d processada."
msgstr[0] "Não haviam novas strings no arquivo enviado, processada %d string."
msgstr[1] "Não haviam novas strings no arquivo enviado, processada %d string."
#: trans/views/files.py:149
#, python-format
......@@ -2867,7 +2865,6 @@ msgid "Uzbek (latin)"
msgstr "Uzbeque (latino)"
#: weblate/html/i18n.html:162
#, fuzzy
msgid "Venda"
msgstr "Venda"
......
This diff is collapsed.
......@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Weblate 1.2\n"
"Report-Msgid-Bugs-To: weblate@lists.cihar.com\n"
"POT-Creation-Date: 2013-08-15 09:41+0200\n"
"PO-Revision-Date: 2013-08-14 05:49+0200\n"
"PO-Revision-Date: 2013-08-14 05:50+0200\n"
"Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
"Language-Team: Simplified Chinese <http://l10n.cihar.com/projects/weblate/"
"javascript/zh_CN/>\n"
......@@ -27,7 +27,7 @@ msgstr "复制"
#: weblate/media/loader.js:92
#, c-format
msgid "The request for machine translation using %s has failed:"
msgstr "使用 %s 机器翻译的请求失败:"
msgstr "请求使用 %s 机器翻译失败:"
#: weblate/media/loader.js:104
msgid "The request for machine translation has failed:"
......
......@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Weblate 1.2\n"
"Report-Msgid-Bugs-To: weblate@lists.cihar.com\n"
"POT-Creation-Date: 2013-08-15 09:41+0200\n"
"PO-Revision-Date: 2013-08-13 09:53+0200\n"
"PO-Revision-Date: 2013-08-14 17:45+0200\n"
"Last-Translator: ezjerry liao <ezjerry@gmail.com>\n"
"Language-Team: Traditional Chinese <http://l10n.cihar.com/projects/weblate/"
"master/zh_TW/>\n"
......@@ -943,7 +943,7 @@ msgstr ""
#: trans/models/project.py:164
msgid "Set Translation-Team header"
msgstr ""
msgstr "設定翻譯小組頁眉"
#: trans/models/project.py:167
msgid ""
......@@ -952,7 +952,7 @@ msgstr ""
#: trans/models/project.py:173
msgid "Enable ACL"
msgstr ""
msgstr "啟用 ACL"
#: trans/models/project.py:176
msgid ""
......@@ -963,7 +963,7 @@ msgstr "是否啟用ACL這個專案,啟用之前,請先查看文件檔。"
#: trans/models/project.py:214
#, python-format
msgid "You are not allowed to access project %s."
msgstr ""
msgstr "您未得允許進入專案%s。"
#: trans/models/project.py:221
msgid ""
......@@ -978,11 +978,11 @@ msgstr ""
#: trans/models/project.py:233
#, python-format
msgid "Could not create project directory: %s"
msgstr ""
msgstr "無法建立專案目錄:%s"
#: trans/models/subproject.py:69
msgid "Subproject name"
msgstr ""
msgstr "子專案名稱"
#: trans/models/subproject.py:80 weblate/html/check.html:26
#: weblate/html/check_project.html:26 weblate/html/data.html:28
......@@ -993,17 +993,17 @@ msgstr "專案"
#: trans/models/subproject.py:83
msgid "Git repository"
msgstr ""
msgstr "Git資源庫"
#: trans/models/subproject.py:86
msgid ""
"URL of Git repository, use weblate://project/subproject for sharing with "
"other subproject."
msgstr ""
msgstr "URL 的 Git 資源庫,使用 weblate://project/subproject 分享給其它的子專案。"
#: trans/models/subproject.py:92
msgid "Git push URL"
msgstr ""
msgstr "Git 推送 URL"
#: trans/models/subproject.py:95
msgid "URL of push Git repository, pushing is disabled if empty."
......@@ -1011,7 +1011,7 @@ msgstr ""
#: trans/models/subproject.py:100
msgid "Repository browser"
msgstr ""
msgstr "瀏覽資源庫"
#: trans/models/subproject.py:102
#, python-format
......@@ -1022,7 +1022,7 @@ msgstr ""
#: trans/models/subproject.py:109
msgid "Exported Git URL"
msgstr ""
msgstr "已匯出 Git 的 URL"
#: trans/models/subproject.py:112
msgid "URL of Git repository where users can fetch changes from Weblate"
......@@ -1030,7 +1030,7 @@ msgstr ""
#: trans/models/subproject.py:117
msgid "Source string bug report address"
msgstr ""
msgstr "來源字串錯誤的回報位址"
#: trans/models/subproject.py:119
msgid ""
......@@ -1040,15 +1040,15 @@ msgstr ""
#: trans/models/subproject.py:125
msgid "Git branch"
msgstr ""
msgstr "Git 的分支"
#: trans/models/subproject.py:127
msgid "Git branch to translate"
msgstr ""
msgstr "翻譯 Git 分支"
#: trans/models/subproject.py:131
msgid "File mask"
msgstr ""
msgstr "檔案遮罩"
#: trans/models/subproject.py:135
msgid ""
......@@ -1082,15 +1082,15 @@ msgstr ""
#: trans/models/subproject.py:159
msgid "File format"
msgstr ""
msgstr "檔案格式"
#: trans/models/subproject.py:164
msgid "Automatic detection might fail for some formats and is slightly slower."
msgstr ""
msgstr "某些格式在自動偵測時可能會失敗,並會稍慢些。"
#: trans/models/subproject.py:169
msgid "Additional commit file"
msgstr ""
msgstr "另外提交檔案"
#: trans/models/subproject.py:175
msgid ""
......@@ -1100,7 +1100,7 @@ msgstr "已包含在提交的附加檔案中;更多詳細的資訊請查看文
#: trans/models/subproject.py:180
msgid "Pre-commit script"
msgstr ""
msgstr "預先提交的腳本"
#: trans/models/subproject.py:186
msgid ""
......@@ -1118,7 +1118,7 @@ msgstr "為翻譯更新子專案是否被鎖定。"
#: trans/models/subproject.py:199
msgid "Allow translation propagation"
msgstr ""
msgstr "允許翻譯傳播"
#: trans/models/subproject.py:202
msgid ""
......@@ -1136,7 +1136,7 @@ msgstr "Weblate 是否應該保留翻譯履歷"
#: trans/models/subproject.py:214
msgid "Suggestion voting"
msgstr ""
msgstr "建議投票"
#: trans/models/subproject.py:217
msgid "Whether users can vote for suggestions."
......@@ -1144,7 +1144,7 @@ msgstr ""
#: trans/models/subproject.py:221
msgid "Autoaccept suggestions"
msgstr ""
msgstr "自動接受建議"
#: trans/models/subproject.py:224
msgid ""
......@@ -1179,7 +1179,7 @@ msgstr ""
#: trans/models/subproject.py:561
#, python-format
msgid "Push is disabled for %s."
msgstr ""
msgstr "%s 已停用推送。"
#: trans/models/subproject.py:610
#, python-format
......
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