kallithea Changeset - 8fe7c1024719

Changeset - 8fe7c1024719

Parent rev.

Child rev.

[Not reviewed]

Merge codereview

0 17 0

Marcin Kuzminski - 13 years ago 2012-05-27 18:37:23
marcin@python-works.com

merge with beta

17 files changed with 233 insertions and 572 deletions:

development.ini

docs/api/api.rst

docs/changelog.rst

production.ini

rhodecode/config/deployment.ini_tmpl

rhodecode/controllers/api/api.py

rhodecode/i18n/en/LC_MESSAGES/rhodecode.po

143

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po

rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po

rhodecode/i18n/rhodecode.pot

rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po

167

rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po

163

rhodecode/lib/celerylib/tasks.py

rhodecode/lib/diffs.py

rhodecode/lib/helpers.py

rhodecode/model/db.py

rhodecode/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -43,12 +43,14 @@ host = 0.0.0.0 @@
 port = 5000
 [app:main]
 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
 app_instance_uuid = rc-develop
 cut_off_limit = 256000
 force_https = false
@@ @@ -75,13 +77,14 @@ default_encoding = utf8 @@
 ## default one used here is #<numbers> with a regex passive group for `#`
 ## {id} will be all groups matched from this pattern
 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}
 ## prefix to add to link to indicate it's an url
 ## #314 will be replaced by <issue_prefix><id>

docs/api/api.rst

➞

Show inline comments

@@ @@ -408,12 +408,15 @@ OUTPUT:: @@
     result: None if repository does not exist or
+            {
                 "id" :          "<id>",
                 "repo_name" :   "<reponame>"
                 "type" :        "<type>",
                 "description" : "<description>",
                 "clone_uri" :   "<clone_uri>",
                 "private": :    "<bool>",
                 "created_on" :  "<datetimecreated>",
                 "members" :     [
+                                  {
                                     "type": "user",
                                     "id" :         "<userid>",
                                     "username" :   "<username>",
                                     "firstname":   "<firstname>",
@@ @@ -456,13 +459,16 @@ OUTPUT:: @@
     result: [
+              {
                 "id" :          "<id>",
                 "repo_name" :   "<reponame>"
                 "type" :        "<type>",
                 "description" : "<description>"
                 "description" : "<description>",
                 "clone_uri" :   "<clone_uri>",
                 "private": :    "<bool>",
                 "created_on" :  "<datetimecreated>",
               },
               …
+            ]
     error:  null

docs/changelog.rst

➞

Show inline comments

@@ @@ -11,18 +11,32 @@ Changelog @@
 :branch: beta
 news
 ++++
 - 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.
 .3.6 (**2012-05-17**)
 ----------------------
 news
 ++++

production.ini

➞

Show inline comments

@@ @@ -43,12 +43,14 @@ host = 127.0.0.1 @@
 port = 8001
 [app:main]
 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
 app_instance_uuid = rc-production
 cut_off_limit = 256000
 force_https = false
@@ @@ -75,13 +77,14 @@ default_encoding = utf8 @@
 ## default one used here is #<numbers> with a regex passive group for `#`
 ## {id} will be all groups matched from this pattern
 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}
 ## prefix to add to link to indicate it's an url
 ## #314 will be replaced by <issue_prefix><id>

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -77,13 +77,14 @@ default_encoding = utf8 @@
 ## default one used here is #<numbers> with a regex passive group for `#`
 ## {id} will be all groups matched from this pattern
 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}
 ## prefix to add to link to indicate it's an url
 ## #314 will be replaced by <issue_prefix><id>

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -388,12 +388,15 @@ class ApiController(JSONRPCController): @@
+            )
         return dict(
             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
+        )
     @HasPermissionAnyDecorator('hg.admin')
     def get_repos(self, apiuser):
