Changeset - cd3684d086d0
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Thomas De Schampheleire - 7 years ago 2019-03-10 21:41:57
thomas.de_schampheleire@nokia.com
i18n: zh_CN: fix 'duplicate message definition'

Error reported by Weblate:

msgmerge --no-wrap --backup=none --previous --update /home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po /home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/kallithea.pot

/home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po:6927: duplicate message definition...
/home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po:9: ...this is the location of the first definition
msgmerge: found 1 fatal error


Problem is introduced with commit 880e2f07651b3eaf88d01e71ac7f3cbf88df163c.
1 file changed with 1 insertions and 1 deletions:
kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
1
1
0 comments (0 inline, 0 general)
kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
➞
Show inline comments
 
@@ -6735,385 +6735,385 @@ msgid "Missing email, please update your
 
msgstr ""
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152

			




	
	
	
		
 
#, python-format

			




	
	
	
		
 
msgid "%s Repository group dashboard"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35

			




	
	
	
		
 
msgid "Rescan option"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39

			




	
	
	
		
 
msgid "Web"

			




	
	
	
		
 
msgstr "网络"

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43

			




	
	
	
		
 
msgid "Require SSL for vcs operations"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45

			




	
	
	
		
 
msgid ""

			




	
	
	
		
 
"Activate to require SSL both pushing and pulling. If SSL certificate is "

			




	
	
	
		
 
"missing, it will return an HTTP Error 406: Not Acceptable."

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51

			




	
	
	
		
 
msgid "Use Gravatars in Kallithea"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67

			




	
	
	
		
 
msgid ""

			




	
	
	
		
 
"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'."

			




	
	
	
		
 
"\n"

			




	
	
	
		
 
"                                                        The following "

			




	
	
	
		
 
"variables are available:\n"

			




	
	
	
		
 
"                                                        {scheme} 'http' "

			




	
	
	
		
 
"or 'https' sent from running Kallithea server,\n"

			




	
	
	
		
 
"                                                        {user}   current "

			




	
	
	
		
 
"user username,\n"

			




	
	
	
		
 
"                                                        {netloc} network "

			




	
	
	
		
 
"location/server host of running Kallithea server,\n"

			




	
	
	
		
 
"                                                        {repo}   full "

			




	
	
	
		
 
"repository name,\n"

			




	
	
	
		
 
"                                                        {repoid} ID of "

			




	
	
	
		
 
"repository, can be used to construct clone-by-id"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75

			




	
	
	
		
 
msgid "Dashboard items"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79

			




	
	
	
		
 
msgid ""

			




	
	
	
		
 
"Number of items displayed in the main page dashboard before pagination is"

			




	
	
	
		
 
" shown."

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81

			




	
	
	
		
 
msgid "Admin pages items"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142

			




	
	
	
		
 
#: kallithea/tests/data/templates/journal/journal.html.py:118

			




	
	
	
		
 
msgid "quick filter..."

			




	
	
	
		
 
msgstr "快速过滤..."

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43

			




	
	
	
		
 
msgid "Change avatar at"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53

			




	
	
	
		
 
msgid "Missing email, please update this user email address."

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/base/base.html.py:96

			




	
	
	
		
 
msgid "Keyboard shortcuts"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/base/base.html.py:98

			




	
	
	
		
 
msgid "Site-wide shortcuts"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/base/base.html.py:619

			




	
	
	
		
 
msgid "Forgot password ?"

			




	
	
	
		
 
msgstr "忘记密码？"

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/compare/compare_cs.html.py:54

			




	
	
	
		
 
msgid "Ancestor"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/compare/compare_cs.html.py:150

			




	
	
	
		
 
msgid "No common ancestor found - repositories are unrelated"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74

			




	
	
	
		
 
#, python-format

			




	
	
	
		
 
msgid "Comment from %s on %s changeset %s mentioned you"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77

			




	
	
	
		
 
#, python-format

			




	
	
	
		
 
msgid "Comment from %s on %s changeset %s"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82

			




	
	
	
		
 
msgid "The changeset status was changed to"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/main.html.py:31

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/main.txt.py:31

			




	
	
	
		
 
msgid "This is an automatic notification. Don't reply to this mail."

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74

			




	
	
	
		
 
#, python-format

			




	
	
	
		
 
msgid "%s mentioned you on %s pull request \"%s\""

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77

			




	
	
	
		
 
#, python-format

			




	
	
	
		
 
msgid "%s requested your review of %s pull request \"%s\""

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65

			




	
	
	
		
 
#, python-format

			




	
	
	
		
 
msgid "Comment from %s on %s pull request \"%s\""

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71

			




	
	
	
		
 
#, fuzzy

			




	
	
	
		
 
msgid "The comment closed the pull request with status"

			




	
	
	
		
 
msgstr "[评论]拉取请求"

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76

			




	
	
	
		
 
msgid "The comment was made with status"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/registration.html.py:47

			




	
	
	
		
 
#: kallithea/tests/data/templates/email_templates/registration.txt.py:47

			




	
	
	
		
 
msgid "View this user here"

			




	
	
	
		
 
msgstr "查看用户"

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/files/files_source.html.py:80

			




	
	
	
		
 
#, python-format

			




	
	
	
		
 
msgid "Edit on Branch:%s"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#: kallithea/tests/data/templates/summary/summary.html.py:227

			




	
	
	
		
 
msgid "Repository Size"

			




	
	
	
		
 
msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "No comments."

			




	
	
	
		
 
#~ msgstr "%d条评论"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "public journal"

			




	
	
	
		
 
#~ msgstr "公共日志"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "journal"

			




	
	
	
		
 
#~ msgstr "日志"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository has been %s"

			




	
	
	
		
 
#~ msgstr "版本库已被%s"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "You can't edit this user"

			




	
	
	
		
 
#~ msgstr "无法编辑该用户"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "No Files"

			




	
	
	
		
 
#~ msgstr "没有文件"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Username \"%(username)s\" is forbidden"

			




	
	
	
		
 
#~ msgstr "不允许用户名 \"%(username)s\""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "invalid user name"

			




	
	
	
		
 
#~ msgstr "无效用户名"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Your account is disabled"

			




	
	
	
		
 
#~ msgstr "该帐号已被禁用"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "invalid clone URL"

			




	
	
	
		
 
#~ msgstr "无效的克隆地址"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL"

			




	
	
	
		
 
#~ msgstr "无效的克隆地址，提供一个有效的克隆 http(s)或svn+http(s)地址"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid ""

			




	
	
	
		
 
#~ msgid "Revisions %(revs)s are already part of pull request or have set status"

			




	
	
	
		
 
#~ msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Defaults"

			




	
	
	
		
 
#~ msgstr "默认设置"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Watched"

			




	
	
	
		
 
#~ msgstr "关注的"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "My Permissions"

			




	
	
	
		
 
#~ msgstr "我的权限"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "delete"

			




	
	
	
		
 
#~ msgstr "删除"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Permissions Administration"

			




	
	
	
		
 
#~ msgstr "权限管理"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Default User Permissions Overview"

			




	
	
	
		
 
#~ msgstr "默认权限"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "none"

			




	
	
	
		
 
#~ msgstr "无"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "read"

			




	
	
	
		
 
#~ msgstr "读"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "write"

			




	
	
	
		
 
#~ msgstr "写"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "admin"

			




	
	
	
		
 
#~ msgstr "管理"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Optional URL from which repository should be cloned."

			




	
	
	
		
 
#~ msgstr "可选的，指定版本库应该从哪个http[s]地址克隆。"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Remote URL"

			




	
	
	
		
 
#~ msgstr "克隆地址"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Pull Changes from Remote Location"

			




	
	
	
		
 
#~ msgstr "从远程路径拉取修订集"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "edit"

			




	
	
	
		
 
#~ msgstr "编辑"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Default permissions"

			




	
	
	
		
 
#~ msgstr "默认权限"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Status change from pull request"

			




	
	
	
		
 
#~ msgstr "状态修改为%s"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Mimetype"

			




	
	
	
		
 
#~ msgstr "MIME类型"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "My Repos"

			




	
	
	
		
 
#~ msgstr "我的版本库"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "owner"

			




	
	
	
		
 
#~ msgstr "所有者"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Open New Pull Request for Selected Changesets"

			




	
	
	
		
 
#~ msgstr "为选择的变更集创建新的拉取请求"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "You can generate it by clicking following URL"

			




	
	
	
		
 
#~ msgstr "点击下面的链接以重新生成密码："

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Created by"

			




	
	
	
		
 
#~ msgstr "创建于"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Ancestor didn't change - show diff since previous version:"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid ""

			




	
	
	
		
 
#~ "This pull request is based on "

			




	
	
	
		
 
#~ "another %s revision and there is "

			




	
	
	
		
 
#~ "no simple diff."

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "No changes found on %s %s since previous version."

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Closed, replaced by %s ."

			




	
	
	
		
 
#~ msgstr "已关闭，被 %s 替换。"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "The following changes are available on %s:"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Git pull requests don't support updates yet."

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Closing."

			




	
	
	
		
 
#~ msgstr "关闭。"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "An error occurred during creation of field"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Changeset not found"

			




	
	
	
		
 
#~ msgstr "未找到修订集"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository no access"

			




	
	
	
		
 
#~ msgstr "无版本库访问权限"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository read access"

			




	
	
	
		
 
#~ msgstr "版本库读取权限"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository write access"

			




	
	
	
		
 
#~ msgstr "版本库写入权限"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository admin access"

			




	
	
	
		
 
#~ msgstr "版本库管理权限"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository Group no access"

			




	
	
	
		
 
#~ msgstr "无版本库组访问权限"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository Group read access"

			




	
	
	
		
 
#~ msgstr "版本库组读取权限"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository Group write access"

			




	
	
	
		
 
#~ msgstr "版本库组写入"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository Group admin access"

			




	
	
	
		
 
#~ msgstr "版本库组管理权限"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository creation disabled"

			




	
	
	
		
 
#~ msgstr "禁用创建版本库"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository creation enabled"

			




	
	
	
		
 
#~ msgstr "允许创建版本库"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository forking disabled"

			




	
	
	
		
 
#~ msgstr "禁用复刻版本库"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository forking enabled"

			




	
	
	
		
 
#~ msgstr "允许复刻版本库"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Register disabled"

			




	
	
	
		
 
#~ msgstr "禁用注册"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Register new user with Kallithea with manual activation"

			




	
	
	
		
 
#~ msgstr "用手动激活注册新用户"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Register new user with Kallithea with auto activation"

			




	
	
	
		
 
#~ msgstr "用自动激活注册新用户"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Not Reviewed"

			




	
	
	
		
 
#~ msgstr "未检视"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Rejected"

			




	
	
	
		
 
#~ msgstr "驳回"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Under Review"

			




	
	
	
		
 
#~ msgstr "检视中"

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository group no access"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository group read access"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository group write access"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository group admin access"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "User group no access"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "User group read access"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "User group write access"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "User group admin access"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository Group creation disabled"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "Repository Group creation enabled"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "User Group creation disabled"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "User Group creation enabled"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "User Registration with manual account activation"

			




	
	
	
		
 
#~ msgstr ""

			




	
	
	
		
 

			




	
	
	
		
 
#~ msgid "User Registration with automatic account activation"

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.