Mercurial > kallithea
changeset 2346:8fe7c1024719 codereview
merge with beta
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 27 May 2012 18:37:23 +0200 |
parents | f8c953c6b040 (current diff) 824461179c80 (diff) |
children | 58bcaf1b2fe2 |
files | rhodecode/lib/diffs.py rhodecode/lib/helpers.py rhodecode/model/db.py rhodecode/templates/changelog/changelog.html |
diffstat | 17 files changed, 234 insertions(+), 573 deletions(-) [+] |
line wrap: on
line diff
--- a/development.ini Fri May 25 18:29:31 2012 +0200 +++ b/development.ini Sun May 27 18:37:23 2012 +0200 @@ -46,6 +46,8 @@ use = egg:rhodecode full_stack = true static_files = true +# Optional Languages +# en, fr, pt_BR, zh_CN, zh_TW lang = en cache_dir = %(here)s/data index_dir = %(here)s/data/index @@ -78,7 +80,8 @@ issue_pat = (?:\s*#)(\d+) ## server url to the issue, each {id} will be replaced with match -## fetched from the regex and {repo} is replaced with repository name +## fetched from the regex and {repo} is replaced with full repository name +## including groups {repo_name} is replaced with just name of repo issue_server_link = https://myissueserver.com/{repo}/issue/{id}
--- a/docs/api/api.rst Fri May 25 18:29:31 2012 +0200 +++ b/docs/api/api.rst Sun May 27 18:37:23 2012 +0200 @@ -411,6 +411,9 @@ "repo_name" : "<reponame>" "type" : "<type>", "description" : "<description>", + "clone_uri" : "<clone_uri>", + "private": : "<bool>", + "created_on" : "<datetimecreated>", "members" : [ { "type": "user", @@ -459,7 +462,10 @@ "id" : "<id>", "repo_name" : "<reponame>" "type" : "<type>", - "description" : "<description>" + "description" : "<description>", + "clone_uri" : "<clone_uri>", + "private": : "<bool>", + "created_on" : "<datetimecreated>", }, … ]
--- a/docs/changelog.rst Fri May 25 18:29:31 2012 +0200 +++ b/docs/changelog.rst Sun May 27 18:37:23 2012 +0200 @@ -14,12 +14,26 @@ ++++ - new codereview system +- email map, allowing users to have multiple email addresses mapped into + their accounts - changed setup-app into setup-rhodecode and added default options to it. - +- new git repos are created as bare now by default + fixes +++++ - +- improved translations +- fixes issue #455 Creating an archive generates an exception on Windows +- fixes #448 Download ZIP archive keeps file in /tmp open and results + in out of disk space +- fixes issue #454 Search results under Windows include proceeding + backslash +- fixed issue #450. Rhodecode no longer will crash when bad revision is + present in journal data. +- fix for issue #417, git execution was broken on windows for certain + commands. +- fixed #413. Don't disable .git directory for bare repos on deleting +- fixed issue #459. Changed the way of obtaining logger in reindex task. 1.3.6 (**2012-05-17**) ----------------------
--- a/production.ini Fri May 25 18:29:31 2012 +0200 +++ b/production.ini Sun May 27 18:37:23 2012 +0200 @@ -46,6 +46,8 @@ use = egg:rhodecode full_stack = true static_files = true +# Optional Languages +# en, fr, pt_BR, zh_CN, zh_TW lang = en cache_dir = %(here)s/data index_dir = %(here)s/data/index @@ -78,7 +80,8 @@ issue_pat = (?:\s*#)(\d+) ## server url to the issue, each {id} will be replaced with match -## fetched from the regex and {repo} is replaced with repository name +## fetched from the regex and {repo} is replaced with full repository name +## including groups {repo_name} is replaced with just name of repo issue_server_link = https://myissueserver.com/{repo}/issue/{id}
--- a/rhodecode/config/deployment.ini_tmpl Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/config/deployment.ini_tmpl Sun May 27 18:37:23 2012 +0200 @@ -80,7 +80,8 @@ issue_pat = (?:\s*#)(\d+) ## server url to the issue, each {id} will be replaced with match -## fetched from the regex and {repo} is replaced with repository name +## fetched from the regex and {repo} is replaced with full repository name +## including groups {repo_name} is replaced with just name of repo issue_server_link = https://myissueserver.com/{repo}/issue/{id}
--- a/rhodecode/controllers/api/api.py Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/controllers/api/api.py Sun May 27 18:37:23 2012 +0200 @@ -391,6 +391,9 @@ id=repo.repo_id, repo_name=repo.repo_name, type=repo.repo_type, + clone_uri=repo.clone_uri, + private=repo.private, + created_on=repo.created_on, description=repo.description, members=members ) @@ -404,13 +407,16 @@ """ result = [] - for repository in Repository.getAll(): + for repo in Repository.getAll(): result.append( dict( - id=repository.repo_id, - repo_name=repository.repo_name, - type=repository.repo_type, - description=repository.description + id=repo.repo_id, + repo_name=repo.repo_name, + type=repo.repo_type, + clone_uri=repo.clone_uri, + private=repo.private, + created_on=repo.created_on, + description=repo.description, ) ) return result
--- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Sun May 27 18:37:23 2012 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: rhodecode 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-05-24 22:18+0200\n" +"POT-Creation-Date: 2012-05-27 17:41+0200\n" "PO-Revision-Date: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL@li.org>\n" @@ -625,105 +625,105 @@ msgstr "" #: rhodecode/lib/diffs.py:78 -msgid "Changeset was to big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" #: rhodecode/lib/diffs.py:88 msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:414 +#: rhodecode/lib/helpers.py:415 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:418 +#: rhodecode/lib/helpers.py:419 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:462 +#: rhodecode/lib/helpers.py:463 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:491 +#: rhodecode/lib/helpers.py:492 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:511 -msgid "and" -msgstr "" - #: rhodecode/lib/helpers.py:512 +msgid "and" +msgstr "" + +#: rhodecode/lib/helpers.py:513 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:536 +#: rhodecode/lib/helpers.py:537 msgid "fork name " msgstr "" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:540 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:541 rhodecode/lib/helpers.py:546 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:541 +#: rhodecode/lib/helpers.py:542 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 -msgid "[forked] repository" -msgstr "" - #: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 +msgid "[forked] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:544 rhodecode/lib/helpers.py:548 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:544 +#: rhodecode/lib/helpers.py:545 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:548 -msgid "[pushed] into" -msgstr "" - #: rhodecode/lib/helpers.py:549 -msgid "[committed via RhodeCode] into" +msgid "[pushed] into" msgstr "" #: rhodecode/lib/helpers.py:550 -msgid "[pulled from remote] into" +msgid "[committed via RhodeCode] into" msgstr "" #: rhodecode/lib/helpers.py:551 -msgid "[pulled] from" +msgid "[pulled from remote] into" msgstr "" #: rhodecode/lib/helpers.py:552 -msgid "[started following] repository" +msgid "[pulled] from" msgstr "" #: rhodecode/lib/helpers.py:553 +msgid "[started following] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:554 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:731 +#: rhodecode/lib/helpers.py:732 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:735 +#: rhodecode/lib/helpers.py:736 msgid "No Files" msgstr "" @@ -3070,118 +3070,9 @@ msgid "file removed" msgstr "" -#~ msgid "Changeset is to big and was cut off, see raw changeset instead" -#~ msgstr "" - -#~ msgid "Diff is to big and was cut off, see raw diff instead" -#~ msgstr "" - -#~ msgid "There are no files yet" -#~ msgstr "" - -#~ msgid "Binary file" -#~ msgstr "" - -#~ msgid "year" -#~ msgstr "" - -#~ msgid "month" -#~ msgstr "" - -#~ msgid "day" -#~ msgstr "" - -#~ msgid "hour" -#~ msgstr "" - -#~ msgid "minute" -#~ msgstr "" - -#~ msgid "second" -#~ msgstr "" - -#~ msgid "ago" -#~ msgstr "" - #~ msgid "" -#~ "Group name may only contain alphanumeric" -#~ " characters underscores, periods or dashes" -#~ " and must begin with alphanumeric " -#~ "character" -#~ msgstr "" - -#~ msgid "This repository already exists in group \"%s\"" -#~ msgstr "" - -#~ msgid "[RhodeCode] New User registration" -#~ msgstr "" - -#~ msgid "" -#~ "This user still owns %s repositories " -#~ "and cannot be removed. Switch owners " -#~ "or remove those repositories" -#~ msgstr "" - -#~ msgid "ADD NEW REPOSITORY" -#~ msgstr "" - -#~ msgid "Percentage of stats gathered" +#~ "Changeset was to big and was cut" +#~ " off, use diff menu to display " +#~ "this diff" #~ msgstr "" -#~ msgid "Number of repositories" -#~ msgstr "" - -#~ msgid "Confirm to delete this group" -#~ msgstr "" - -#~ msgid "My repositories" -#~ msgstr "" - -#~ msgid "Confirm to delete this user" -#~ msgstr "" - -#~ msgid "Login" -#~ msgstr "" - -#~ msgid "links" -#~ msgstr "" - -#~ msgid "changeset" -#~ msgstr "" - -#~ msgid "showing " -#~ msgstr "" - -#~ msgid "out of" -#~ msgstr "" - -#~ msgid "%s files affected with %s additions and %s deletions." -#~ msgstr "" - -#~ msgid "No changes in this file" -#~ msgstr "" - -#~ msgid "Diff is to big to display" -#~ msgstr "" - -#~ msgid "File annotate" -#~ msgstr "" - -#~ msgid "annotate" -#~ msgstr "" - -#~ msgid "Following" -#~ msgstr "" - -#~ msgid "by" -#~ msgstr "" - -#~ msgid "Trending source files" -#~ msgstr "" - -#~ msgid "Feeds" -#~ msgstr "" - -#~ msgid "Loaded in" -#~ msgstr "" -
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Sun May 27 18:37:23 2012 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.1.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-05-24 22:18+0200\n" +"POT-Creation-Date: 2012-05-27 17:41+0200\n" "PO-Revision-Date: 2012-05-20 11:36+0100\n" "Last-Translator: Vincent Duvert <vincent@duvert.net>\n" "Language-Team: fr <LL@li.org>\n" @@ -652,7 +652,7 @@ msgstr "Vous devez être connecté pour visualiser cette page." #: rhodecode/lib/diffs.py:78 -msgid "Changeset was to big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Cet ensemble de changements était trop gros pour être affiché et a été " "découpé, utilisez le menu « Diff » pour afficher les différences." @@ -661,100 +661,99 @@ msgid "No changes detected" msgstr "Aucun changement détecté." -#: rhodecode/lib/helpers.py:414 +#: rhodecode/lib/helpers.py:415 msgid "True" msgstr "Vrai" -#: rhodecode/lib/helpers.py:418 +#: rhodecode/lib/helpers.py:419 msgid "False" msgstr "Faux" -#: rhodecode/lib/helpers.py:462 +#: rhodecode/lib/helpers.py:463 #, fuzzy -#| msgid "No changesets yet" msgid "Changeset not found" msgstr "Dépôt vide" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: rhodecode/lib/helpers.py:491 +#: rhodecode/lib/helpers.py:492 msgid "compare view" msgstr "vue de comparaison" -#: rhodecode/lib/helpers.py:511 +#: rhodecode/lib/helpers.py:512 msgid "and" msgstr "et" -#: rhodecode/lib/helpers.py:512 +#: rhodecode/lib/helpers.py:513 #, python-format msgid "%s more" msgstr "%s de plus" -#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "révisions" -#: rhodecode/lib/helpers.py:536 +#: rhodecode/lib/helpers.py:537 msgid "fork name " msgstr "Nom du fork" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:540 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:541 rhodecode/lib/helpers.py:546 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/helpers.py:541 +#: rhodecode/lib/helpers.py:542 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:544 rhodecode/lib/helpers.py:548 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: rhodecode/lib/helpers.py:544 +#: rhodecode/lib/helpers.py:545 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:548 +#: rhodecode/lib/helpers.py:549 msgid "[pushed] into" msgstr "[a pushé] dans" -#: rhodecode/lib/helpers.py:549 +#: rhodecode/lib/helpers.py:550 msgid "[committed via RhodeCode] into" msgstr "[a commité via RhodeCode] dans" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:551 msgid "[pulled from remote] into" msgstr "[a pullé depuis un site distant] dans" -#: rhodecode/lib/helpers.py:551 +#: rhodecode/lib/helpers.py:552 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/helpers.py:552 +#: rhodecode/lib/helpers.py:553 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/helpers.py:553 +#: rhodecode/lib/helpers.py:554 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/helpers.py:731 +#: rhodecode/lib/helpers.py:732 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:735 +#: rhodecode/lib/helpers.py:736 msgid "No Files" msgstr "Aucun fichier"
--- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Sun May 27 18:37:23 2012 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-05-24 09:24-0300\n" +"POT-Creation-Date: 2012-05-27 17:41+0200\n" "PO-Revision-Date: 2012-05-22 16:47-0300\n" "Last-Translator: Augusto Herrmann <augusto.herrmann@gmail.com>\n" "Language-Team: pt_BR <LL@li.org>\n" @@ -640,7 +640,7 @@ msgstr "Você precisa estar logado para ver essa página" #: rhodecode/lib/diffs.py:78 -msgid "Changeset was to big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Conjunto de mudanças é grande demais e foi cortado, use o menu de " "diferenças para ver as diferenças" @@ -649,98 +649,98 @@ msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: rhodecode/lib/helpers.py:414 +#: rhodecode/lib/helpers.py:415 msgid "True" msgstr "Verdadeiro" -#: rhodecode/lib/helpers.py:418 +#: rhodecode/lib/helpers.py:419 msgid "False" msgstr "Falso" -#: rhodecode/lib/helpers.py:462 +#: rhodecode/lib/helpers.py:463 msgid "Changeset not found" msgstr "Conjunto de alterações não encontrado" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: rhodecode/lib/helpers.py:491 +#: rhodecode/lib/helpers.py:492 msgid "compare view" msgstr "comparar exibir" -#: rhodecode/lib/helpers.py:511 +#: rhodecode/lib/helpers.py:512 msgid "and" msgstr "e" -#: rhodecode/lib/helpers.py:512 +#: rhodecode/lib/helpers.py:513 #, python-format msgid "%s more" msgstr "%s mais" -#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "revisões" -#: rhodecode/lib/helpers.py:536 +#: rhodecode/lib/helpers.py:537 msgid "fork name " msgstr "nome da bifurcação" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:540 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:541 rhodecode/lib/helpers.py:546 msgid "[created] repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:541 +#: rhodecode/lib/helpers.py:542 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:544 rhodecode/lib/helpers.py:548 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: rhodecode/lib/helpers.py:544 +#: rhodecode/lib/helpers.py:545 msgid "[delete] repository" msgstr "[excluir] repositório" -#: rhodecode/lib/helpers.py:548 +#: rhodecode/lib/helpers.py:549 msgid "[pushed] into" msgstr "[realizado push] para" -#: rhodecode/lib/helpers.py:549 +#: rhodecode/lib/helpers.py:550 msgid "[committed via RhodeCode] into" msgstr "[realizado commit via RhodeCode] para" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:551 msgid "[pulled from remote] into" msgstr "[realizado pull remoto] para" -#: rhodecode/lib/helpers.py:551 +#: rhodecode/lib/helpers.py:552 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: rhodecode/lib/helpers.py:552 +#: rhodecode/lib/helpers.py:553 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: rhodecode/lib/helpers.py:553 +#: rhodecode/lib/helpers.py:554 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/helpers.py:731 +#: rhodecode/lib/helpers.py:732 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:735 +#: rhodecode/lib/helpers.py:736 msgid "No Files" msgstr "Nenhum Arquivo"
--- a/rhodecode/i18n/rhodecode.pot Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/i18n/rhodecode.pot Sun May 27 18:37:23 2012 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.4.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-05-24 22:18+0200\n" +"POT-Creation-Date: 2012-05-27 17:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -612,105 +612,105 @@ msgstr "" #: rhodecode/lib/diffs.py:78 -msgid "Changeset was to big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" #: rhodecode/lib/diffs.py:88 msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:414 +#: rhodecode/lib/helpers.py:415 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:418 +#: rhodecode/lib/helpers.py:419 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:462 +#: rhodecode/lib/helpers.py:463 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:491 +#: rhodecode/lib/helpers.py:492 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:511 -msgid "and" -msgstr "" - #: rhodecode/lib/helpers.py:512 +msgid "and" +msgstr "" + +#: rhodecode/lib/helpers.py:513 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:536 +#: rhodecode/lib/helpers.py:537 msgid "fork name " msgstr "" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:540 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:541 rhodecode/lib/helpers.py:546 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:541 +#: rhodecode/lib/helpers.py:542 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 -msgid "[forked] repository" -msgstr "" - #: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 +msgid "[forked] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:544 rhodecode/lib/helpers.py:548 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:544 +#: rhodecode/lib/helpers.py:545 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:548 -msgid "[pushed] into" -msgstr "" - #: rhodecode/lib/helpers.py:549 -msgid "[committed via RhodeCode] into" +msgid "[pushed] into" msgstr "" #: rhodecode/lib/helpers.py:550 -msgid "[pulled from remote] into" +msgid "[committed via RhodeCode] into" msgstr "" #: rhodecode/lib/helpers.py:551 -msgid "[pulled] from" +msgid "[pulled from remote] into" msgstr "" #: rhodecode/lib/helpers.py:552 -msgid "[started following] repository" +msgid "[pulled] from" msgstr "" #: rhodecode/lib/helpers.py:553 +msgid "[started following] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:554 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:731 +#: rhodecode/lib/helpers.py:732 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:735 +#: rhodecode/lib/helpers.py:736 msgid "No Files" msgstr ""
--- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Sun May 27 18:37:23 2012 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-05-24 22:18+0200\n" +"POT-Creation-Date: 2012-05-27 17:41+0200\n" "PO-Revision-Date: 2012-04-05 17:37+0800\n" "Last-Translator: mikespook <mikespook@gmail.com>\n" "Language-Team: mikespook\n" @@ -19,7 +19,6 @@ #: rhodecode/controllers/changelog.py:96 #, fuzzy -#| msgid "branches" msgid "All Branches" msgstr "分支" @@ -33,7 +32,6 @@ #: rhodecode/controllers/changeset.py:153 #, fuzzy, python-format -#| msgid "File contents" msgid "%s line context" msgstr "文件内容" @@ -85,7 +83,6 @@ #: rhodecode/controllers/files.py:87 #, fuzzy, python-format -#| msgid "There are no files yet" msgid "There are no files yet %s" msgstr "尚无文件" @@ -109,19 +106,16 @@ #: rhodecode/controllers/files.py:288 #, fuzzy, python-format -#| msgid "Edited %s via RhodeCode" msgid "Added %s via RhodeCode" msgstr "通过 RhodeCode 修改了 %s" #: rhodecode/controllers/files.py:302 #, fuzzy -#| msgid "File contents" msgid "No content" msgstr "文件内容" #: rhodecode/controllers/files.py:306 #, fuzzy -#| msgid "File names" msgid "No filename" msgstr "文件名" @@ -454,13 +448,11 @@ #: rhodecode/controllers/admin/repos.py:407 #, fuzzy, python-format -#| msgid "created repository %s from %s" msgid "Marked repo %s as fork of %s" msgstr "新版本库 %s 基于 %s 建立。" #: rhodecode/controllers/admin/repos.py:411 #, fuzzy -#| msgid "An error occurred during this search operation" msgid "An error occurred during this operation" msgstr "在搜索操作中发生异常" @@ -506,7 +498,6 @@ #: rhodecode/controllers/admin/repos_groups.py:240 #, fuzzy -#| msgid "An error occurred during this search operation" msgid "An error occurred during deletion of group user" msgstr "在搜索操作中发生异常" @@ -639,161 +630,149 @@ msgstr "必须登录才能访问该页面" #: rhodecode/lib/diffs.py:78 -#, fuzzy -#| msgid "Changeset is to big and was cut off, see raw changeset instead" -msgid "Changeset was to big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "变更集因过大而被截断,可查看原始变更集作为替代" #: rhodecode/lib/diffs.py:88 #, fuzzy -#| msgid "No changesets yet" msgid "No changes detected" msgstr "尚无修订" -#: rhodecode/lib/helpers.py:414 +#: rhodecode/lib/helpers.py:415 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:418 +#: rhodecode/lib/helpers.py:419 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:462 +#: rhodecode/lib/helpers.py:463 #, fuzzy -#| msgid "changeset" msgid "Changeset not found" msgstr "修改" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:491 +#: rhodecode/lib/helpers.py:492 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:511 -msgid "and" -msgstr "" - #: rhodecode/lib/helpers.py:512 +msgid "and" +msgstr "" + +#: rhodecode/lib/helpers.py:513 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "修订" -#: rhodecode/lib/helpers.py:536 +#: rhodecode/lib/helpers.py:537 msgid "fork name " msgstr "分支名称" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:540 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:541 rhodecode/lib/helpers.py:546 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:541 -#, fuzzy, python-format -#| msgid "created repository %s" +#: rhodecode/lib/helpers.py:542 +#, fuzzy msgid "[created] repository as fork" msgstr "建立版本库 %s" -#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:544 rhodecode/lib/helpers.py:548 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:544 +#: rhodecode/lib/helpers.py:545 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:548 -msgid "[pushed] into" -msgstr "" - #: rhodecode/lib/helpers.py:549 -msgid "[committed via RhodeCode] into" +msgid "[pushed] into" msgstr "" #: rhodecode/lib/helpers.py:550 -msgid "[pulled from remote] into" +msgid "[committed via RhodeCode] into" msgstr "" #: rhodecode/lib/helpers.py:551 -msgid "[pulled] from" +msgid "[pulled from remote] into" msgstr "" #: rhodecode/lib/helpers.py:552 -msgid "[started following] repository" +msgid "[pulled] from" msgstr "" #: rhodecode/lib/helpers.py:553 +msgid "[started following] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:554 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:731 +#: rhodecode/lib/helpers.py:732 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:735 +#: rhodecode/lib/helpers.py:736 msgid "No Files" msgstr "没有文件" #: rhodecode/lib/utils2.py:335 #, fuzzy, python-format -#| msgid "year" msgid "%d year" msgid_plural "%d years" msgstr[0] "年" #: rhodecode/lib/utils2.py:336 #, fuzzy, python-format -#| msgid "month" msgid "%d month" msgid_plural "%d months" msgstr[0] "月" #: rhodecode/lib/utils2.py:337 #, fuzzy, python-format -#| msgid "day" msgid "%d day" msgid_plural "%d days" msgstr[0] "日" #: rhodecode/lib/utils2.py:338 #, fuzzy, python-format -#| msgid "hour" msgid "%d hour" msgid_plural "%d hours" msgstr[0] "时" #: rhodecode/lib/utils2.py:339 #, fuzzy, python-format -#| msgid "minute" msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "分" #: rhodecode/lib/utils2.py:340 #, fuzzy, python-format -#| msgid "second" msgid "%d second" msgid_plural "%d seconds" msgstr[0] "秒" #: rhodecode/lib/utils2.py:355 #, fuzzy, python-format -#| msgid "ago" msgid "%s ago" msgstr "之前" @@ -808,7 +787,6 @@ #: rhodecode/lib/celerylib/tasks.py:269 #, fuzzy -#| msgid "Your password reset link was sent" msgid "password reset link" msgstr "密码重置链接已经发送" @@ -845,8 +823,6 @@ #: rhodecode/model/forms.py:117 #, fuzzy -#| msgid "" "Group name may only contain alphanumeric characters underscores, -#| periods " "or dashes and must begin with alphanumeric character" msgid "" "RepoGroup name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -862,7 +838,6 @@ #: rhodecode/model/forms.py:176 #, fuzzy -#| msgid "This repository already exists" msgid "Repository with this name already exists" msgstr "这个版本库已经存在" @@ -897,7 +872,6 @@ #: rhodecode/model/forms.py:310 #, fuzzy, python-format -#| msgid "This repository already exists in group \"%s\"" msgid "This repository already exists in a group \"%s\"" msgstr "组中已经存在该版本库" @@ -968,7 +942,6 @@ #: rhodecode/model/notification.py:176 #, fuzzy -#| msgid "commit message" msgid "sent message" msgstr "提交信息" @@ -978,13 +951,11 @@ #: rhodecode/model/notification.py:178 #, fuzzy -#| msgid "You have successfully registered into rhodecode" msgid "registered in RhodeCode" msgstr "成功注册到 rhodecode" #: rhodecode/model/user.py:235 #, fuzzy -#| msgid "[RhodeCode] New User registration" msgid "new user registration" msgstr "[RhodeCode] 新用户注册" @@ -998,8 +969,6 @@ #: rhodecode/model/user.py:306 #, fuzzy, python-format -#| msgid "" "This user still owns %s repositories and cannot be removed. Switch -#| owners" " or remove those repositories" msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" @@ -1131,7 +1100,6 @@ #: rhodecode/templates/index_base.html:130 #, fuzzy -#| msgid "group name" msgid "Group Name" msgstr "组名" @@ -1160,7 +1128,6 @@ #: rhodecode/templates/index_base.html:159 #: rhodecode/templates/admin/repos/repos.html:85 #, fuzzy -#| msgid "Last change" msgid "Last Change" msgstr "最后修改" @@ -1192,7 +1159,6 @@ #: rhodecode/templates/journal/journal.html:206 #: rhodecode/templates/tags/tags.html:64 #, fuzzy -#| msgid "Loading file list..." msgid "Loading..." msgstr "加载文件列表..." @@ -1223,7 +1189,6 @@ #: rhodecode/templates/login.html:50 #, fuzzy -#| msgid "member" msgid "Remember me" msgstr "成员" @@ -1337,7 +1302,6 @@ #: rhodecode/templates/switch_to_list.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:32 #, fuzzy -#| msgid "There are no forks yet" msgid "There are no bookmarks yet" msgstr "尚未有任何分支" @@ -1471,20 +1435,17 @@ #: rhodecode/templates/admin/notifications/notifications_data.html:38 #, fuzzy -#| msgid "No actions yet" msgid "No notifications here yet" msgstr "尚无操作" #: rhodecode/templates/admin/notifications/show_notification.html:5 #: rhodecode/templates/admin/notifications/show_notification.html:11 #, fuzzy -#| msgid "show annotation" msgid "Show notification" msgstr "显示注释" #: rhodecode/templates/admin/notifications/show_notification.html:9 #, fuzzy -#| msgid "Location" msgid "Notifications" msgstr "位置" @@ -1582,7 +1543,6 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:42 #, fuzzy -#| msgid "Repository creation" msgid "Type of repository to create." msgstr "建立版本库" @@ -1643,8 +1603,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:108 -#, fuzzy, python-format -#| msgid "Changes on %s repository" +#, fuzzy msgid "Change owner of this repository." msgstr "%s 库的修改" @@ -1825,7 +1784,6 @@ #: rhodecode/templates/admin/repos/repos.html:68 #: rhodecode/templates/admin/users/user_edit_my_account.html:158 #, fuzzy, python-format -#| msgid "Confirm to delete this repository" msgid "Confirm to delete this repository: %s" msgstr "确认删除版本库" @@ -1893,7 +1851,6 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 #, fuzzy -#| msgid "Number of repositories" msgid "Number of toplevel repositories" msgstr "版本库数量" @@ -1905,7 +1862,6 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #, fuzzy, python-format -#| msgid "Confirm to delete this group" msgid "Confirm to delete this group: %s" msgstr "确认删除该组" @@ -2058,13 +2014,11 @@ #: rhodecode/templates/admin/settings/settings.html:199 #, fuzzy -#| msgid "Email" msgid "Email to" msgstr "电子邮件" #: rhodecode/templates/admin/settings/settings.html:207 #, fuzzy -#| msgid "second" msgid "Send" msgstr "秒" @@ -2074,7 +2028,6 @@ #: rhodecode/templates/admin/settings/settings.html:216 #, fuzzy -#| msgid "Show" msgid "show" msgstr "显示" @@ -2094,7 +2047,6 @@ #: rhodecode/templates/admin/users/user_add.html:50 #, fuzzy -#| msgid "Passwords do not match" msgid "Password confirmation" msgstr "密码不符" @@ -2155,20 +2107,17 @@ #: rhodecode/templates/admin/users/user_edit_my_account.html:116 #: rhodecode/templates/journal/journal.html:32 #, fuzzy -#| msgid "Empty repository" msgid "My repos" msgstr "空版本库" #: rhodecode/templates/admin/users/user_edit_my_account.html:116 #, fuzzy -#| msgid "permissions" msgid "My permissions" msgstr "权限" #: rhodecode/templates/admin/users/user_edit_my_account.html:121 #: rhodecode/templates/journal/journal.html:37 #, fuzzy -#| msgid "add" msgid "ADD" msgstr "新增" @@ -2200,7 +2149,6 @@ #: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/user_edit_my_account.html:285 #, fuzzy -#| msgid "permissions" msgid "Permission" msgstr "权限" @@ -2241,7 +2189,6 @@ #: rhodecode/templates/admin/users/users.html:56 #, fuzzy, python-format -#| msgid "Confirm to delete this user" msgid "Confirm to delete this user: %s" msgstr "确认删除该用户" @@ -2288,7 +2235,6 @@ #: rhodecode/templates/admin/users_groups/users_group_edit.html:126 #, fuzzy -#| msgid "Choosen group members" msgid "Group members" msgstr "选择组成员" @@ -2306,7 +2252,6 @@ #: rhodecode/templates/admin/users_groups/users_groups.html:45 #, fuzzy, python-format -#| msgid "Confirm to delete this group" msgid "Confirm to delete this users group: %s" msgstr "确认删除该组" @@ -2324,7 +2269,6 @@ #: rhodecode/templates/base/base.html:107 #, fuzzy -#| msgid "Login" msgid "Log In" msgstr "登录" @@ -2468,7 +2412,6 @@ #: rhodecode/templates/base/root.html:53 #, fuzzy -#| msgid "Add another member" msgid "add another comment" msgstr "添加成员" @@ -2493,7 +2436,6 @@ #: rhodecode/templates/tags/tags.html:39 #: rhodecode/templates/tags/tags_data.html:8 #, fuzzy -#| msgid "author" msgid "Author" msgstr "作者" @@ -2614,7 +2556,6 @@ #: rhodecode/templates/changeset/changeset.html:42 #: rhodecode/templates/changeset/changeset_file_comment.html:69 #, fuzzy, python-format -#| msgid "commit" msgid "%d comment" msgid_plural "%d comments" msgstr[0] "提交" @@ -2657,7 +2598,6 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:47 #: rhodecode/templates/changeset/changeset_file_comment.html:107 #, fuzzy -#| msgid "commit" msgid "Comment" msgstr "提交" @@ -2668,7 +2608,6 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:55 #, fuzzy -#| msgid "You need to be a signed in to view this page" msgid "You need to be logged in to comment." msgstr "必须登录才能访问该页面" @@ -2694,7 +2633,6 @@ #: rhodecode/templates/changeset/diff_block.html:27 #, fuzzy -#| msgid "File contents" msgid "show inline comments" msgstr "文件内容" @@ -2767,39 +2705,33 @@ #: rhodecode/templates/files/files_add.html:19 #, fuzzy -#| msgid "edit file" msgid "add file" msgstr "编辑文件" #: rhodecode/templates/files/files_add.html:40 #, fuzzy -#| msgid "add new user" msgid "Add new file" msgstr "添加新用户" #: rhodecode/templates/files/files_add.html:45 #, fuzzy -#| msgid "File names" msgid "File Name" msgstr "文件名" #: rhodecode/templates/files/files_add.html:49 #: rhodecode/templates/files/files_add.html:58 #, fuzzy -#| msgid "hour" msgid "or" msgstr "时" #: rhodecode/templates/files/files_add.html:49 #: rhodecode/templates/files/files_add.html:54 #, fuzzy -#| msgid "edit file" msgid "Upload file" msgstr "编辑文件" #: rhodecode/templates/files/files_add.html:58 -#, fuzzy, python-format -#| msgid "created user %s" +#, fuzzy msgid "Create new file" msgstr "创建用户 %s" @@ -2847,7 +2779,6 @@ #: rhodecode/templates/files/files_browser.html:31 #: rhodecode/templates/shortlog/shortlog_data.html:65 #, fuzzy -#| msgid "add new user" msgid "add new file" msgstr "添加新用户" @@ -2865,7 +2796,6 @@ #: rhodecode/templates/files/files_browser.html:50 #, fuzzy -#| msgid "next revision" msgid "Last Revision" msgstr "下一个修订" @@ -2899,13 +2829,11 @@ #: rhodecode/templates/files/files_edit.html:54 #, fuzzy -#| msgid "show source" msgid "source" msgstr "显示代码" #: rhodecode/templates/files/files_edit.html:59 #, fuzzy -#| msgid "edit file" msgid "Editing file" msgstr "编辑文件" @@ -2932,7 +2860,6 @@ #: rhodecode/templates/files/files_ypjax.html:5 #, fuzzy -#| msgid "show annotation" msgid "annotation" msgstr "显示注释" @@ -2962,7 +2889,6 @@ #: rhodecode/templates/forks/fork.html:65 #, fuzzy -#| msgid "permissions" msgid "Copy permissions" msgstr "权限" @@ -2992,7 +2918,6 @@ #: rhodecode/templates/journal/journal.html:32 #, fuzzy -#| msgid "Cache" msgid "Watched" msgstr "缓存" @@ -3062,7 +2987,6 @@ #: rhodecode/templates/shortlog/shortlog_data.html:18 #, fuzzy -#| msgid "commit message" msgid "No commit message" msgstr "提交信息" @@ -3076,7 +3000,6 @@ #: rhodecode/templates/shortlog/shortlog_data.html:79 #, fuzzy -#| msgid "Git repository" msgid "Existing repository?" msgstr "Git 版本库" @@ -3087,13 +3010,11 @@ #: rhodecode/templates/summary/summary.html:44 #: rhodecode/templates/summary/summary.html:47 #, fuzzy -#| msgid "author" msgid "ATOM" msgstr "作者" #: rhodecode/templates/summary/summary.html:77 #, fuzzy, python-format -#| msgid "No changes" msgid "Non changable ID %s" msgstr "无变更" @@ -3119,7 +3040,6 @@ #: rhodecode/templates/summary/summary.html:133 #, fuzzy -#| msgid "edit file" msgid "Trending files" msgstr "编辑文件" @@ -3159,7 +3079,6 @@ #: rhodecode/templates/summary/summary.html:211 #, fuzzy -#| msgid "quick filter..." msgid "Quick start" msgstr "快速过滤..." @@ -3200,57 +3119,3 @@ msgid "file removed" msgstr "文件已删除" -#~ msgid "Diff is to big and was cut off, see raw diff instead" -#~ msgstr "差异比较因过大而被截断,可查看原始差异比较作为替代" - -#~ msgid "Binary file" -#~ msgstr "二进制文件" - -#~ msgid "ADD NEW REPOSITORY" -#~ msgstr "新增版本库" - -#~ msgid "Percentage of stats gathered" -#~ msgstr "" - -#~ msgid "My repositories" -#~ msgstr "我的版本库" - -#~ msgid "links" -#~ msgstr "连接" - -#~ msgid "showing " -#~ msgstr "" - -#~ msgid "out of" -#~ msgstr "" - -#~ msgid "%s files affected with %s additions and %s deletions." -#~ msgstr "" - -#~ msgid "No changes in this file" -#~ msgstr "没有任何修改" - -#~ msgid "Diff is to big to display" -#~ msgstr "" - -#~ msgid "File annotate" -#~ msgstr "文件注释" - -#~ msgid "annotate" -#~ msgstr "注释" - -#~ msgid "Following" -#~ msgstr "跟随中" - -#~ msgid "by" -#~ msgstr "" - -#~ msgid "Trending source files" -#~ msgstr "" - -#~ msgid "Feeds" -#~ msgstr "订阅" - -#~ msgid "Loaded in" -#~ msgstr "" -
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Sun May 27 18:37:23 2012 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-05-24 22:18+0200\n" +"POT-Creation-Date: 2012-05-27 17:41+0200\n" "PO-Revision-Date: 2012-05-09 22:23+0800\n" "Last-Translator: Nansen <nansenat16@gmail.com>\n" "Language-Team: zh_TW <LL@li.org>\n" @@ -19,7 +19,6 @@ #: rhodecode/controllers/changelog.py:96 #, fuzzy -#| msgid "branches" msgid "All Branches" msgstr "分支" @@ -33,7 +32,6 @@ #: rhodecode/controllers/changeset.py:153 #, fuzzy, python-format -#| msgid "File contents" msgid "%s line context" msgstr "文件內容" @@ -85,7 +83,6 @@ #: rhodecode/controllers/files.py:87 #, fuzzy, python-format -#| msgid "There are no files yet" msgid "There are no files yet %s" msgstr "尚未有任何檔案" @@ -109,19 +106,16 @@ #: rhodecode/controllers/files.py:288 #, fuzzy, python-format -#| msgid "Edited %s via RhodeCode" msgid "Added %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" #: rhodecode/controllers/files.py:302 #, fuzzy -#| msgid "File contents" msgid "No content" msgstr "文件內容" #: rhodecode/controllers/files.py:306 #, fuzzy -#| msgid "File names" msgid "No filename" msgstr "檔案名稱" @@ -454,7 +448,6 @@ #: rhodecode/controllers/admin/repos.py:407 #, fuzzy, python-format -#| msgid "created repository %s from %s" msgid "Marked repo %s as fork of %s" msgstr "建立版本庫 %s 到 %s" @@ -635,159 +628,148 @@ msgstr "您必須登入後才能瀏覽這個頁面" #: rhodecode/lib/diffs.py:78 -msgid "Changeset was to big and was cut off, use diff menu to display this diff" +msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" #: rhodecode/lib/diffs.py:88 -#, fuzzy -#| msgid "No changesets yet" msgid "No changes detected" msgstr "尚未有任何變更" -#: rhodecode/lib/helpers.py:414 +#: rhodecode/lib/helpers.py:415 msgid "True" msgstr "真" -#: rhodecode/lib/helpers.py:418 +#: rhodecode/lib/helpers.py:419 msgid "False" msgstr "假" -#: rhodecode/lib/helpers.py:462 +#: rhodecode/lib/helpers.py:463 #, fuzzy -#| msgid "changeset" msgid "Changeset not found" msgstr "修改" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:491 +#: rhodecode/lib/helpers.py:492 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:511 +#: rhodecode/lib/helpers.py:512 msgid "and" msgstr "和" -#: rhodecode/lib/helpers.py:512 +#: rhodecode/lib/helpers.py:513 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:513 rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40 msgid "revisions" msgstr "修訂" -#: rhodecode/lib/helpers.py:536 +#: rhodecode/lib/helpers.py:537 msgid "fork name " msgstr "fork 名稱" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:540 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:540 rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:541 rhodecode/lib/helpers.py:546 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:541 -#, fuzzy, python-format -#| msgid "created repository %s" +#: rhodecode/lib/helpers.py:542 +#, fuzzy msgid "[created] repository as fork" msgstr "建立版本庫 %s" -#: rhodecode/lib/helpers.py:542 rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:544 rhodecode/lib/helpers.py:548 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:544 +#: rhodecode/lib/helpers.py:545 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:548 -msgid "[pushed] into" -msgstr "" - #: rhodecode/lib/helpers.py:549 -msgid "[committed via RhodeCode] into" +msgid "[pushed] into" msgstr "" #: rhodecode/lib/helpers.py:550 -msgid "[pulled from remote] into" +msgid "[committed via RhodeCode] into" msgstr "" #: rhodecode/lib/helpers.py:551 -msgid "[pulled] from" +msgid "[pulled from remote] into" msgstr "" #: rhodecode/lib/helpers.py:552 -msgid "[started following] repository" +msgid "[pulled] from" msgstr "" #: rhodecode/lib/helpers.py:553 +msgid "[started following] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:554 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:731 +#: rhodecode/lib/helpers.py:732 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:735 +#: rhodecode/lib/helpers.py:736 msgid "No Files" msgstr "沒有檔案" #: rhodecode/lib/utils2.py:335 #, fuzzy, python-format -#| msgid "year" msgid "%d year" msgid_plural "%d years" msgstr[0] "年" #: rhodecode/lib/utils2.py:336 #, fuzzy, python-format -#| msgid "month" msgid "%d month" msgid_plural "%d months" msgstr[0] "月" #: rhodecode/lib/utils2.py:337 #, fuzzy, python-format -#| msgid "day" msgid "%d day" msgid_plural "%d days" msgstr[0] "日" #: rhodecode/lib/utils2.py:338 #, fuzzy, python-format -#| msgid "hour" msgid "%d hour" msgid_plural "%d hours" msgstr[0] "時" #: rhodecode/lib/utils2.py:339 #, fuzzy, python-format -#| msgid "minute" msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "分" #: rhodecode/lib/utils2.py:340 #, fuzzy, python-format -#| msgid "second" msgid "%d second" msgid_plural "%d seconds" msgstr[0] "秒" #: rhodecode/lib/utils2.py:355 #, fuzzy, python-format -#| msgid "ago" msgid "%s ago" msgstr "之前" @@ -802,7 +784,6 @@ #: rhodecode/lib/celerylib/tasks.py:269 #, fuzzy -#| msgid "Your password reset link was sent" msgid "password reset link" msgstr "您的密碼重設連結已寄出" @@ -839,8 +820,6 @@ #: rhodecode/model/forms.py:117 #, fuzzy -#| msgid "" "Group name may only contain alphanumeric characters underscores, -#| periods " "or dashes and must begin with alphanumeric character" msgid "" "RepoGroup name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -856,7 +835,6 @@ #: rhodecode/model/forms.py:176 #, fuzzy -#| msgid "This repository already exists" msgid "Repository with this name already exists" msgstr "這個版本庫已經存在" @@ -891,7 +869,6 @@ #: rhodecode/model/forms.py:310 #, fuzzy, python-format -#| msgid "This repository already exists in group \"%s\"" msgid "This repository already exists in a group \"%s\"" msgstr "這個版本庫已存在於群組 \"%s\"" @@ -962,7 +939,6 @@ #: rhodecode/model/notification.py:176 #, fuzzy -#| msgid "commit message" msgid "sent message" msgstr "遞交資訊" @@ -972,13 +948,11 @@ #: rhodecode/model/notification.py:178 #, fuzzy -#| msgid "You have successfully registered into rhodecode" msgid "registered in RhodeCode" msgstr "您已經成功註冊rhodecode" #: rhodecode/model/user.py:235 #, fuzzy -#| msgid "[RhodeCode] New User registration" msgid "new user registration" msgstr "[RhodeCode] 新使用者註冊" @@ -992,8 +966,6 @@ #: rhodecode/model/user.py:306 #, fuzzy, python-format -#| msgid "" "This user still owns %s repositories and cannot be removed. Switch -#| owners" " or remove those repositories" msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" @@ -1125,7 +1097,6 @@ #: rhodecode/templates/index_base.html:130 #, fuzzy -#| msgid "group name" msgid "Group Name" msgstr "群組名稱" @@ -1154,7 +1125,6 @@ #: rhodecode/templates/index_base.html:159 #: rhodecode/templates/admin/repos/repos.html:85 #, fuzzy -#| msgid "Last change" msgid "Last Change" msgstr "最後修改" @@ -1186,7 +1156,6 @@ #: rhodecode/templates/journal/journal.html:206 #: rhodecode/templates/tags/tags.html:64 #, fuzzy -#| msgid "loading..." msgid "Loading..." msgstr "載入中..." @@ -1217,7 +1186,6 @@ #: rhodecode/templates/login.html:50 #, fuzzy -#| msgid "member" msgid "Remember me" msgstr "成員" @@ -1331,7 +1299,6 @@ #: rhodecode/templates/switch_to_list.html:35 #: rhodecode/templates/bookmarks/bookmarks_data.html:32 #, fuzzy -#| msgid "There are no forks yet" msgid "There are no bookmarks yet" msgstr "尚未有任何 fork" @@ -1470,13 +1437,11 @@ #: rhodecode/templates/admin/notifications/show_notification.html:5 #: rhodecode/templates/admin/notifications/show_notification.html:11 #, fuzzy -#| msgid "show annotation" msgid "Show notification" msgstr "險是註釋" #: rhodecode/templates/admin/notifications/show_notification.html:9 #, fuzzy -#| msgid "Location" msgid "Notifications" msgstr "位置" @@ -1574,7 +1539,6 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:42 #, fuzzy -#| msgid "Repository creation" msgid "Type of repository to create." msgstr "版本庫建立" @@ -1635,8 +1599,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:108 -#, fuzzy, python-format -#| msgid "Changes on %s repository" +#, fuzzy msgid "Change owner of this repository." msgstr "修改於版本庫 %s" @@ -1817,7 +1780,6 @@ #: rhodecode/templates/admin/repos/repos.html:68 #: rhodecode/templates/admin/users/user_edit_my_account.html:158 #, fuzzy, python-format -#| msgid "Confirm to delete this repository" msgid "Confirm to delete this repository: %s" msgstr "確認移除這個版本庫" @@ -1885,7 +1847,6 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 #, fuzzy -#| msgid "Number of repositories" msgid "Number of toplevel repositories" msgstr "版本庫數量" @@ -1897,7 +1858,6 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #, fuzzy, python-format -#| msgid "Confirm to delete this group" msgid "Confirm to delete this group: %s" msgstr "確認刪除這個群組" @@ -2050,13 +2010,11 @@ #: rhodecode/templates/admin/settings/settings.html:199 #, fuzzy -#| msgid "Email" msgid "Email to" msgstr "電子郵件" #: rhodecode/templates/admin/settings/settings.html:207 #, fuzzy -#| msgid "second" msgid "Send" msgstr "秒" @@ -2066,7 +2024,6 @@ #: rhodecode/templates/admin/settings/settings.html:216 #, fuzzy -#| msgid "Show" msgid "show" msgstr "顯示" @@ -2086,7 +2043,6 @@ #: rhodecode/templates/admin/users/user_add.html:50 #, fuzzy -#| msgid "Passwords do not match" msgid "Password confirmation" msgstr "密碼不相符" @@ -2147,20 +2103,17 @@ #: rhodecode/templates/admin/users/user_edit_my_account.html:116 #: rhodecode/templates/journal/journal.html:32 #, fuzzy -#| msgid "Empty repository" msgid "My repos" msgstr "空的版本庫" #: rhodecode/templates/admin/users/user_edit_my_account.html:116 #, fuzzy -#| msgid "permissions" msgid "My permissions" msgstr "權限" #: rhodecode/templates/admin/users/user_edit_my_account.html:121 #: rhodecode/templates/journal/journal.html:37 #, fuzzy -#| msgid "add" msgid "ADD" msgstr "新增" @@ -2192,7 +2145,6 @@ #: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/user_edit_my_account.html:285 #, fuzzy -#| msgid "permissions" msgid "Permission" msgstr "權限" @@ -2233,7 +2185,6 @@ #: rhodecode/templates/admin/users/users.html:56 #, fuzzy, python-format -#| msgid "Confirm to delete this user" msgid "Confirm to delete this user: %s" msgstr "確認刪除這個使用者" @@ -2280,7 +2231,6 @@ #: rhodecode/templates/admin/users_groups/users_group_edit.html:126 #, fuzzy -#| msgid "Choosen group members" msgid "Group members" msgstr "選擇群組成員" @@ -2298,7 +2248,6 @@ #: rhodecode/templates/admin/users_groups/users_groups.html:45 #, fuzzy, python-format -#| msgid "Confirm to delete this group" msgid "Confirm to delete this users group: %s" msgstr "確認刪除這個群組" @@ -2316,7 +2265,6 @@ #: rhodecode/templates/base/base.html:107 #, fuzzy -#| msgid "Login" msgid "Log In" msgstr "登入" @@ -2460,7 +2408,6 @@ #: rhodecode/templates/base/root.html:53 #, fuzzy -#| msgid "Add another member" msgid "add another comment" msgstr "新增另ㄧ位成員" @@ -2485,7 +2432,6 @@ #: rhodecode/templates/tags/tags.html:39 #: rhodecode/templates/tags/tags_data.html:8 #, fuzzy -#| msgid "author" msgid "Author" msgstr "作者" @@ -2606,7 +2552,6 @@ #: rhodecode/templates/changeset/changeset.html:42 #: rhodecode/templates/changeset/changeset_file_comment.html:69 #, fuzzy, python-format -#| msgid "commit" msgid "%d comment" msgid_plural "%d comments" msgstr[0] "遞交" @@ -2649,7 +2594,6 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:47 #: rhodecode/templates/changeset/changeset_file_comment.html:107 #, fuzzy -#| msgid "commit" msgid "Comment" msgstr "遞交" @@ -2660,7 +2604,6 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:55 #, fuzzy -#| msgid "You need to be a signed in to view this page" msgid "You need to be logged in to comment." msgstr "您必須登入後才能瀏覽這個頁面" @@ -2686,7 +2629,6 @@ #: rhodecode/templates/changeset/diff_block.html:27 #, fuzzy -#| msgid "File contents" msgid "show inline comments" msgstr "文件內容" @@ -2759,39 +2701,33 @@ #: rhodecode/templates/files/files_add.html:19 #, fuzzy -#| msgid "edit file" msgid "add file" msgstr "編輯檔案" #: rhodecode/templates/files/files_add.html:40 #, fuzzy -#| msgid "add new user" msgid "Add new file" msgstr "新增使用者" #: rhodecode/templates/files/files_add.html:45 #, fuzzy -#| msgid "File names" msgid "File Name" msgstr "檔案名稱" #: rhodecode/templates/files/files_add.html:49 #: rhodecode/templates/files/files_add.html:58 #, fuzzy -#| msgid "hour" msgid "or" msgstr "時" #: rhodecode/templates/files/files_add.html:49 #: rhodecode/templates/files/files_add.html:54 #, fuzzy -#| msgid "edit file" msgid "Upload file" msgstr "編輯檔案" #: rhodecode/templates/files/files_add.html:58 -#, fuzzy, python-format -#| msgid "created user %s" +#, fuzzy msgid "Create new file" msgstr "建立使用者 %s" @@ -2839,7 +2775,6 @@ #: rhodecode/templates/files/files_browser.html:31 #: rhodecode/templates/shortlog/shortlog_data.html:65 #, fuzzy -#| msgid "add new user" msgid "add new file" msgstr "新增使用者" @@ -2857,7 +2792,6 @@ #: rhodecode/templates/files/files_browser.html:50 #, fuzzy -#| msgid "next revision" msgid "Last Revision" msgstr "下一個修訂" @@ -2891,13 +2825,11 @@ #: rhodecode/templates/files/files_edit.html:54 #, fuzzy -#| msgid "show source" msgid "source" msgstr "顯示原始碼" #: rhodecode/templates/files/files_edit.html:59 #, fuzzy -#| msgid "edit file" msgid "Editing file" msgstr "編輯檔案" @@ -2924,7 +2856,6 @@ #: rhodecode/templates/files/files_ypjax.html:5 #, fuzzy -#| msgid "show annotation" msgid "annotation" msgstr "險是註釋" @@ -2954,7 +2885,6 @@ #: rhodecode/templates/forks/fork.html:65 #, fuzzy -#| msgid "permissions" msgid "Copy permissions" msgstr "權限" @@ -2984,7 +2914,6 @@ #: rhodecode/templates/journal/journal.html:32 #, fuzzy -#| msgid "Cache" msgid "Watched" msgstr "快取" @@ -3054,7 +2983,6 @@ #: rhodecode/templates/shortlog/shortlog_data.html:18 #, fuzzy -#| msgid "commit message" msgid "No commit message" msgstr "遞交資訊" @@ -3068,7 +2996,6 @@ #: rhodecode/templates/shortlog/shortlog_data.html:79 #, fuzzy -#| msgid "Git repository" msgid "Existing repository?" msgstr "Git 版本庫" @@ -3079,13 +3006,11 @@ #: rhodecode/templates/summary/summary.html:44 #: rhodecode/templates/summary/summary.html:47 #, fuzzy -#| msgid "author" msgid "ATOM" msgstr "作者" #: rhodecode/templates/summary/summary.html:77 #, fuzzy, python-format -#| msgid "No changes" msgid "Non changable ID %s" msgstr "沒有修改" @@ -3103,7 +3028,6 @@ #: rhodecode/templates/summary/summary.html:124 #, fuzzy -#| msgid "show more" msgid "Show by Name" msgstr "顯示更多" @@ -3113,7 +3037,6 @@ #: rhodecode/templates/summary/summary.html:133 #, fuzzy -#| msgid "edit file" msgid "Trending files" msgstr "編輯檔案" @@ -3153,7 +3076,6 @@ #: rhodecode/templates/summary/summary.html:211 #, fuzzy -#| msgid "quick filter..." msgid "Quick start" msgstr "快速過濾..." @@ -3194,60 +3116,9 @@ msgid "file removed" msgstr "移除檔案" -#~ msgid "Changeset is to big and was cut off, see raw changeset instead" -#~ msgstr "" - -#~ msgid "Diff is to big and was cut off, see raw diff instead" -#~ msgstr "" - -#~ msgid "Binary file" -#~ msgstr "二進位檔" - -#~ msgid "ADD NEW REPOSITORY" -#~ msgstr "新增版本庫" - -#~ msgid "Percentage of stats gathered" -#~ msgstr "" - -#~ msgid "My repositories" -#~ msgstr "我的版本庫" - -#~ msgid "links" -#~ msgstr "連結" - -#~ msgid "showing " -#~ msgstr "" - -#~ msgid "out of" -#~ msgstr "" - -#~ msgid "%s files affected with %s additions and %s deletions." +#~ msgid "" +#~ "Changeset was to big and was cut" +#~ " off, use diff menu to display " +#~ "this diff" #~ msgstr "" -#~ msgid "No changes in this file" -#~ msgstr "這個檔案沒有任何變更" - -#~ msgid "Diff is to big to display" -#~ msgstr "" - -#~ msgid "File annotate" -#~ msgstr "檔案註釋" - -#~ msgid "annotate" -#~ msgstr "註釋" - -#~ msgid "Following" -#~ msgstr "已追蹤" - -#~ msgid "by" -#~ msgstr "" - -#~ msgid "Trending source files" -#~ msgstr "" - -#~ msgid "Feeds" -#~ msgstr "" - -#~ msgid "Loaded in" -#~ msgstr "" -
--- a/rhodecode/lib/celerylib/tasks.py Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/lib/celerylib/tasks.py Sun May 27 18:37:23 2012 +0200 @@ -75,7 +75,7 @@ @dbsession def whoosh_index(repo_location, full_index): from rhodecode.lib.indexers.daemon import WhooshIndexingDaemon - log = whoosh_index.get_logger(whoosh_index) + log = get_logger(whoosh_index) DBS = get_session() index_location = config['index_dir']
--- a/rhodecode/lib/diffs.py Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/lib/diffs.py Sun May 27 18:37:23 2012 +0200 @@ -75,7 +75,7 @@ stats = diff_processor.stat() size = len(diff or '') else: - diff = wrap_to_table(_('Changeset was to big and was cut off, use ' + diff = wrap_to_table(_('Changeset was too big and was cut off, use ' 'diff menu to display this diff')) stats = (0, 0) size = 0
--- a/rhodecode/lib/helpers.py Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/lib/helpers.py Sun May 27 18:37:23 2012 +0200 @@ -45,6 +45,7 @@ from rhodecode.lib.vcs.exceptions import ChangesetDoesNotExistError from rhodecode.lib.vcs.backends.base import BaseChangeset from rhodecode.model.changeset_status import ChangesetStatusModel +from rhodecode.model.db import URL_SEP log = logging.getLogger(__name__) @@ -912,7 +913,8 @@ url = ISSUE_SERVER_LNK.replace('{id}', issue_id) if repository: url = url.replace('{repo}', repository) - + repo_name = repository.split(URL_SEP)[-1] + url = url.replace('{repo_name}', repo_name) return tmpl % { 'pref': pref, 'cls': 'issue-tracker-link',
--- a/rhodecode/model/db.py Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/model/db.py Sun May 27 18:37:23 2012 +0200 @@ -50,7 +50,7 @@ import hashlib from sqlalchemy.exc import DatabaseError - +URL_SEP = '/' log = logging.getLogger(__name__) #============================================================================== @@ -573,7 +573,7 @@ @classmethod def url_sep(cls): - return '/' + return URL_SEP @classmethod def get_by_repo_name(cls, repo_name): @@ -844,7 +844,7 @@ @classmethod def url_sep(cls): - return '/' + return URL_SEP @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
--- a/rhodecode/templates/changelog/changelog.html Fri May 25 18:29:31 2012 +0200 +++ b/rhodecode/templates/changelog/changelog.html Sun May 27 18:37:23 2012 +0200 @@ -56,7 +56,7 @@ <div class="gravatar"> <img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),16)}"/> </div> - <div title="${cs.author}" class="user">${h.person(cs.author)}</div> + <div title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</div> </div> <div class="date">${cs.date}</div> </div>