@@ @@ -401,19 +404,22 @@ class ApiController(JSONRPCController): @@
         Get all repositories
         :param apiuser:
         """
         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
     @HasPermissionAnyDecorator('hg.admin')
     def get_repo_nodes(self, apiuser, repo_name, revision, root_path,

rhodecode/i18n/en/LC_MESSAGES/rhodecode.po

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
 msgid ""
 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"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ @@ -622,111 +622,111 @@ msgstr "" @@
 #: rhodecode/lib/auth.py:538
 msgid "You need to be a signed in to view this page"
 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 ""
 #: rhodecode/lib/utils2.py:335
 #, python-format
 msgid "%d year"
@@ @@ -3067,121 +3067,12 @@ msgid "file changed" @@
 msgstr ""
 #: rhodecode/templates/summary/summary.html:647
 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 ""

rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
 msgid ""
 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"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 #: rhodecode/lib/auth.py:538
 msgid "You need to be a signed in to view this page"
 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."
 #: rhodecode/lib/diffs.py:88
 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"
 #: rhodecode/lib/utils2.py:335
 #, python-format
 msgid "%d year"

rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
 # Augusto Herrmann <augusto.herrmann@gmail.com>, 2012.
+#
 msgid ""
 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"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 #: rhodecode/lib/auth.py:538
 msgid "You need to be a signed in to view this page"
 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"
 #: rhodecode/lib/diffs.py:88
 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"
 #: rhodecode/lib/utils2.py:335
 #, python-format
 msgid "%d year"

rhodecode/i18n/rhodecode.pot

➞

Show inline comments

@@ @@ -5,13 +5,13 @@ @@
+#
 #, fuzzy
 msgid ""
 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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ @@ -609,111 +609,111 @@ msgstr "" @@
 #: rhodecode/lib/auth.py:538
 msgid "You need to be a signed in to view this page"
 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 ""
 #: rhodecode/lib/utils2.py:335
 #, python-format
 msgid "%d year"

rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po

➞

Show inline comments

@@ @@ -4,25 +4,24 @@ @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
 # mikespook <mikespook@gmail.com>, 2012.
 msgid ""
 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"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: rhodecode/controllers/changelog.py:96
 #, fuzzy
 #| msgid "branches"
 msgid "All Branches"
 msgstr "分支"
 #: rhodecode/controllers/changeset.py:79
 msgid "show white space"
 msgstr ""
@@ @@ -30,13 +29,12 @@ msgstr "" @@
 #: rhodecode/controllers/changeset.py:86 rhodecode/controllers/changeset.py:93
 msgid "ignore white space"
 msgstr ""
 #: rhodecode/controllers/changeset.py:153
 #, fuzzy, python-format
 #| msgid "File contents"
 msgid "%s line context"
 msgstr "文件内容"
 #: rhodecode/controllers/changeset.py:320
 #: rhodecode/controllers/changeset.py:335 rhodecode/lib/diffs.py:62
 msgid "binary file"
@@ @@ -82,13 +80,12 @@ msgstr "%s %s 订阅" @@
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
 msgstr "新增"
 #: rhodecode/controllers/files.py:87
 #, fuzzy, python-format
 #| msgid "There are no files yet"
 msgid "There are no files yet %s"
 msgstr "尚无文件"
 #: rhodecode/controllers/files.py:247
 #, python-format
 msgid "Edited %s via RhodeCode"
@@ @@ -106,25 +103,22 @@ msgstr "成功提交到 %s" @@
 #: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322
 msgid "Error occurred during commit"
 msgstr "提交时发生错误"
 #: 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 "文件名"
 #: rhodecode/controllers/files.py:347
 msgid "downloads disabled"
 msgstr "禁止下载"
@@ @@ -451,19 +445,17 @@ msgstr "" @@
 #: rhodecode/controllers/admin/repos.py:405
 msgid "Nothing"
 msgstr ""
 #: 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 "在搜索操作中发生异常"
 #: rhodecode/controllers/admin/repos_groups.py:119
 #, python-format
 msgid "created repos group %s"
@@ @@ -503,13 +495,12 @@ msgstr "" @@
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr ""
 #: 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 "在搜索操作中发生异常"
 #: rhodecode/controllers/admin/repos_groups.py:260
 msgid "An error occurred during deletion of group users groups"
 msgstr ""
@@ @@ -636,167 +627,155 @@ msgstr "必须是注册用户才能进行此操作" @@
 #: rhodecode/lib/auth.py:538
 msgid "You need to be a signed in to view this page"
 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 "之前"
 #: rhodecode/lib/utils2.py:357
 #, python-format
 msgid "%s and %s ago"
@@ @@ -805,13 +784,12 @@ msgstr "" @@
 #: rhodecode/lib/utils2.py:360
 msgid "just now"
 msgstr "现在"
 #: rhodecode/lib/celerylib/tasks.py:269
 #, fuzzy
 #| msgid "Your password reset link was sent"
 msgid "password reset link"
 msgstr "密码重置链接已经发送"
 #: rhodecode/model/comment.py:85
 #, python-format
 msgid "on line %s"
@@ @@ -842,14 +820,12 @@ msgstr "非法的用户组名称" @@
 #: rhodecode/model/forms.py:111
 msgid "This users group already exists"
 msgstr "该用户组名称已经存在"
 #: 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"
 msgstr "只能使用字母、数字、下划线、小数点或减号作为用户组名，且必须由数字或字母开头"
 #: rhodecode/model/forms.py:145
@@ @@ -859,13 +835,12 @@ msgstr "" @@
 #: rhodecode/model/forms.py:164
 msgid "This group already exists"
 msgstr "该组已经存在"
 #: rhodecode/model/forms.py:176
 #, fuzzy
 #| msgid "This repository already exists"
 msgid "Repository with this name already exists"
 msgstr "这个版本库已经存在"
 #: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204
 #: rhodecode/model/forms.py:213
 msgid "Invalid characters in password"
@@ @@ -894,13 +869,12 @@ msgstr "该用户名不合法" @@
 #: rhodecode/model/forms.py:287
 msgid "This repository name is disallowed"
 msgstr "该版本库名称被禁用"
 #: 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 "组中已经存在该版本库"
 #: rhodecode/model/forms.py:317
 #, python-format
 msgid "There is a group with this name already \"%s\""
@@ @@ -965,29 +939,26 @@ msgstr "" @@
 #: rhodecode/model/notification.py:175
 msgid "commented on commit"
 msgstr ""
 #: rhodecode/model/notification.py:176
 #, fuzzy
 #| msgid "commit message"
 msgid "sent message"
 msgstr "提交信息"
 #: rhodecode/model/notification.py:177
 msgid "mentioned you"
 msgstr ""
 #: 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] 新用户注册"
 #: rhodecode/model/user.py:259 rhodecode/model/user.py:279
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法编辑该用户"
@@ @@ -995,14 +966,12 @@ msgstr "由于是系统帐号，无法编辑该用户" @@
 #: rhodecode/model/user.py:300
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法删除该用户"
 #: 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"
 msgstr "由于该用户拥有版本库 %s 因而无法删除，请变更版本库所有者或删除版本库"
 #: rhodecode/templates/index.html:3
@@ @@ -1128,13 +1097,12 @@ msgstr "订阅 rss %s" @@
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "订阅 atom %s"
 #: rhodecode/templates/index_base.html:130
 #, fuzzy
 #| msgid "group name"
 msgid "Group Name"
 msgstr "组名"
 #: rhodecode/templates/index_base.html:148
 #: rhodecode/templates/index_base.html:188
 #: rhodecode/templates/admin/repos/repos.html:112
@@ @@ -1157,13 +1125,12 @@ msgstr "" @@
 msgid "Click to sort descending"
 msgstr ""
 #: rhodecode/templates/index_base.html:159
 #: rhodecode/templates/admin/repos/repos.html:85
 #, fuzzy
 #| msgid "Last change"
 msgid "Last Change"
 msgstr "最后修改"
 #: rhodecode/templates/index_base.html:190
 #: rhodecode/templates/admin/repos/repos.html:114
 #: rhodecode/templates/admin/users/user_edit_my_account.html:272
@@ @@ -1189,13 +1156,12 @@ msgstr "" @@
 #: rhodecode/templates/admin/users/user_edit_my_account.html:274
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:64
 #: rhodecode/templates/journal/journal.html:206
 #: rhodecode/templates/tags/tags.html:64
 #, fuzzy
 #| msgid "Loading file list..."
 msgid "Loading..."
 msgstr "加载文件列表..."
 #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
 msgid "Sign In"
 msgstr "登录"
@@ @@ -1220,13 +1186,12 @@ msgstr "帐号" @@
 #: rhodecode/templates/base/base.html:92
 msgid "Password"
 msgstr "密码"
 #: rhodecode/templates/login.html:50
 #, fuzzy
 #| msgid "member"
 msgid "Remember me"
 msgstr "成员"
 #: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr "忘记了密码？"
@@ @@ -1334,13 +1299,12 @@ msgstr "没有任何标签" @@
 msgid "bookmarks"
 msgstr ""
 #: 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 "尚未有任何分支"
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:9
 msgid "Admin journal"
@@ @@ -1468,26 +1432,23 @@ msgstr "" @@
 #: rhodecode/templates/admin/notifications/notifications.html:29
 msgid "Mark all read"
 msgstr ""
 #: 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 "位置"
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions administration"
 msgstr "权限管理"
@@ @@ -1579,13 +1540,12 @@ msgstr "" @@
 #: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Type"
 msgstr "类型"
 #: rhodecode/templates/admin/repos/repo_add_base.html:42
 #, fuzzy
 #| msgid "Repository creation"
 msgid "Type of repository to create."
 msgstr "建立版本库"
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:70
 #: rhodecode/templates/settings/repo_settings.html:61
@@ @@ -1640,14 +1600,13 @@ msgstr "启用下载" @@
 #: rhodecode/templates/admin/repos/repo_edit.html:98
 msgid "Enable download menu on summary page."
 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 库的修改"
 #: rhodecode/templates/admin/repos/repo_edit.html:134
 msgid "Administration"
 msgstr "管理"
@@ @@ -1822,13 +1781,12 @@ msgstr "联系方式" @@
 msgid "delete"
 msgstr "删除"
 #: 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 "确认删除版本库"
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:8
 msgid "Groups"
 msgstr "组"
@@ @@ -1890,25 +1848,23 @@ msgstr "版本库管理员" @@
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
 msgid "ADD NEW GROUP"
 msgstr "添加组"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
 #, fuzzy
 #| msgid "Number of repositories"
 msgid "Number of toplevel repositories"
 msgstr "版本库数量"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
 #: rhodecode/templates/admin/users/users.html:40
 #: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr "操作"
 #: 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 "确认删除该组"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
 msgid "There are no repositories groups yet"
 msgstr "没有版本库组"
@@ @@ -2055,29 +2011,26 @@ msgstr "解锁" @@
 #: rhodecode/templates/admin/settings/settings.html:191
 msgid "Test Email"
 msgstr ""
 #: 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 "秒"
 #: rhodecode/templates/admin/settings/settings.html:213
 msgid "System Info and Packages"
 msgstr ""
 #: rhodecode/templates/admin/settings/settings.html:216
 #, fuzzy
 #| msgid "Show"
 msgid "show"
 msgstr "显示"
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "添加用户"
@@ @@ -2091,13 +2044,12 @@ msgstr "用户" @@
 #: rhodecode/templates/admin/users/user_add.html:12
 msgid "add new user"
 msgstr "添加新用户"
 #: rhodecode/templates/admin/users/user_add.html:50
 #, fuzzy
 #| msgid "Passwords do not match"
 msgid "Password confirmation"
 msgstr "密码不符"
 #: rhodecode/templates/admin/users/user_add.html:86
 #: rhodecode/templates/admin/users/user_edit.html:113
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
@@ @@ -2152,26 +2104,23 @@ msgstr "我的账户" @@
 msgid "My Account"
 msgstr "我的账户"
 #: 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 "新增"
 #: rhodecode/templates/admin/users/user_edit_my_account.html:134
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
@@ @@ -2197,13 +2146,12 @@ msgstr "没有任何版本库" @@
 msgid "create one now"
 msgstr ""
 #: 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 "权限"
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "用户管理员"
@@ @@ -2238,13 +2186,12 @@ msgstr "启用" @@
 #: rhodecode/templates/base/base.html:223
 msgid "ldap"
 msgstr ""
 #: rhodecode/templates/admin/users/users.html:56
 #, fuzzy, python-format
 #| msgid "Confirm to delete this user"
 msgid "Confirm to delete this user: %s"
 msgstr "确认删除该用户"
 #: rhodecode/templates/admin/users_groups/users_group_add.html:5
 msgid "Add users group"
 msgstr "添加用户组"
@@ @@ -2285,13 +2232,12 @@ msgstr "启用成员" @@
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
 msgid "Add all elements"
 msgstr "添加全部项目"
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:126
 #, fuzzy
 #| msgid "Choosen group members"
 msgid "Group members"
 msgstr "选择组成员"
 #: rhodecode/templates/admin/users_groups/users_groups.html:5
 msgid "Users groups administration"
 msgstr "用户组管理"
@@ @@ -2303,13 +2249,12 @@ msgstr "添加新用户组" @@
 #: rhodecode/templates/admin/users_groups/users_groups.html:32
 msgid "group name"
 msgstr "组名"
 #: 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 "确认删除该组"
 #: rhodecode/templates/base/base.html:41
 msgid "Submit a bug"
 msgstr "提交 bug"
@@ @@ -2321,13 +2266,12 @@ msgstr "" @@
 #: rhodecode/templates/base/base.html:100
 msgid "Forgot password ?"
 msgstr "忘记密码？"
 #: rhodecode/templates/base/base.html:107
 #, fuzzy
 #| msgid "Login"
 msgid "Log In"
 msgstr "登录"
 #: rhodecode/templates/base/base.html:118
 msgid "Inbox"
 msgstr ""
@@ @@ -2465,13 +2409,12 @@ msgstr "" @@
 #: rhodecode/templates/search/search.html:46
 msgid "Search"
 msgstr "搜索"
 #: rhodecode/templates/base/root.html:53
 #, fuzzy
 #| msgid "Add another member"
 msgid "add another comment"
 msgstr "添加成员"
 #: rhodecode/templates/base/root.html:54
 #: rhodecode/templates/journal/journal.html:111
 #: rhodecode/templates/summary/summary.html:52
@@ @@ -2490,13 +2433,12 @@ msgstr "" @@
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
 #: rhodecode/templates/branches/branches.html:39
 #: rhodecode/templates/tags/tags.html:39
 #: rhodecode/templates/tags/tags_data.html:8
 #, fuzzy
 #| msgid "author"
 msgid "Author"
 msgstr "作者"
 #: rhodecode/templates/branches/branches_data.html:7
 msgid "date"
 msgstr "日期"
@@ @@ -2611,13 +2553,12 @@ msgstr "原始 diff" @@
 msgid "download diff"
 msgstr "下载 diff"
 #: 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] "提交"
 #: rhodecode/templates/changeset/changeset.html:42
 #: rhodecode/templates/changeset/changeset_file_comment.html:69
@@ @@ -2654,24 +2595,22 @@ msgstr "" @@
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 #: rhodecode/templates/changeset/changeset_file_comment.html:47
 #: rhodecode/templates/changeset/changeset_file_comment.html:107
 #, fuzzy
 #| msgid "commit"
 msgid "Comment"
 msgstr "提交"
 #: rhodecode/templates/changeset/changeset_file_comment.html:48
 #: rhodecode/templates/changeset/changeset_file_comment.html:59
 msgid "Hide"
 msgstr ""
 #: 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 "必须登录才能访问该页面"
 #: rhodecode/templates/changeset/changeset_file_comment.html:55
 msgid "Login now"
 msgstr ""
@@ @@ -2691,13 +2630,12 @@ msgstr "" @@
 #: rhodecode/templates/changeset/diff_block.html:19
 msgid "diff"
 msgstr ""
 #: rhodecode/templates/changeset/diff_block.html:27
 #, fuzzy
 #| msgid "File contents"
 msgid "show inline comments"
 msgstr "文件内容"
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 #: rhodecode/templates/data_table/_dt_elements.html:37
@@ @@ -2764,45 +2702,39 @@ msgstr "没有符合的文件" @@
 #: rhodecode/templates/files/files_edit.html:4
 msgid "Edit file"
 msgstr "编辑文件"
 #: 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"
 #: rhodecode/templates/files/files_add.html:63
 #: rhodecode/templates/files/files_edit.html:39
 #: rhodecode/templates/files/files_ypjax.html:3
@@ @@ -2844,13 +2776,12 @@ msgstr "" @@
 msgid "search file list"
 msgstr "搜索文件列表"
 #: rhodecode/templates/files/files_browser.html:31
 #: rhodecode/templates/shortlog/shortlog_data.html:65
 #, fuzzy
 #| msgid "add new user"
 msgid "add new file"
 msgstr "添加新用户"
 #: rhodecode/templates/files/files_browser.html:35
 msgid "Loading file list..."
 msgstr "加载文件列表..."
@@ @@ -2862,13 +2793,12 @@ msgstr "大小" @@
 #: rhodecode/templates/files/files_browser.html:49
 msgid "Mimetype"
 msgstr ""
 #: rhodecode/templates/files/files_browser.html:50
 #, fuzzy
 #| msgid "next revision"
 msgid "Last Revision"
 msgstr "下一个修订"
 #: rhodecode/templates/files/files_browser.html:51
 msgid "Last modified"
 msgstr "最后修改"
@@ @@ -2896,19 +2826,17 @@ msgstr "显示原始文件" @@
 #: rhodecode/templates/files/files_source.html:29
 msgid "download as raw"
 msgstr "下载原始文件"
 #: 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 "编辑文件"
 #: rhodecode/templates/files/files_source.html:2
 msgid "History"
 msgstr "历史"
@@ @@ -2929,13 +2857,12 @@ msgstr "文件过大，不能显示" @@
 #: rhodecode/templates/files/files_source.html:112
 msgid "Selection link"
 msgstr ""
 #: rhodecode/templates/files/files_ypjax.html:5
 #, fuzzy
 #| msgid "show annotation"
 msgid "annotation"
 msgstr "显示注释"
 #: rhodecode/templates/files/files_ypjax.html:15
 msgid "Go back"
 msgstr ""
@@ @@ -2959,13 +2886,12 @@ msgstr "分支名" @@
 #: rhodecode/templates/forks/fork.html:57
 msgid "Private"
 msgstr "私有"
 #: rhodecode/templates/forks/fork.html:65
 #, fuzzy
 #| msgid "permissions"
 msgid "Copy permissions"
 msgstr "权限"
 #: rhodecode/templates/forks/fork.html:73
 msgid "Update after clone"
 msgstr ""
@@ @@ -2989,13 +2915,12 @@ msgstr "尚未有任何分支" @@
 #: rhodecode/templates/journal/journal.html:20
 msgid "Refresh"
 msgstr ""
 #: rhodecode/templates/journal/journal.html:32
 #, fuzzy
 #| msgid "Cache"
 msgid "Watched"
 msgstr "缓存"
 #: rhodecode/templates/journal/journal.html:105
 msgid "following user"
 msgstr "跟随中用户"
@@ @@ -3059,13 +2984,12 @@ msgstr "简短日志" @@
 #: rhodecode/templates/shortlog/shortlog_data.html:7
 msgid "age"
 msgstr ""
 #: rhodecode/templates/shortlog/shortlog_data.html:18
 #, fuzzy
 #| msgid "commit message"
 msgid "No commit message"
 msgstr "提交信息"
 #: rhodecode/templates/shortlog/shortlog_data.html:62
 msgid "Add or upload files directly via RhodeCode"
 msgstr ""
@@ @@ -3073,30 +2997,27 @@ msgstr "" @@
 #: rhodecode/templates/shortlog/shortlog_data.html:71
 msgid "Push new repo"
 msgstr ""
 #: rhodecode/templates/shortlog/shortlog_data.html:79
 #, fuzzy
 #| msgid "Git repository"
 msgid "Existing repository?"
 msgstr "Git 版本库"
 #: rhodecode/templates/summary/summary.html:12
 msgid "summary"
 msgstr "概要"
 #: 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 "无变更"
 #: rhodecode/templates/summary/summary.html:82
 msgid "public"
 msgstr "公共"
@@ @@ -3116,13 +3037,12 @@ msgstr "" @@
 #: rhodecode/templates/summary/summary.html:125
 msgid "Show by ID"
 msgstr ""
 #: rhodecode/templates/summary/summary.html:133
 #, fuzzy
 #| msgid "edit file"
 msgid "Trending files"
 msgstr "编辑文件"
 #: rhodecode/templates/summary/summary.html:141
 #: rhodecode/templates/summary/summary.html:157
 #: rhodecode/templates/summary/summary.html:185
@@ @@ -3156,13 +3076,12 @@ msgstr "" @@
 #: rhodecode/templates/summary/summary.html:188
 msgid "Stats gathered: "
 msgstr ""
 #: rhodecode/templates/summary/summary.html:211
 #, fuzzy
 #| msgid "quick filter..."
 msgid "Quick start"
 msgstr "快速过滤..."
 #: rhodecode/templates/summary/summary.html:281
 #, python-format
 msgid "Download %s as %s"
@@ @@ -3197,60 +3116,6 @@ msgid "file changed" @@
 msgstr "文件已更改"
 #: rhodecode/templates/summary/summary.html:647
 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 ""

rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po

➞

Show inline comments

@@ @@ -4,25 +4,24 @@ @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
 msgid ""
 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"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: rhodecode/controllers/changelog.py:96
 #, fuzzy
 #| msgid "branches"
 msgid "All Branches"
 msgstr "分支"
 #: rhodecode/controllers/changeset.py:79
 msgid "show white space"
 msgstr ""
@@ @@ -30,13 +29,12 @@ msgstr "" @@
 #: rhodecode/controllers/changeset.py:86 rhodecode/controllers/changeset.py:93
 msgid "ignore white space"
 msgstr ""
 #: rhodecode/controllers/changeset.py:153
 #, fuzzy, python-format
 #| msgid "File contents"
 msgid "%s line context"
 msgstr "文件內容"
 #: rhodecode/controllers/changeset.py:320
 #: rhodecode/controllers/changeset.py:335 rhodecode/lib/diffs.py:62
 msgid "binary file"
@@ @@ -82,13 +80,12 @@ msgstr "" @@
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
 msgstr "新增"
 #: rhodecode/controllers/files.py:87
 #, fuzzy, python-format
 #| msgid "There are no files yet"
 msgid "There are no files yet %s"
 msgstr "尚未有任何檔案"
 #: rhodecode/controllers/files.py:247
 #, python-format
 msgid "Edited %s via RhodeCode"
@@ @@ -106,25 +103,22 @@ msgstr "成功遞交至 %s" @@
 #: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322
 msgid "Error occurred during commit"
 msgstr ""
 #: 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 "檔案名稱"
 #: rhodecode/controllers/files.py:347
 msgid "downloads disabled"
 msgstr "下載已關閉"
@@ @@ -451,13 +445,12 @@ msgstr "" @@
 #: rhodecode/controllers/admin/repos.py:405
 msgid "Nothing"
 msgstr ""
 #: 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
 msgid "An error occurred during this operation"
 msgstr ""
 #: rhodecode/lib/auth.py:538
 msgid "You need to be a signed in to view this page"
 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 "之前"
 #: rhodecode/lib/utils2.py:357
 #, python-format
 msgid "%s and %s ago"
@@ @@ -799,13 +781,12 @@ msgstr "" @@
 #: rhodecode/lib/utils2.py:360
 msgid "just now"
 msgstr "現在"
 #: rhodecode/lib/celerylib/tasks.py:269
 #, fuzzy
 #| msgid "Your password reset link was sent"
 msgid "password reset link"
 msgstr "您的密碼重設連結已寄出"
 #: rhodecode/model/comment.py:85
 #, python-format
 msgid "on line %s"
@@ @@ -836,14 +817,12 @@ msgstr "無效的群組名稱" @@
 #: rhodecode/model/forms.py:111
 msgid "This users group already exists"
 msgstr "這個使用者群組已存在"
 #: 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"
 msgstr "群組名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭"
 #: rhodecode/model/forms.py:145
@@ @@ -853,13 +832,12 @@ msgstr "" @@
 #: rhodecode/model/forms.py:164
 msgid "This group already exists"
 msgstr "這個群組已存在"
 #: rhodecode/model/forms.py:176
 #, fuzzy
 #| msgid "This repository already exists"
 msgid "Repository with this name already exists"
 msgstr "這個版本庫已經存在"
 #: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204
 #: rhodecode/model/forms.py:213
 msgid "Invalid characters in password"
@@ @@ -888,13 +866,12 @@ msgstr "無效的使用者名稱" @@
 #: rhodecode/model/forms.py:287
 msgid "This repository name is disallowed"
 msgstr "不允許的版本庫名稱"
 #: 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\""
 #: rhodecode/model/forms.py:317
 #, python-format
 msgid "There is a group with this name already \"%s\""
@@ @@ -959,29 +936,26 @@ msgstr "" @@
 #: rhodecode/model/notification.py:175
 msgid "commented on commit"
 msgstr ""
 #: rhodecode/model/notification.py:176
 #, fuzzy
 #| msgid "commit message"
 msgid "sent message"
 msgstr "遞交資訊"
 #: rhodecode/model/notification.py:177
 msgid "mentioned you"
 msgstr ""
 #: 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] 新使用者註冊"
 #: rhodecode/model/user.py:259 rhodecode/model/user.py:279
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "您無法編輯這個使用者，因為他是系統帳號"
 #: rhodecode/model/user.py:300
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "您無法移除這個使用者，因為他是系統帳號"
 #: 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"
 msgstr "這個使用者擁有 %s 個版本庫所以無法移除，請先變更版本庫擁有者或者刪除版本庫"
 #: rhodecode/templates/index.html:3
@@ @@ -1122,13 +1094,12 @@ msgstr "訂閱 %s rss" @@
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr "訂閱 %s atom"
 #: rhodecode/templates/index_base.html:130
 #, fuzzy
 #| msgid "group name"
 msgid "Group Name"
 msgstr "群組名稱"
 #: rhodecode/templates/index_base.html:148
 #: rhodecode/templates/index_base.html:188
 #: rhodecode/templates/admin/repos/repos.html:112
@@ @@ -1151,13 +1122,12 @@ msgstr "" @@
 msgid "Click to sort descending"
 msgstr ""
 #: rhodecode/templates/index_base.html:159
 #: rhodecode/templates/admin/repos/repos.html:85
 #, fuzzy
 #| msgid "Last change"
 msgid "Last Change"
 msgstr "最後修改"
 #: rhodecode/templates/index_base.html:190
 #: rhodecode/templates/admin/repos/repos.html:114
 #: rhodecode/templates/admin/users/user_edit_my_account.html:272
@@ @@ -1183,13 +1153,12 @@ msgstr "" @@
 #: rhodecode/templates/admin/users/user_edit_my_account.html:274
 #: rhodecode/templates/bookmarks/bookmarks.html:64
 #: rhodecode/templates/branches/branches.html:64
 #: rhodecode/templates/journal/journal.html:206
 #: rhodecode/templates/tags/tags.html:64
 #, fuzzy
 #| msgid "loading..."
 msgid "Loading..."
 msgstr "載入中..."
 #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
 msgid "Sign In"
 msgstr "登入"
@@ @@ -1214,13 +1183,12 @@ msgstr "帳號" @@
 #: rhodecode/templates/base/base.html:92
 msgid "Password"
 msgstr "密碼"
 #: rhodecode/templates/login.html:50
 #, fuzzy
 #| msgid "member"
 msgid "Remember me"
 msgstr "成員"
 #: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr "忘記您的密碼?"
@@ @@ -1328,13 +1296,12 @@ msgstr "沒有任何標籤" @@
 msgid "bookmarks"
 msgstr ""
 #: 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"
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:9
 msgid "Admin journal"
@@ @@ -1467,19 +1434,17 @@ msgstr "" @@
 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 "位置"
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions administration"
 msgstr "權限管理員"
@@ @@ -1571,13 +1536,12 @@ msgstr "" @@
 #: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Type"
 msgstr "類型"
 #: rhodecode/templates/admin/repos/repo_add_base.html:42
 #, fuzzy
 #| msgid "Repository creation"
 msgid "Type of repository to create."
 msgstr "版本庫建立"
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:70
 #: rhodecode/templates/settings/repo_settings.html:61
@@ @@ -1632,14 +1596,13 @@ msgstr "啟用下載" @@
 #: rhodecode/templates/admin/repos/repo_edit.html:98
 msgid "Enable download menu on summary page."
 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"
 #: rhodecode/templates/admin/repos/repo_edit.html:134
 msgid "Administration"
 msgstr "管理者"
@@ @@ -1814,13 +1777,12 @@ msgstr "聯絡方式" @@
 msgid "delete"
 msgstr "刪除"
 #: 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 "確認移除這個版本庫"
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:8
 msgid "Groups"
 msgstr "群組"
@@ @@ -1882,25 +1844,23 @@ msgstr "版本庫群組管理員" @@
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
 msgid "ADD NEW GROUP"
 msgstr "新增群組"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
 #, fuzzy
 #| msgid "Number of repositories"
 msgid "Number of toplevel repositories"
 msgstr "版本庫數量"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
 #: rhodecode/templates/admin/users/users.html:40
 #: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "action"
 msgstr "動作"
 #: 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 "確認刪除這個群組"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
 msgid "There are no repositories groups yet"
 msgstr "沒有任何版本庫群組"
@@ @@ -2047,29 +2007,26 @@ msgstr "解鎖" @@
 #: rhodecode/templates/admin/settings/settings.html:191
 msgid "Test Email"
 msgstr ""
 #: 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 "秒"
 #: rhodecode/templates/admin/settings/settings.html:213
 msgid "System Info and Packages"
 msgstr ""
 #: rhodecode/templates/admin/settings/settings.html:216
 #, fuzzy
 #| msgid "Show"
 msgid "show"
 msgstr "顯示"
 #: rhodecode/templates/admin/users/user_add.html:5
 msgid "Add user"
 msgstr "新增使用者"
@@ @@ -2083,13 +2040,12 @@ msgstr "使用者" @@
 #: rhodecode/templates/admin/users/user_add.html:12
 msgid "add new user"
 msgstr "新增使用者"
 #: rhodecode/templates/admin/users/user_add.html:50
 #, fuzzy
 #| msgid "Passwords do not match"
 msgid "Password confirmation"
 msgstr "密碼不相符"
 #: rhodecode/templates/admin/users/user_add.html:86
 #: rhodecode/templates/admin/users/user_edit.html:113
 #: rhodecode/templates/admin/users_groups/users_group_add.html:41
@@ @@ -2144,26 +2100,23 @@ msgstr "我的帳號" @@
 msgid "My Account"
 msgstr "我的帳號"
 #: 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 "新增"
 #: rhodecode/templates/admin/users/user_edit_my_account.html:134
 #: rhodecode/templates/bookmarks/bookmarks.html:40
 #: rhodecode/templates/bookmarks/bookmarks_data.html:9
@@ @@ -2189,13 +2142,12 @@ msgstr "沒有任何版本庫" @@
 msgid "create one now"
 msgstr ""
 #: 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 "權限"
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr "使用者管理員"
@@ @@ -2230,13 +2182,12 @@ msgstr "啟用" @@
 #: rhodecode/templates/base/base.html:223
 msgid "ldap"
 msgstr ""
 #: rhodecode/templates/admin/users/users.html:56
 #, fuzzy, python-format
 #| msgid "Confirm to delete this user"
 msgid "Confirm to delete this user: %s"
 msgstr "確認刪除這個使用者"
 #: rhodecode/templates/admin/users_groups/users_group_add.html:5
 msgid "Add users group"
 msgstr "新增使用者群組"
@@ @@ -2277,13 +2228,12 @@ msgstr "啟用的成員" @@
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:79
 msgid "Add all elements"
 msgstr "新增索有元素"
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:126
 #, fuzzy
 #| msgid "Choosen group members"
 msgid "Group members"
 msgstr "選擇群組成員"
 #: rhodecode/templates/admin/users_groups/users_groups.html:5
 msgid "Users groups administration"
 msgstr "使用者群組管理員"
@@ @@ -2295,13 +2245,12 @@ msgstr "建立新的使用者群組" @@
 #: rhodecode/templates/admin/users_groups/users_groups.html:32
 msgid "group name"
 msgstr "群組名稱"
 #: 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 "確認刪除這個群組"
 #: rhodecode/templates/base/base.html:41
 msgid "Submit a bug"
 msgstr "回報錯誤"
@@ @@ -2313,13 +2262,12 @@ msgstr "" @@
 #: rhodecode/templates/base/base.html:100
 msgid "Forgot password ?"
 msgstr "忘記密碼?"
 #: rhodecode/templates/base/base.html:107
 #, fuzzy
 #| msgid "Login"
 msgid "Log In"
 msgstr "登入"
 #: rhodecode/templates/base/base.html:118
 msgid "Inbox"
 msgstr ""
@@ @@ -2457,13 +2405,12 @@ msgstr "" @@
 #: rhodecode/templates/search/search.html:46
 msgid "Search"
 msgstr "搜尋"
 #: rhodecode/templates/base/root.html:53
 #, fuzzy
 #| msgid "Add another member"
 msgid "add another comment"
 msgstr "新增另ㄧ位成員"
 #: rhodecode/templates/base/root.html:54
 #: rhodecode/templates/journal/journal.html:111
 #: rhodecode/templates/summary/summary.html:52
@@ @@ -2482,13 +2429,12 @@ msgstr "" @@
 #: rhodecode/templates/bookmarks/bookmarks.html:39
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
 #: rhodecode/templates/branches/branches.html:39
 #: rhodecode/templates/tags/tags.html:39
 #: rhodecode/templates/tags/tags_data.html:8
 #, fuzzy
 #| msgid "author"
 msgid "Author"
 msgstr "作者"
 #: rhodecode/templates/branches/branches_data.html:7
 msgid "date"
 msgstr "日期"
@@ @@ -2603,13 +2549,12 @@ msgstr "原始差異" @@
 msgid "download diff"
 msgstr "下載差異"
 #: 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] "遞交"
 #: rhodecode/templates/changeset/changeset.html:42
 #: rhodecode/templates/changeset/changeset_file_comment.html:69
@@ @@ -2646,24 +2591,22 @@ msgstr "" @@
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 #: rhodecode/templates/changeset/changeset_file_comment.html:47
 #: rhodecode/templates/changeset/changeset_file_comment.html:107
 #, fuzzy
 #| msgid "commit"
 msgid "Comment"
 msgstr "遞交"
 #: rhodecode/templates/changeset/changeset_file_comment.html:48
 #: rhodecode/templates/changeset/changeset_file_comment.html:59
 msgid "Hide"
 msgstr ""
 #: 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 "您必須登入後才能瀏覽這個頁面"
 #: rhodecode/templates/changeset/changeset_file_comment.html:55
 msgid "Login now"
 msgstr ""
@@ @@ -2683,13 +2626,12 @@ msgstr "" @@
 #: rhodecode/templates/changeset/diff_block.html:19
 msgid "diff"
 msgstr "差異"
 #: rhodecode/templates/changeset/diff_block.html:27
 #, fuzzy
 #| msgid "File contents"
 msgid "show inline comments"
 msgstr "文件內容"
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 #: rhodecode/templates/data_table/_dt_elements.html:37
@@ @@ -2756,45 +2698,39 @@ msgstr "無符合的檔案" @@
 #: rhodecode/templates/files/files_edit.html:4
 msgid "Edit file"
 msgstr "編輯檔案"
 #: 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"
 #: rhodecode/templates/files/files_add.html:63
 #: rhodecode/templates/files/files_edit.html:39
 #: rhodecode/templates/files/files_ypjax.html:3
@@ @@ -2836,13 +2772,12 @@ msgstr "" @@
 msgid "search file list"
 msgstr "搜尋檔案列表"
 #: rhodecode/templates/files/files_browser.html:31
 #: rhodecode/templates/shortlog/shortlog_data.html:65
 #, fuzzy
 #| msgid "add new user"
 msgid "add new file"
 msgstr "新增使用者"
 #: rhodecode/templates/files/files_browser.html:35
 msgid "Loading file list..."
 msgstr "載入檔案列表..."
@@ @@ -2854,13 +2789,12 @@ msgstr "大小" @@
 #: rhodecode/templates/files/files_browser.html:49
 msgid "Mimetype"
 msgstr ""
 #: rhodecode/templates/files/files_browser.html:50
 #, fuzzy
 #| msgid "next revision"
 msgid "Last Revision"
 msgstr "下一個修訂"
 #: rhodecode/templates/files/files_browser.html:51
 msgid "Last modified"
 msgstr "最後修改"
@@ @@ -2888,19 +2822,17 @@ msgstr "顯示原始文件" @@
 #: rhodecode/templates/files/files_source.html:29
 msgid "download as raw"
 msgstr "下載原始文件"
 #: 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 "編輯檔案"
 #: rhodecode/templates/files/files_source.html:2
 msgid "History"
 msgstr "歷史"
@@ @@ -2921,13 +2853,12 @@ msgstr "顯示的檔案太大" @@
 #: rhodecode/templates/files/files_source.html:112
 msgid "Selection link"
 msgstr ""
 #: rhodecode/templates/files/files_ypjax.html:5
 #, fuzzy
 #| msgid "show annotation"
 msgid "annotation"
 msgstr "險是註釋"
 #: rhodecode/templates/files/files_ypjax.html:15
 msgid "Go back"
 msgstr ""
@@ @@ -2951,13 +2882,12 @@ msgstr "分支名稱" @@
 #: rhodecode/templates/forks/fork.html:57
 msgid "Private"
 msgstr "私有"
 #: rhodecode/templates/forks/fork.html:65
 #, fuzzy
 #| msgid "permissions"
 msgid "Copy permissions"
 msgstr "權限"
 #: rhodecode/templates/forks/fork.html:73
 msgid "Update after clone"
 msgstr ""
@@ @@ -2981,13 +2911,12 @@ msgstr "尚未有任何 fork" @@
 #: rhodecode/templates/journal/journal.html:20
 msgid "Refresh"
 msgstr ""
 #: rhodecode/templates/journal/journal.html:32
 #, fuzzy
 #| msgid "Cache"
 msgid "Watched"
 msgstr "快取"
 #: rhodecode/templates/journal/journal.html:105
 msgid "following user"
 msgstr "追蹤使用者"
@@ @@ -3051,13 +2980,12 @@ msgstr "簡短紀錄" @@
 #: rhodecode/templates/shortlog/shortlog_data.html:7
 msgid "age"
 msgstr ""
 #: rhodecode/templates/shortlog/shortlog_data.html:18
 #, fuzzy
 #| msgid "commit message"
 msgid "No commit message"
 msgstr "遞交資訊"
 #: rhodecode/templates/shortlog/shortlog_data.html:62
 msgid "Add or upload files directly via RhodeCode"
 msgstr ""
@@ @@ -3065,30 +2993,27 @@ msgstr "" @@
 #: rhodecode/templates/shortlog/shortlog_data.html:71
 msgid "Push new repo"
 msgstr ""
 #: rhodecode/templates/shortlog/shortlog_data.html:79
 #, fuzzy
 #| msgid "Git repository"
 msgid "Existing repository?"
 msgstr "Git 版本庫"
 #: rhodecode/templates/summary/summary.html:12
 msgid "summary"
 msgstr "概況"
 #: 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 "沒有修改"
 #: rhodecode/templates/summary/summary.html:82
 msgid "public"
 msgstr "公開"
@@ @@ -3100,23 +3025,21 @@ msgstr "遠端複製" @@
 #: rhodecode/templates/summary/summary.html:121
 msgid "Clone url"
 msgstr "複製連結"
 #: rhodecode/templates/summary/summary.html:124
 #, fuzzy
 #| msgid "show more"
 msgid "Show by Name"
 msgstr "顯示更多"
 #: rhodecode/templates/summary/summary.html:125
 msgid "Show by ID"
 msgstr ""
 #: rhodecode/templates/summary/summary.html:133
 #, fuzzy
 #| msgid "edit file"
 msgid "Trending files"
 msgstr "編輯檔案"
 #: rhodecode/templates/summary/summary.html:141
 #: rhodecode/templates/summary/summary.html:157
 #: rhodecode/templates/summary/summary.html:185
@@ @@ -3150,13 +3073,12 @@ msgstr "" @@
 #: rhodecode/templates/summary/summary.html:188
 msgid "Stats gathered: "
 msgstr ""
 #: rhodecode/templates/summary/summary.html:211
 #, fuzzy
 #| msgid "quick filter..."
 msgid "Quick start"
 msgstr "快速過濾..."
 #: rhodecode/templates/summary/summary.html:281
 #, python-format
 msgid "Download %s as %s"
@@ @@ -3191,63 +3113,12 @@ msgid "file changed" @@
 msgstr "檔案修改"
 #: rhodecode/templates/summary/summary.html:647
 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 ""

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -72,13 +72,13 @@ def get_logger(cls): @@
 @task(ignore_result=True)
 @locked_task
 @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']
     WhooshIndexingDaemon(index_location=index_location,
                          repo_location=repo_location, sa=DBS)\
                          .run(full_index=full_index)

rhodecode/lib/diffs.py

➞

Show inline comments

@@ @@ -72,13 +72,13 @@ def wrapped_diff(filenode_old, filenode_ @@
         diff_processor = DiffProcessor(f_gitdiff, format='gitdiff')
         diff = diff_processor.as_html(enable_comments=enable_comments)
         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
     if not diff:
         submodules = filter(lambda o: isinstance(o, SubModuleNode),
                             [filenode_new, filenode_old])

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -42,12 +42,13 @@ from rhodecode.lib.utils import repo_nam @@
 from rhodecode.lib.utils2 import str2bool, safe_unicode, safe_str, \
     get_changeset_safe
 from rhodecode.lib.markup_renderer import MarkupRenderer
 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__)
 def shorter(text, size=20):
     postfix = '...'
@@ @@ -909,13 +910,14 @@ def urlify_commit(text_, repository=None @@
                 '%(issue-prefix)s%(id-repr)s'
                 '</a>'
+                )
                 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',
                      'url': url,
                      'id-repr': issue_id,
                      'issue-prefix': ISSUE_PREFIX,

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -47,13 +47,13 @@ from rhodecode.lib.compat import json @@
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model.meta import Base, Session
 import hashlib
 from sqlalchemy.exc import DatabaseError
+URL_SEP = '/'
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
@@ @@ -570,13 +570,13 @@ class Repository(Base, BaseModel): @@
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (self.__class__.__name__,self.repo_id,
                                    self.repo_name)
     @classmethod
     def url_sep(cls):
-        return '/'
+        return URL_SEP
     @classmethod
     def get_by_repo_name(cls, repo_name):
         q = Session.query(cls).filter(cls.repo_name == repo_name)
         q = q.options(joinedload(Repository.fork))\
                 .options(joinedload(Repository.user))\
@@ @@ -841,13 +841,13 @@ class RepoGroup(Base, BaseModel): @@
         repo_groups = sorted(repo_groups, key=lambda t: t[1].split(sep)[0])
         return repo_groups
     @classmethod
     def url_sep(cls):
-        return '/'
+        return URL_SEP
     @classmethod
     def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
         if case_insensitive:
             gr = cls.query()\
                 .filter(cls.group_name.ilike(group_name))

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -53,13 +53,13 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 							<span class="tooltip" title="${h.age(cs.date)}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span>
 							</div>
 							<div class="author">
 								<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>
 						<div class="mid">
                             <div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
                             <div class="expand"><span class="expandtext">&darr; ${_('show more')} &darr;</span></div>

0 comments (0 inline, 0 general)