Mercurial > kallithea
changeset 3112:3259dc7caea4 rhodecode-0.0.1.5.1
merge with beta
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 14 Dec 2012 04:26:15 +0100 |
| parents | 5c092b79f39b (current diff) 2dd0e1d92386 (diff) |
| children | a0737406ce26 |
| files | docs/changelog.rst rhodecode/__init__.py rhodecode/controllers/admin/repos.py rhodecode/controllers/settings.py rhodecode/i18n/rhodecode.pot rhodecode/lib/db_manage.py rhodecode/lib/helpers.py rhodecode/public/css/style.css |
| diffstat | 23 files changed, 2123 insertions(+), 1720 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/changelog.rst Thu Dec 13 23:20:38 2012 +0100 +++ b/docs/changelog.rst Fri Dec 14 04:26:15 2012 +0100 @@ -5,6 +5,24 @@ ========= +1.5.1 (**2012-12-13**) +---------------------- + +news +++++ + +- implements #677: Don't allow to close pull requests when they are + under-review status +- implemented #670 Implementation of Roles in Pull Request + +fixes ++++++ + +- default permissions can get duplicated after migration +- fixed changeset status labels, they now select radio buttons +- #682 translation difficult for multi-line text +- #683 fixed difference between messages about not mapped repositories + 1.5.0 (**2012-12-12**) ----------------------
--- a/rhodecode/__init__.py Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/__init__.py Fri Dec 14 04:26:15 2012 +0100 @@ -26,7 +26,7 @@ import sys import platform -VERSION = (1, 5, 0) +VERSION = (1, 5, 1) try: from rhodecode.lib import get_current_revision @@ -38,7 +38,7 @@ __version__ = ('.'.join((str(each) for each in VERSION[:3])) + '.'.join(VERSION[3:])) -__dbversion__ = 8 # defines current db version for migrations +__dbversion__ = 9 # defines current db version for migrations __platform__ = platform.system() __license__ = 'GPLv3' __py_version__ = sys.version_info
--- a/rhodecode/controllers/admin/repos.py Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/controllers/admin/repos.py Fri Dec 14 04:26:15 2012 +0100 @@ -89,12 +89,7 @@ repo = db_repo.scm_instance if c.repo_info is None: - h.flash(_('%s repository is not mapped to db perhaps' - ' it was created or renamed from the filesystem' - ' please run the application again' - ' in order to rescan repositories') % repo_name, - category='error') - + h.not_mapped_error(repo_name) return redirect(url('repos')) ##override defaults for exact repo info here git/hg etc @@ -310,12 +305,7 @@ repo_model = RepoModel() repo = repo_model.get_by_repo_name(repo_name) if not repo: - h.flash(_('%s repository is not mapped to db perhaps' - ' it was moved or renamed from the filesystem' - ' please run the application again' - ' in order to rescan repositories') % repo_name, - category='error') - + h.not_mapped_error(repo_name) return redirect(url('repos')) try: action_logger(self.rhodecode_user, 'admin_deleted_repo',
--- a/rhodecode/controllers/forks.py Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/controllers/forks.py Fri Dec 14 04:26:15 2012 +0100 @@ -71,12 +71,7 @@ repo = db_repo.scm_instance if c.repo_info is None: - h.flash(_('%s repository is not mapped to db perhaps' - ' it was created or renamed from the filesystem' - ' please run the application again' - ' in order to rescan repositories') % repo_name, - category='error') - + h.not_mapped_error(repo_name) return redirect(url('repos')) c.default_user_id = User.get_by_username('default').user_id @@ -131,12 +126,7 @@ def fork(self, repo_name): c.repo_info = Repository.get_by_repo_name(repo_name) if not c.repo_info: - h.flash(_('%s repository is not mapped to db perhaps' - ' it was created or renamed from the file system' - ' please run the application again' - ' in order to rescan repositories') % repo_name, - category='error') - + h.not_mapped_error(repo_name) return redirect(url('home')) defaults = self.__load_data(repo_name)
--- a/rhodecode/controllers/pullrequests.py Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/controllers/pullrequests.py Fri Dec 14 04:26:15 2012 +0100 @@ -96,6 +96,12 @@ #if repo doesn't have default branch return first found return repo.branches.keys()[0] + def _get_is_allowed_change_status(self, pull_request): + owner = self.rhodecode_user.user_id == pull_request.user_id + reviewer = self.rhodecode_user.user_id in [x.user_id for x in + pull_request.reviewers] + return (self.rhodecode_user.admin or owner or reviewer) + def show_all(self, repo_name): c.pull_requests = PullRequestModel().get_all(repo_name) c.repo_name = repo_name @@ -334,7 +340,7 @@ c.users_groups_array = repo_model.get_users_groups_js() c.pull_request = PullRequest.get_or_404(pull_request_id) c.target_repo = c.pull_request.org_repo.repo_name - + c.allowed_to_change_status = self._get_is_allowed_change_status(c.pull_request) cc_model = ChangesetCommentsModel() cs_model = ChangesetStatusModel() _cs_statuses = cs_model.get_statuses(c.pull_request.org_repo, @@ -405,7 +411,9 @@ status = request.POST.get('changeset_status') change_status = request.POST.get('change_changeset_status') text = request.POST.get('text') - if status and change_status: + + allowed_to_change_status = self._get_is_allowed_change_status(pull_request) + if status and change_status and allowed_to_change_status: text = text or (_('Status change -> %s') % ChangesetStatus.get_status_lbl(status)) comm = ChangesetCommentsModel().create( @@ -416,27 +424,34 @@ f_path=request.POST.get('f_path'), line_no=request.POST.get('line'), status_change=(ChangesetStatus.get_status_lbl(status) - if status and change_status else None) + if status and change_status and allowed_to_change_status else None) ) - # get status if set ! - if status and change_status: - ChangesetStatusModel().set_status( - c.rhodecode_db_repo.repo_id, - status, - c.rhodecode_user.user_id, - comm, - pull_request=pull_request_id - ) action_logger(self.rhodecode_user, 'user_commented_pull_request:%s' % pull_request_id, c.rhodecode_db_repo, self.ip_addr, self.sa) - if request.POST.get('save_close'): - PullRequestModel().close_pull_request(pull_request_id) - action_logger(self.rhodecode_user, - 'user_closed_pull_request:%s' % pull_request_id, - c.rhodecode_db_repo, self.ip_addr, self.sa) + if allowed_to_change_status: + # get status if set ! + if status and change_status: + ChangesetStatusModel().set_status( + c.rhodecode_db_repo.repo_id, + status, + c.rhodecode_user.user_id, + comm, + pull_request=pull_request_id + ) + + if request.POST.get('save_close'): + if status in ['rejected', 'approved']: + PullRequestModel().close_pull_request(pull_request_id) + action_logger(self.rhodecode_user, + 'user_closed_pull_request:%s' % pull_request_id, + c.rhodecode_db_repo, self.ip_addr, self.sa) + else: + h.flash(_('Closing pull request on other statuses than ' + 'rejected or approved forbidden'), + category='warning') Session().commit()
--- a/rhodecode/controllers/settings.py Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/controllers/settings.py Fri Dec 14 04:26:15 2012 +0100 @@ -77,12 +77,7 @@ repo = db_repo.scm_instance if c.repo_info is None: - h.flash(_('%s repository is not mapped to db perhaps' - ' it was created or renamed from the filesystem' - ' please run the application again' - ' in order to rescan repositories') % repo_name, - category='error') - + h.not_mapped_error(repo_name) return redirect(url('home')) ##override defaults for exact repo info here git/hg etc @@ -157,12 +152,7 @@ repo_model = RepoModel() repo = repo_model.get_by_repo_name(repo_name) if not repo: - h.flash(_('%s repository is not mapped to db perhaps' - ' it was moved or renamed from the filesystem' - ' please run the application again' - ' in order to rescan repositories') % repo_name, - category='error') - + h.not_mapped_error(repo_name) return redirect(url('home')) try: action_logger(self.rhodecode_user, 'user_deleted_repo',
--- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Fri Dec 14 04:26:15 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: rhodecode 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-03 03:21+0100\n" +"POT-Creation-Date: 2012-12-14 04:19+0100\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" @@ -21,33 +21,33 @@ msgid "All Branches" msgstr "" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "" -#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:164 +#: rhodecode/controllers/changeset.py:163 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:315 -#: rhodecode/controllers/pullrequests.py:411 +#: rhodecode/controllers/changeset.py:314 +#: rhodecode/controllers/pullrequests.py:417 #, python-format msgid "Status change -> %s" msgstr "" -#: rhodecode/controllers/changeset.py:346 +#: rhodecode/controllers/changeset.py:345 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" #: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/pullrequests.py:121 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "" @@ -89,8 +89,8 @@ msgstr "" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:126 -#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/changeset/changeset.html:137 +#: rhodecode/templates/changeset/changeset.html:149 #: rhodecode/templates/compare/compare_diff.html:62 #: rhodecode/templates/compare/compare_diff.html:73 #: rhodecode/templates/pullrequests/pullrequest_show.html:94 @@ -170,48 +170,33 @@ msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" - -#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the file system please run the application again in order to rescan " -"repositories" -msgstr "" - -#: rhodecode/controllers/forks.py:168 +#: rhodecode/controllers/forks.py:158 #, python-format msgid "forked %s repository as %s" msgstr "" -#: rhodecode/controllers/forks.py:182 +#: rhodecode/controllers/forks.py:172 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261 msgid "public journal" msgstr "" -#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265 #: rhodecode/templates/base/base.html:232 +#: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "" @@ -229,30 +214,34 @@ "email" msgstr "" -#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 +#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:186 +#: rhodecode/controllers/pullrequests.py:190 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:188 +#: rhodecode/controllers/pullrequests.py:192 msgid "error during creation of pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:220 +#: rhodecode/controllers/pullrequests.py:224 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:223 +#: rhodecode/controllers/pullrequests.py:227 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:256 +#: rhodecode/controllers/pullrequests.py:260 msgid "Successfully deleted pull request" msgstr "" +#: rhodecode/controllers/pullrequests.py:452 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + #: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "" @@ -265,55 +254,46 @@ msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:108 -#: rhodecode/controllers/admin/repos.py:268 +#: rhodecode/controllers/settings.py:119 +#: rhodecode/controllers/admin/repos.py:272 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/settings.py:137 +#: rhodecode/controllers/admin/repos.py:290 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:304 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was moved or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" - -#: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:316 +#: rhodecode/controllers/settings.py:162 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "" -#: rhodecode/controllers/settings.py:160 -#: rhodecode/controllers/admin/repos.py:326 -#: rhodecode/controllers/admin/repos.py:332 +#: rhodecode/controllers/settings.py:166 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/settings.py:179 +#: rhodecode/controllers/settings.py:185 msgid "unlocked" msgstr "" -#: rhodecode/controllers/settings.py:182 -msgid "locked" -msgstr "" - -#: rhodecode/controllers/settings.py:184 -#, python-format -msgid "Repository has been %s" -msgstr "" - #: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:424 +msgid "locked" +msgstr "" + +#: rhodecode/controllers/settings.py:190 +#, python-format +msgid "Repository has been %s" +msgstr "" + +#: rhodecode/controllers/settings.py:194 +#: rhodecode/controllers/admin/repos.py:423 msgid "An error occurred during unlocking" msgstr "" @@ -462,76 +442,76 @@ msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:125 +#: rhodecode/controllers/admin/repos.py:121 msgid "--REMOVE FORK--" msgstr "" +#: rhodecode/controllers/admin/repos.py:190 +#, python-format +msgid "created repository %s from %s" +msgstr "" + #: rhodecode/controllers/admin/repos.py:194 #, python-format -msgid "created repository %s from %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:198 -#, python-format msgid "created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/admin/repos.py:225 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:321 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:350 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:404 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:444 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:448 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:468 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:486 +#: rhodecode/controllers/admin/repos.py:485 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:490 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "" @@ -767,152 +747,160 @@ msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:373 +#: rhodecode/lib/helpers.py:374 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:489 +#: rhodecode/lib/helpers.py:490 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:529 +#: rhodecode/lib/helpers.py:530 #, python-format msgid "Deleted branch: %s" msgstr "" -#: rhodecode/lib/helpers.py:532 +#: rhodecode/lib/helpers.py:533 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:546 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:589 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:595 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:614 -msgid "and" -msgstr "" - #: rhodecode/lib/helpers.py:615 +msgid "and" +msgstr "" + +#: rhodecode/lib/helpers.py:616 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:641 #, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/helpers.py:653 +#: rhodecode/lib/helpers.py:658 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:659 +#: rhodecode/lib/helpers.py:664 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 +#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:663 +#: rhodecode/lib/helpers.py:668 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 +#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 +#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:669 +#: rhodecode/lib/helpers.py:674 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:677 +#: rhodecode/lib/helpers.py:682 msgid "[created] user" msgstr "" -#: rhodecode/lib/helpers.py:679 +#: rhodecode/lib/helpers.py:684 msgid "[updated] user" msgstr "" -#: rhodecode/lib/helpers.py:681 +#: rhodecode/lib/helpers.py:686 msgid "[created] users group" msgstr "" -#: rhodecode/lib/helpers.py:683 +#: rhodecode/lib/helpers.py:688 msgid "[updated] users group" msgstr "" -#: rhodecode/lib/helpers.py:685 +#: rhodecode/lib/helpers.py:690 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:687 +#: rhodecode/lib/helpers.py:692 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/helpers.py:689 +#: rhodecode/lib/helpers.py:694 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:691 +#: rhodecode/lib/helpers.py:696 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:693 +#: rhodecode/lib/helpers.py:698 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:695 +#: rhodecode/lib/helpers.py:700 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:697 +#: rhodecode/lib/helpers.py:702 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:699 +#: rhodecode/lib/helpers.py:704 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:701 +#: rhodecode/lib/helpers.py:706 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:877 +#: rhodecode/lib/helpers.py:883 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:881 +#: rhodecode/lib/helpers.py:887 msgid "No Files" msgstr "" +#: rhodecode/lib/helpers.py:1163 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" + #: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" @@ -983,83 +971,83 @@ msgid "password reset link" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183 msgid "Repository no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184 msgid "Repository read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185 msgid "Repository write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186 msgid "Repository admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188 msgid "Repositories Group no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189 msgid "Repositories Group read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190 msgid "Repositories Group write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193 msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194 msgid "Repository creation disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195 msgid "Repository creation enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196 msgid "Repository forking disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197 msgid "Repository forking enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198 msgid "Register disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643 msgid "Not Reviewed" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644 msgid "Approved" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645 msgid "Rejected" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646 msgid "Under Review" msgstr "" @@ -1129,20 +1117,20 @@ msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:230 +#: rhodecode/model/user.py:232 msgid "new user registration" msgstr "" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 -#: rhodecode/model/user.py:301 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 +#: rhodecode/model/user.py:303 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:325 +#: rhodecode/model/user.py:327 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:331 +#: rhodecode/model/user.py:333 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1263,26 +1251,26 @@ msgid "This username or users group name is not valid" msgstr "" -#: rhodecode/model/validators.py:582 +#: rhodecode/model/validators.py:591 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:606 msgid "This e-mail address is already taken" msgstr "" -#: rhodecode/model/validators.py:617 +#: rhodecode/model/validators.py:626 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:654 +#: rhodecode/model/validators.py:663 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: rhodecode/model/validators.py:673 +#: rhodecode/model/validators.py:682 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1298,7 +1286,8 @@ #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:40 +#: rhodecode/templates/journal/journal.html:9 +#: rhodecode/templates/journal/journal.html:48 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "" @@ -1364,8 +1353,8 @@ #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:62 -#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal.html:70 +#: rhodecode/templates/journal/journal.html:196 #: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 @@ -1382,7 +1371,7 @@ #: rhodecode/templates/index_base.html:74 #: rhodecode/templates/index_base.html:179 #: rhodecode/templates/admin/users/user_edit_my_account.html:182 -#: rhodecode/templates/journal/journal.html:170 +#: rhodecode/templates/journal/journal.html:198 msgid "Tip" msgstr "" @@ -1412,7 +1401,7 @@ #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:221 #: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "" @@ -1425,7 +1414,7 @@ #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/journal/journal.html:222 #: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "" @@ -1442,7 +1431,7 @@ #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:223 #: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "" @@ -1454,7 +1443,7 @@ #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/journal/journal.html:224 #: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "" @@ -1466,8 +1455,8 @@ #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:54 -#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:225 #: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "" @@ -1615,10 +1604,27 @@ msgstr "" #: rhodecode/templates/admin/admin.html:5 -#: rhodecode/templates/admin/admin.html:9 +#: rhodecode/templates/admin/admin.html:13 msgid "Admin journal" msgstr "" +#: rhodecode/templates/admin/admin.html:10 +msgid "journal filter..." +msgstr "" + +#: rhodecode/templates/admin/admin.html:12 +#: rhodecode/templates/journal/journal.html:11 +msgid "filter" +msgstr "" + +#: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/journal/journal.html:12 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" +msgstr[1] "" + #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 @@ -1647,7 +1653,7 @@ msgid "From IP" msgstr "" -#: rhodecode/templates/admin/admin_log.html:57 +#: rhodecode/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "" @@ -1716,7 +1722,7 @@ #: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "" @@ -2004,7 +2010,7 @@ #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:94 +#: rhodecode/templates/settings/repo_settings.html:95 msgid "Reset" msgstr "" @@ -2145,19 +2151,21 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Remove this repository" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Confirm to delete this repository" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:282 +#: rhodecode/templates/settings/repo_settings.html:119 msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem " -"please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need fully delete it " +"from file system please do it manually" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 @@ -2189,7 +2197,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/journal/journal.html:95 #: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "" @@ -2694,7 +2702,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "My repos" msgstr "" @@ -2905,7 +2913,6 @@ #: rhodecode/templates/base/base.html:324 #: rhodecode/templates/base/base.html:326 #: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "" @@ -3037,7 +3044,7 @@ msgstr "" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:75 +#: rhodecode/templates/journal/journal.html:83 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "" @@ -3143,7 +3150,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" @@ -3155,23 +3162,22 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:104 -#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "" #: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changeset/changeset.html:42 msgid "No parents" msgstr "" #: rhodecode/templates/changelog/changelog.html:115 -#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:106 #: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "" #: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:109 #: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -3186,7 +3192,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:114 #: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "" @@ -3196,26 +3202,26 @@ msgstr "" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:73 +#: rhodecode/templates/changeset/changeset.html:94 msgid "removed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:74 +#: rhodecode/templates/changeset/changeset.html:95 msgid "changed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:75 +#: rhodecode/templates/changeset/changeset.html:96 msgid "added" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:77 -#: rhodecode/templates/changeset/changeset.html:78 -#: rhodecode/templates/changeset/changeset.html:79 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:99 +#: rhodecode/templates/changeset/changeset.html:100 #, python-format msgid "affected %s files" msgstr "" @@ -3229,21 +3235,25 @@ msgid "Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:49 +#: rhodecode/templates/changeset/changeset.html:52 +msgid "No children" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:70 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:50 +#: rhodecode/templates/changeset/changeset.html:71 msgid "patch diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:51 +#: rhodecode/templates/changeset/changeset.html:72 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" @@ -3251,7 +3261,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" @@ -3259,7 +3269,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset.html:122 #: rhodecode/templates/compare/compare_diff.html:44 #: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, python-format @@ -3268,7 +3278,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/changeset/changeset.html:124 #: rhodecode/templates/compare/compare_diff.html:46 #: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, python-format @@ -3297,7 +3307,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:138 +#: rhodecode/templates/changeset/changeset_file_comment.html:143 msgid "Comment" msgstr "" @@ -3318,15 +3328,15 @@ msgid "Leave a comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "change status" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 msgid "Comment and close" msgstr "" @@ -3380,19 +3390,19 @@ msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal.html:89 #: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/journal/journal.html:91 #: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/journal/journal.html:97 #: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "" @@ -3764,50 +3774,50 @@ msgid "There are no forks yet" msgstr "" -#: rhodecode/templates/journal/journal.html:13 +#: rhodecode/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "" -#: rhodecode/templates/journal/journal.html:14 +#: rhodecode/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "" -#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/journal/journal.html:32 #: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "" -#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 msgid "RSS feed" msgstr "" -#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/journal.html:38 #: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "Watched" msgstr "" -#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:54 msgid "ADD" msgstr "" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "following user" msgstr "" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "user" msgstr "" -#: rhodecode/templates/journal/journal.html:102 +#: rhodecode/templates/journal/journal.html:110 msgid "You are not following any users or repositories" msgstr "" -#: rhodecode/templates/journal/journal_data.html:51 +#: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" msgstr "" @@ -3906,6 +3916,11 @@ msgid "Compare view" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#, fuzzy +msgid "reviewer" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 msgid "all pull requests" msgstr "" @@ -3970,6 +3985,14 @@ msgid "%s Settings" msgstr "" +#: rhodecode/templates/settings/repo_settings.html:102 +msgid "Delete repository" +msgstr "" + +#: rhodecode/templates/settings/repo_settings.html:109 +msgid "Remove repo" +msgstr "" + #: rhodecode/templates/shortlog/shortlog.html:5 #, python-format msgid "%s Shortlog" @@ -4171,3 +4194,19 @@ msgid "Compare tags" msgstr "" +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was created or renamed" +#~ " from the file system please run " +#~ "the application again in order to " +#~ "rescan repositories" +#~ msgstr "" + +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was moved or renamed " +#~ "from the filesystem please run the " +#~ "application again in order to rescan " +#~ "repositories" +#~ msgstr "" +
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Fri Dec 14 04:26:15 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.1.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-03 03:21+0100\n" +"POT-Creation-Date: 2012-12-14 04:19+0100\n" "PO-Revision-Date: 2012-10-02 11:32+0100\n" "Last-Translator: Vincent Duvert <vincent@duvert.net>\n" "Language-Team: fr <LL@li.org>\n" @@ -21,26 +21,26 @@ msgid "All Branches" msgstr "Toutes les branches" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "Afficher les espaces et tabulations" -#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "Ignorer les espaces et tabulations" -#: rhodecode/controllers/changeset.py:164 +#: rhodecode/controllers/changeset.py:163 #, python-format msgid "%s line context" msgstr "Afficher %s lignes de contexte" -#: rhodecode/controllers/changeset.py:315 -#: rhodecode/controllers/pullrequests.py:411 +#: rhodecode/controllers/changeset.py:314 +#: rhodecode/controllers/pullrequests.py:417 #, python-format msgid "Status change -> %s" msgstr "Changement de statut -> %s" -#: rhodecode/controllers/changeset.py:346 +#: rhodecode/controllers/changeset.py:345 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" @@ -49,7 +49,7 @@ "n’est pas autorisé." #: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/pullrequests.py:121 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" @@ -95,8 +95,8 @@ msgstr "Flux %s de %s" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:126 -#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/changeset/changeset.html:137 +#: rhodecode/templates/changeset/changeset.html:149 #: rhodecode/templates/compare/compare_diff.html:62 #: rhodecode/templates/compare/compare_diff.html:73 #: rhodecode/templates/pullrequests/pullrequest_show.html:94 @@ -176,54 +176,33 @@ msgid "Changesets" msgstr "Changesets" -#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "Branches" -#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "Tags" -#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" -"Le dépôt %s n’est pas représenté dans la base de données. Il a " -"probablement été créé ou renommé manuellement. Veuillez relancer " -"l’application pour rescanner les dépôts." - -#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the file system please run the application again in order to rescan " -"repositories" -msgstr "" -"Le dépôt %s n’est pas représenté dans la base de données. Il a " -"probablement été créé ou renommé manuellement. Veuillez relancer " -"l’application pour rescanner les dépôts." - -#: rhodecode/controllers/forks.py:168 +#: rhodecode/controllers/forks.py:158 #, python-format msgid "forked %s repository as %s" msgstr "dépôt %s forké en tant que %s" -#: rhodecode/controllers/forks.py:182 +#: rhodecode/controllers/forks.py:172 #, python-format msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s." -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261 msgid "public journal" msgstr "Journal public" -#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265 #: rhodecode/templates/base/base.html:232 +#: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "Journal" @@ -243,30 +222,34 @@ "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a " "été envoyé par e-mail." -#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 +#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "Signets" -#: rhodecode/controllers/pullrequests.py:186 +#: rhodecode/controllers/pullrequests.py:190 msgid "Pull request requires a title with min. 3 chars" msgstr "Les requêtes de pull nécessitent un titre d’au moins 3 caractères." -#: rhodecode/controllers/pullrequests.py:188 +#: rhodecode/controllers/pullrequests.py:192 msgid "error during creation of pull request" msgstr "Une erreur est survenue lors de la création de la requête de pull." -#: rhodecode/controllers/pullrequests.py:220 +#: rhodecode/controllers/pullrequests.py:224 msgid "Successfully opened new pull request" msgstr "La requête de pull a été ouverte avec succès." -#: rhodecode/controllers/pullrequests.py:223 +#: rhodecode/controllers/pullrequests.py:227 msgid "Error occurred during sending pull request" msgstr "Une erreur est survenue durant l’envoi de la requête de pull." -#: rhodecode/controllers/pullrequests.py:256 +#: rhodecode/controllers/pullrequests.py:260 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès." +#: rhodecode/controllers/pullrequests.py:452 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + #: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Requête invalide. Essayer de la mettre entre guillemets." @@ -281,58 +264,46 @@ msgid "An error occurred during this search operation" msgstr "Une erreur est survenue durant l’opération de recherche." -#: rhodecode/controllers/settings.py:108 -#: rhodecode/controllers/admin/repos.py:268 +#: rhodecode/controllers/settings.py:119 +#: rhodecode/controllers/admin/repos.py:272 #, python-format msgid "Repository %s updated successfully" msgstr "Dépôt %s mis à jour avec succès." -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/settings.py:137 +#: rhodecode/controllers/admin/repos.py:290 #, python-format msgid "error occurred during update of repository %s" msgstr "Une erreur est survenue lors de la mise à jour du dépôt %s." -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:304 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was moved or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" -"Le dépôt %s n’est pas représenté dans la base de données. Il a " -"probablement été déplacé ou renommé manuellement. Veuillez relancer " -"l’application pour rescanner les dépôts." - -#: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:316 +#: rhodecode/controllers/settings.py:162 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "Dépôt %s supprimé" -#: rhodecode/controllers/settings.py:160 -#: rhodecode/controllers/admin/repos.py:326 -#: rhodecode/controllers/admin/repos.py:332 +#: rhodecode/controllers/settings.py:166 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" -#: rhodecode/controllers/settings.py:179 +#: rhodecode/controllers/settings.py:185 msgid "unlocked" msgstr "déverrouillé" -#: rhodecode/controllers/settings.py:182 +#: rhodecode/controllers/settings.py:188 msgid "locked" msgstr "verrouillé" -#: rhodecode/controllers/settings.py:184 +#: rhodecode/controllers/settings.py:190 #, python-format msgid "Repository has been %s" msgstr "Le dépôt a été %s." -#: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:424 +#: rhodecode/controllers/settings.py:194 +#: rhodecode/controllers/admin/repos.py:423 msgid "An error occurred during unlocking" msgstr "Une erreur est survenue durant le déverrouillage." @@ -483,80 +454,80 @@ msgid "error occurred during update of permissions" msgstr "erreur pendant la mise à jour des permissions" -#: rhodecode/controllers/admin/repos.py:125 +#: rhodecode/controllers/admin/repos.py:121 msgid "--REMOVE FORK--" msgstr "[Pas un fork]" -#: rhodecode/controllers/admin/repos.py:194 +#: rhodecode/controllers/admin/repos.py:190 #, python-format msgid "created repository %s from %s" msgstr "Le dépôt %s a été créé depuis %s." -#: rhodecode/controllers/admin/repos.py:198 +#: rhodecode/controllers/admin/repos.py:194 #, python-format msgid "created repository %s" msgstr "Le dépôt %s a été créé." -#: rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/admin/repos.py:225 #, python-format msgid "error occurred during creation of repository %s" msgstr "Une erreur est survenue durant la création du dépôt %s." -#: rhodecode/controllers/admin/repos.py:321 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés." -#: rhodecode/controllers/admin/repos.py:350 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur du dépôt." -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "" "Une erreur est survenue durant la suppression du groupe d’utilisateurs de" " ce dépôt." -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt." -#: rhodecode/controllers/admin/repos.py:404 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache." -#: rhodecode/controllers/admin/repos.py:444 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "La visibilité du dépôt dans le journal public a été mise à jour." -#: rhodecode/controllers/admin/repos.py:448 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "" "Une erreur est survenue durant la configuration du journal public pour ce" " dépôt." -#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "Jeton d’authentification incorrect." -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés." -#: rhodecode/controllers/admin/repos.py:468 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "Une erreur est survenue durant le pull depuis la source distante." -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "[Aucun dépôt]" -#: rhodecode/controllers/admin/repos.py:486 +#: rhodecode/controllers/admin/repos.py:485 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Le dépôt %s a été marké comme fork de %s" -#: rhodecode/controllers/admin/repos.py:490 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération." @@ -804,152 +775,163 @@ msgid "No changes detected" msgstr "Aucun changement détecté." -#: rhodecode/lib/helpers.py:373 +#: rhodecode/lib/helpers.py:374 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%d/%m/%Y à %H:%M:%S" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 msgid "True" msgstr "Vrai" -#: rhodecode/lib/helpers.py:489 +#: rhodecode/lib/helpers.py:490 msgid "False" msgstr "Faux" -#: rhodecode/lib/helpers.py:529 +#: rhodecode/lib/helpers.py:530 #, fuzzy, python-format msgid "Deleted branch: %s" msgstr "Dépôt %s supprimé" -#: rhodecode/lib/helpers.py:532 +#: rhodecode/lib/helpers.py:533 #, fuzzy, python-format msgid "Created tag: %s" msgstr "utilisateur %s créé" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:546 msgid "Changeset not found" msgstr "Ensemble de changements non trouvé" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:589 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:595 msgid "compare view" msgstr "vue de comparaison" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:615 msgid "and" msgstr "et" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:616 #, python-format msgid "%s more" msgstr "%s de plus" -#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "révisions" -#: rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:641 #, fuzzy, python-format msgid "fork name %s" msgstr "Nom du fork %s" -#: rhodecode/lib/helpers.py:653 +#: rhodecode/lib/helpers.py:658 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "Requête de pull #%s" -#: rhodecode/lib/helpers.py:659 +#: rhodecode/lib/helpers.py:664 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 +#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/helpers.py:663 +#: rhodecode/lib/helpers.py:668 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 +#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 +#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: rhodecode/lib/helpers.py:669 +#: rhodecode/lib/helpers.py:674 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:677 +#: rhodecode/lib/helpers.py:682 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: rhodecode/lib/helpers.py:679 +#: rhodecode/lib/helpers.py:684 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: rhodecode/lib/helpers.py:681 +#: rhodecode/lib/helpers.py:686 msgid "[created] users group" msgstr "[a créé] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:683 +#: rhodecode/lib/helpers.py:688 msgid "[updated] users group" msgstr "[a mis à jour] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:685 +#: rhodecode/lib/helpers.py:690 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: rhodecode/lib/helpers.py:687 +#: rhodecode/lib/helpers.py:692 msgid "[commented] on pull request for" msgstr "[a commenté] la requête de pull pour" -#: rhodecode/lib/helpers.py:689 +#: rhodecode/lib/helpers.py:694 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: rhodecode/lib/helpers.py:691 +#: rhodecode/lib/helpers.py:696 msgid "[pushed] into" msgstr "[a pushé] dans" -#: rhodecode/lib/helpers.py:693 +#: rhodecode/lib/helpers.py:698 msgid "[committed via RhodeCode] into repository" msgstr "[a commité via RhodeCode] dans le dépôt" -#: rhodecode/lib/helpers.py:695 +#: rhodecode/lib/helpers.py:700 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: rhodecode/lib/helpers.py:697 +#: rhodecode/lib/helpers.py:702 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/helpers.py:699 +#: rhodecode/lib/helpers.py:704 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/helpers.py:701 +#: rhodecode/lib/helpers.py:706 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/helpers.py:877 +#: rhodecode/lib/helpers.py:883 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:881 +#: rhodecode/lib/helpers.py:887 msgid "No Files" msgstr "Aucun fichier" +#: rhodecode/lib/helpers.py:1163 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" +"Le dépôt %s n’est pas représenté dans la base de données. Il a " +"probablement été créé ou renommé manuellement. Veuillez relancer " +"l’application pour rescanner les dépôts." + #: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" @@ -1020,83 +1002,83 @@ msgid "password reset link" msgstr "Réinitialisation du mot de passe" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183 msgid "Repository no access" msgstr "Aucun accès au dépôt" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184 msgid "Repository read access" msgstr "Accès en lecture au dépôt" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185 msgid "Repository write access" msgstr "Accès en écriture au dépôt" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186 msgid "Repository admin access" msgstr "Accès administrateur au dépôt" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188 msgid "Repositories Group no access" msgstr "Aucun accès au groupe de dépôts" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189 msgid "Repositories Group read access" msgstr "Accès en lecture au groupe de dépôts" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190 msgid "Repositories Group write access" msgstr "Accès en écriture au groupe de dépôts" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191 msgid "Repositories Group admin access" msgstr "Accès administrateur au groupe de dépôts" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193 msgid "RhodeCode Administrator" msgstr "Administrateur RhodeCode" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194 msgid "Repository creation disabled" msgstr "Création de dépôt désactivée" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195 msgid "Repository creation enabled" msgstr "Création de dépôt activée" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196 msgid "Repository forking disabled" msgstr "Fork de dépôt désactivé" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197 msgid "Repository forking enabled" msgstr "Fork de dépôt activé" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198 msgid "Register disabled" msgstr "Enregistrement désactivé" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199 msgid "Register new user with RhodeCode with manual activation" msgstr "Enregistrer un nouvel utilisateur Rhodecode manuellement activé" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202 msgid "Register new user with RhodeCode with auto activation" msgstr "Enregistrer un nouvel utilisateur Rhodecode auto-activé" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643 msgid "Not Reviewed" msgstr "Pas encore relue" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644 msgid "Approved" msgstr "Approuvée " -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645 msgid "Rejected" msgstr "Rejetée" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646 msgid "Under Review" msgstr "En cours de relecture" @@ -1166,24 +1148,24 @@ msgid "latest tip" msgstr "Dernier sommet" -#: rhodecode/model/user.py:230 +#: rhodecode/model/user.py:232 msgid "new user registration" msgstr "Nouveau compte utilisateur enregistré" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 -#: rhodecode/model/user.py:301 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 +#: rhodecode/model/user.py:303 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" " fonctionnement de l’application." -#: rhodecode/model/user.py:325 +#: rhodecode/model/user.py:327 msgid "You can't remove this user since it's crucial for entire application" msgstr "" "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " "bon fonctionnement de l’application." -#: rhodecode/model/user.py:331 +#: rhodecode/model/user.py:333 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1314,20 +1296,20 @@ msgid "This username or users group name is not valid" msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide." -#: rhodecode/model/validators.py:582 +#: rhodecode/model/validators.py:591 msgid "This is not a valid path" msgstr "Ceci n’est pas un chemin valide" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:606 msgid "This e-mail address is already taken" msgstr "Cette adresse e-mail est déjà enregistrée" -#: rhodecode/model/validators.py:617 +#: rhodecode/model/validators.py:626 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "L’adresse e-mail « %(email)s » n’existe pas" -#: rhodecode/model/validators.py:654 +#: rhodecode/model/validators.py:663 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1335,7 +1317,7 @@ "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom" " d’utilisateur." -#: rhodecode/model/validators.py:673 +#: rhodecode/model/validators.py:682 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1353,7 +1335,8 @@ #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:40 +#: rhodecode/templates/journal/journal.html:9 +#: rhodecode/templates/journal/journal.html:48 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "Filtre rapide…" @@ -1419,8 +1402,8 @@ #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:62 -#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal.html:70 +#: rhodecode/templates/journal/journal.html:196 #: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 @@ -1437,7 +1420,7 @@ #: rhodecode/templates/index_base.html:74 #: rhodecode/templates/index_base.html:179 #: rhodecode/templates/admin/users/user_edit_my_account.html:182 -#: rhodecode/templates/journal/journal.html:170 +#: rhodecode/templates/journal/journal.html:198 msgid "Tip" msgstr "Sommet" @@ -1467,7 +1450,7 @@ #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:221 #: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "Tri ascendant" @@ -1480,7 +1463,7 @@ #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/journal/journal.html:222 #: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "Tri descendant" @@ -1497,7 +1480,7 @@ #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:223 #: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "Aucun élément n’a été trouvé." @@ -1509,7 +1492,7 @@ #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/journal/journal.html:224 #: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "Erreur d’intégrité des données." @@ -1521,8 +1504,8 @@ #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:54 -#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:225 #: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "Chargement…" @@ -1670,10 +1653,29 @@ msgstr "Aucun signet n’a été créé." #: rhodecode/templates/admin/admin.html:5 -#: rhodecode/templates/admin/admin.html:9 +#: rhodecode/templates/admin/admin.html:13 msgid "Admin journal" msgstr "Historique d’administration" +#: rhodecode/templates/admin/admin.html:10 +#, fuzzy +msgid "journal filter..." +msgstr "Filtre rapide…" + +#: rhodecode/templates/admin/admin.html:12 +#: rhodecode/templates/journal/journal.html:11 +#, fuzzy +msgid "filter" +msgstr "Fichiers" + +#: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/journal/journal.html:12 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" +msgstr[1] "" + #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 @@ -1702,7 +1704,7 @@ msgid "From IP" msgstr "Depuis l’adresse IP" -#: rhodecode/templates/admin/admin_log.html:57 +#: rhodecode/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "Aucune action n’a été enregistrée pour le moment." @@ -1775,7 +1777,7 @@ #: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "Enregistrer" @@ -2073,7 +2075,7 @@ #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:94 +#: rhodecode/templates/settings/repo_settings.html:95 msgid "Reset" msgstr "Réinitialiser" @@ -2221,19 +2223,22 @@ msgstr "Supprimer" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Remove this repository" msgstr "Supprimer ce dépôt" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Confirm to delete this repository" msgstr "Voulez-vous vraiment supprimer ce dépôt ?" #: rhodecode/templates/admin/repos/repo_edit.html:282 +#: rhodecode/templates/settings/repo_settings.html:119 +#, fuzzy msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem " -"please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need fully delete it " +"from file system please do it manually" msgstr "" "Ce dépôt sera renommé de manière à le rendre inaccessible à RhodeCode et " "au système de gestion de versions.\n" @@ -2272,7 +2277,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/journal/journal.html:95 #: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "Dépôt privé" @@ -2798,7 +2803,7 @@ msgstr "Mes permissions" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "My repos" msgstr "Mes dépôts" @@ -3012,7 +3017,6 @@ #: rhodecode/templates/base/base.html:324 #: rhodecode/templates/base/base.html:326 #: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "Historique" @@ -3145,7 +3149,7 @@ msgstr "Nouveau commentaire" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:75 +#: rhodecode/templates/journal/journal.html:83 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "Arrêter de suivre ce dépôt" @@ -3254,7 +3258,7 @@ msgstr "Nombre de fichiers modifiés, cliquez pour plus de détails" #: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" @@ -3266,23 +3270,22 @@ msgstr "Cliquez ici pour ouvrir la requête de pull associée." #: rhodecode/templates/changelog/changelog.html:104 -#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "Parent" #: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changeset/changeset.html:42 msgid "No parents" msgstr "Aucun parent" #: rhodecode/templates/changelog/changelog.html:115 -#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:106 #: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "Fusion" #: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:109 #: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -3297,7 +3300,7 @@ msgstr "Signet" #: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:114 #: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "Tag" @@ -3307,26 +3310,26 @@ msgstr "Il n’y a aucun changement pour le moment" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:73 +#: rhodecode/templates/changeset/changeset.html:94 msgid "removed" msgstr "Supprimés" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:74 +#: rhodecode/templates/changeset/changeset.html:95 msgid "changed" msgstr "Modifiés" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:75 +#: rhodecode/templates/changeset/changeset.html:96 msgid "added" msgstr "Ajoutés" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:77 -#: rhodecode/templates/changeset/changeset.html:78 -#: rhodecode/templates/changeset/changeset.html:79 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:99 +#: rhodecode/templates/changeset/changeset.html:100 #, python-format msgid "affected %s files" msgstr "%s fichiers affectés" @@ -3340,22 +3343,27 @@ msgid "Changeset" msgstr "Changements" -#: rhodecode/templates/changeset/changeset.html:49 +#: rhodecode/templates/changeset/changeset.html:52 +#, fuzzy +msgid "No children" +msgstr "Appliquer aux enfants" + +#: rhodecode/templates/changeset/changeset.html:70 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "Diff brut" -#: rhodecode/templates/changeset/changeset.html:50 +#: rhodecode/templates/changeset/changeset.html:71 #, fuzzy msgid "patch diff" msgstr "Diff brut" -#: rhodecode/templates/changeset/changeset.html:51 +#: rhodecode/templates/changeset/changeset.html:72 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "Télécharger le diff" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" @@ -3363,7 +3371,7 @@ msgstr[0] "%d commentaire" msgstr[1] "%d commentaires" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" @@ -3371,7 +3379,7 @@ msgstr[0] "(et %d en ligne)" msgstr[1] "(et %d en ligne)" -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset.html:122 #: rhodecode/templates/compare/compare_diff.html:44 #: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, fuzzy, python-format @@ -3380,7 +3388,7 @@ msgstr[0] "%s fichié modifié" msgstr[1] "%s fichié modifié" -#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/changeset/changeset.html:124 #: rhodecode/templates/compare/compare_diff.html:46 #: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, fuzzy, python-format @@ -3413,7 +3421,7 @@ "l’utilisateur RhodeCode en question." #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:138 +#: rhodecode/templates/changeset/changeset_file_comment.html:143 msgid "Comment" msgstr "Commentaire" @@ -3434,15 +3442,15 @@ msgid "Leave a comment" msgstr "Laisser un commentaire" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "Check this to change current status of code-review for this changeset" msgstr "Cochez pour changer le statut de la relecture de code pour ce changeset" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "change status" msgstr "Modifier le statut" -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 msgid "Comment and close" msgstr "Commenter et fermer" @@ -3498,19 +3506,19 @@ msgstr "Fork" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal.html:89 #: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Dépôt Mercurial" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/journal/journal.html:91 #: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Dépôt Git" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/journal/journal.html:97 #: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "Dépôt public" @@ -3889,50 +3897,50 @@ msgid "There are no forks yet" msgstr "Il n’y a pas encore de forks." -#: rhodecode/templates/journal/journal.html:13 +#: rhodecode/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "Flux ATOM du journal" -#: rhodecode/templates/journal/journal.html:14 +#: rhodecode/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "Flux RSS du journal" -#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/journal/journal.html:32 #: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "Rafraîchir" -#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 msgid "RSS feed" msgstr "Flux RSS" -#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/journal.html:38 #: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "Flux ATOM" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "Watched" msgstr "Surveillé" -#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:54 msgid "ADD" msgstr "AJOUTER" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "following user" msgstr "utilisateur suivant" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "user" msgstr "utilisateur" -#: rhodecode/templates/journal/journal.html:102 +#: rhodecode/templates/journal/journal.html:110 msgid "You are not following any users or repositories" msgstr "Vous ne suivez aucun utilisateur ou dépôt" -#: rhodecode/templates/journal/journal_data.html:51 +#: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" msgstr "Aucune entrée pour le moment" @@ -4031,6 +4039,11 @@ msgid "Compare view" msgstr "Vue de comparaison" +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#, fuzzy +msgid "reviewer" +msgstr "%d relecteur" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 msgid "all pull requests" msgstr "Requêtes de pull" @@ -4095,6 +4108,16 @@ msgid "%s Settings" msgstr "Réglages de %s" +#: rhodecode/templates/settings/repo_settings.html:102 +#, fuzzy +msgid "Delete repository" +msgstr "[a supprimé] le dépôt" + +#: rhodecode/templates/settings/repo_settings.html:109 +#, fuzzy +msgid "Remove repo" +msgstr "Enlever" + #: rhodecode/templates/shortlog/shortlog.html:5 #, python-format msgid "%s Shortlog" @@ -4298,3 +4321,29 @@ msgid "Compare tags" msgstr "Comparer" +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was created or renamed" +#~ " from the file system please run " +#~ "the application again in order to " +#~ "rescan repositories" +#~ msgstr "" +#~ "Le dépôt %s n’est pas représenté " +#~ "dans la base de données. Il a " +#~ "probablement été créé ou renommé " +#~ "manuellement. Veuillez relancer l’application " +#~ "pour rescanner les dépôts." + +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was moved or renamed " +#~ "from the filesystem please run the " +#~ "application again in order to rescan " +#~ "repositories" +#~ msgstr "" +#~ "Le dépôt %s n’est pas représenté " +#~ "dans la base de données. Il a " +#~ "probablement été déplacé ou renommé " +#~ "manuellement. Veuillez relancer l’application " +#~ "pour rescanner les dépôts." +
--- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Fri Dec 14 04:26:15 2012 +0100 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-03 03:21+0100\n" +"POT-Creation-Date: 2012-12-14 04:19+0100\n" "PO-Revision-Date: 2012-10-27 15:06+0900\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: ja <LL@li.org>\n" @@ -26,33 +26,33 @@ msgid "All Branches" msgstr "すべてのブランチ" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "空白を表示" -#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "空白を無視" -#: rhodecode/controllers/changeset.py:164 +#: rhodecode/controllers/changeset.py:163 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:315 -#: rhodecode/controllers/pullrequests.py:411 +#: rhodecode/controllers/changeset.py:314 +#: rhodecode/controllers/pullrequests.py:417 #, fuzzy, python-format msgid "Status change -> %s" msgstr "" -#: rhodecode/controllers/changeset.py:346 +#: rhodecode/controllers/changeset.py:345 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" #: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/pullrequests.py:121 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "まだ変更がありません" @@ -94,8 +94,8 @@ msgstr "%s %s フィード" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:126 -#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/changeset/changeset.html:137 +#: rhodecode/templates/changeset/changeset.html:149 #: rhodecode/templates/compare/compare_diff.html:62 #: rhodecode/templates/compare/compare_diff.html:73 #: rhodecode/templates/pullrequests/pullrequest_show.html:94 @@ -175,52 +175,33 @@ msgid "Changesets" msgstr "チェンジセット" -#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "ブランチ" -#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "タグ" -#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" -"%s " -"リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" - -#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the file system please run the application again in order to rescan " -"repositories" -msgstr "" -"%s " -"リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" - -#: rhodecode/controllers/forks.py:168 +#: rhodecode/controllers/forks.py:158 #, python-format msgid "forked %s repository as %s" msgstr "リポジトリ %s を %s としてフォーク" -#: rhodecode/controllers/forks.py:182 +#: rhodecode/controllers/forks.py:172 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261 msgid "public journal" msgstr "公開ジャーナル" -#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265 #: rhodecode/templates/base/base.html:232 +#: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "ジャーナル" @@ -238,30 +219,34 @@ "email" msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました" -#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 +#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "ブックマーク" -#: rhodecode/controllers/pullrequests.py:186 +#: rhodecode/controllers/pullrequests.py:190 msgid "Pull request requires a title with min. 3 chars" msgstr "プルリクエストには3文字以上のタイトルが必要です" -#: rhodecode/controllers/pullrequests.py:188 +#: rhodecode/controllers/pullrequests.py:192 msgid "error during creation of pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:220 +#: rhodecode/controllers/pullrequests.py:224 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストを作成しました" -#: rhodecode/controllers/pullrequests.py:223 +#: rhodecode/controllers/pullrequests.py:227 msgid "Error occurred during sending pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:256 +#: rhodecode/controllers/pullrequests.py:260 msgid "Successfully deleted pull request" msgstr "プルリクエストを削除しました" +#: rhodecode/controllers/pullrequests.py:452 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + #: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "無効な検索クエリーです。\\\"で囲んで下さい" @@ -274,59 +259,48 @@ msgid "An error occurred during this search operation" msgstr "検索を実行する際にエラーがおきました" -#: rhodecode/controllers/settings.py:108 -#: rhodecode/controllers/admin/repos.py:268 +#: rhodecode/controllers/settings.py:119 +#: rhodecode/controllers/admin/repos.py:272 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/settings.py:137 +#: rhodecode/controllers/admin/repos.py:290 #, python-format msgid "error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:304 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was moved or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" -"%s " -"リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" - -#: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:316 +#: rhodecode/controllers/settings.py:162 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "リポジトリ %s を削除しました" -#: rhodecode/controllers/settings.py:160 -#: rhodecode/controllers/admin/repos.py:326 -#: rhodecode/controllers/admin/repos.py:332 +#: rhodecode/controllers/settings.py:166 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "リポジトリ %s の削除中にエラーが発生しました" -#: rhodecode/controllers/settings.py:179 +#: rhodecode/controllers/settings.py:185 #, fuzzy msgid "unlocked" msgstr "変更可能にする" -#: rhodecode/controllers/settings.py:182 +#: rhodecode/controllers/settings.py:188 #, fuzzy msgid "locked" msgstr "変更可能にする" -#: rhodecode/controllers/settings.py:184 +#: rhodecode/controllers/settings.py:190 #, fuzzy, python-format msgid "Repository has been %s" msgstr "" -#: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:424 +#: rhodecode/controllers/settings.py:194 +#: rhodecode/controllers/admin/repos.py:423 msgid "An error occurred during unlocking" msgstr "アンロック時にエラーが発生しました" @@ -477,76 +451,76 @@ msgid "error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:125 +#: rhodecode/controllers/admin/repos.py:121 msgid "--REMOVE FORK--" msgstr "--フォーク元を削除--" -#: rhodecode/controllers/admin/repos.py:194 +#: rhodecode/controllers/admin/repos.py:190 #, python-format msgid "created repository %s from %s" msgstr "リポジトリ %s を %s から作成" -#: rhodecode/controllers/admin/repos.py:198 +#: rhodecode/controllers/admin/repos.py:194 #, python-format msgid "created repository %s" msgstr "リポジトリ %s を作成しました" -#: rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/admin/repos.py:225 #, python-format msgid "error occurred during creation of repository %s" msgstr "リポジトリ %s を作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:321 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:350 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "リポジトリユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "リポジトリユーザーグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:404 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化時にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:444 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:448 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "トークンが合いません" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "リモートから取得" -#: rhodecode/controllers/admin/repos.py:468 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "ありません" -#: rhodecode/controllers/admin/repos.py:486 +#: rhodecode/controllers/admin/repos.py:485 #, python-format msgid "Marked repo %s as fork of %s" msgstr "%s リポジトリを %s のフォークとして印をつける" -#: rhodecode/controllers/admin/repos.py:490 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" @@ -782,152 +756,162 @@ msgid "No changes detected" msgstr "検出された変更はありません" -#: rhodecode/lib/helpers.py:373 +#: rhodecode/lib/helpers.py:374 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%a, %d %b %Y %H:%M:%S" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 msgid "True" msgstr "True" -#: rhodecode/lib/helpers.py:489 +#: rhodecode/lib/helpers.py:490 msgid "False" msgstr "False" -#: rhodecode/lib/helpers.py:529 +#: rhodecode/lib/helpers.py:530 #, fuzzy, python-format msgid "Deleted branch: %s" msgstr "リポジトリ %s を削除しました" -#: rhodecode/lib/helpers.py:532 +#: rhodecode/lib/helpers.py:533 #, fuzzy, python-format msgid "Created tag: %s" msgstr "ユーザー %s を作成しました" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:546 msgid "Changeset not found" msgstr "リビジョンが見つかりません" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:589 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:595 msgid "compare view" msgstr "比較の表示" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:615 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:616 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "リビジョン" -#: rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:641 #, fuzzy, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/helpers.py:653 +#: rhodecode/lib/helpers.py:658 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "プルリクエスト #%s" -#: rhodecode/lib/helpers.py:659 +#: rhodecode/lib/helpers.py:664 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 +#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: rhodecode/lib/helpers.py:663 +#: rhodecode/lib/helpers.py:668 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 +#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 +#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: rhodecode/lib/helpers.py:669 +#: rhodecode/lib/helpers.py:674 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:677 +#: rhodecode/lib/helpers.py:682 msgid "[created] user" msgstr "ユーザーを[作成]" -#: rhodecode/lib/helpers.py:679 +#: rhodecode/lib/helpers.py:684 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: rhodecode/lib/helpers.py:681 +#: rhodecode/lib/helpers.py:686 msgid "[created] users group" msgstr "ユーザーグループを[作成]" -#: rhodecode/lib/helpers.py:683 +#: rhodecode/lib/helpers.py:688 msgid "[updated] users group" msgstr "ユーザーグループを[更新]" -#: rhodecode/lib/helpers.py:685 +#: rhodecode/lib/helpers.py:690 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: rhodecode/lib/helpers.py:687 +#: rhodecode/lib/helpers.py:692 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: rhodecode/lib/helpers.py:689 +#: rhodecode/lib/helpers.py:694 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: rhodecode/lib/helpers.py:691 +#: rhodecode/lib/helpers.py:696 msgid "[pushed] into" msgstr "[プッシュ]" -#: rhodecode/lib/helpers.py:693 +#: rhodecode/lib/helpers.py:698 msgid "[committed via RhodeCode] into repository" msgstr "リポジトリに[RhodeCode経由でコミット]" -#: rhodecode/lib/helpers.py:695 +#: rhodecode/lib/helpers.py:700 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: rhodecode/lib/helpers.py:697 +#: rhodecode/lib/helpers.py:702 msgid "[pulled] from" msgstr "[プル]" -#: rhodecode/lib/helpers.py:699 +#: rhodecode/lib/helpers.py:704 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: rhodecode/lib/helpers.py:701 +#: rhodecode/lib/helpers.py:706 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: rhodecode/lib/helpers.py:877 +#: rhodecode/lib/helpers.py:883 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: rhodecode/lib/helpers.py:881 +#: rhodecode/lib/helpers.py:887 msgid "No Files" msgstr "ファイルなし" +#: rhodecode/lib/helpers.py:1163 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" +"%s " +"リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" + #: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" @@ -992,83 +976,83 @@ msgid "password reset link" msgstr "パスワードリセットのリンク" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183 msgid "Repository no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184 msgid "Repository read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185 msgid "Repository write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186 msgid "Repository admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188 msgid "Repositories Group no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189 msgid "Repositories Group read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190 msgid "Repositories Group write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193 msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194 msgid "Repository creation disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195 msgid "Repository creation enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196 msgid "Repository forking disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197 msgid "Repository forking enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198 msgid "Register disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643 msgid "Not Reviewed" msgstr "未レビュー" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644 msgid "Approved" msgstr "承認" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645 msgid "Rejected" msgstr "却下" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646 msgid "Under Review" msgstr "レビュー中" @@ -1138,20 +1122,20 @@ msgid "latest tip" msgstr "最新のtip" -#: rhodecode/model/user.py:230 +#: rhodecode/model/user.py:232 msgid "new user registration" msgstr "新規ユーザー登録" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 -#: rhodecode/model/user.py:301 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 +#: rhodecode/model/user.py:303 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:325 +#: rhodecode/model/user.py:327 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:331 +#: rhodecode/model/user.py:333 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1275,26 +1259,26 @@ msgid "This username or users group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: rhodecode/model/validators.py:582 +#: rhodecode/model/validators.py:591 msgid "This is not a valid path" msgstr "不正なパスです" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:606 msgid "This e-mail address is already taken" msgstr "このメールアドレスはすでに取得されています" -#: rhodecode/model/validators.py:617 +#: rhodecode/model/validators.py:626 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "メールアドレス \"%(email)s\" は存在しません" -#: rhodecode/model/validators.py:654 +#: rhodecode/model/validators.py:663 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです" -#: rhodecode/model/validators.py:673 +#: rhodecode/model/validators.py:682 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1310,7 +1294,8 @@ #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:40 +#: rhodecode/templates/journal/journal.html:9 +#: rhodecode/templates/journal/journal.html:48 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "クイックフィルタ..." @@ -1376,8 +1361,8 @@ #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:62 -#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal.html:70 +#: rhodecode/templates/journal/journal.html:196 #: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 @@ -1394,7 +1379,7 @@ #: rhodecode/templates/index_base.html:74 #: rhodecode/templates/index_base.html:179 #: rhodecode/templates/admin/users/user_edit_my_account.html:182 -#: rhodecode/templates/journal/journal.html:170 +#: rhodecode/templates/journal/journal.html:198 msgid "Tip" msgstr "Tip" @@ -1424,7 +1409,7 @@ #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:221 #: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "昇順で並び換え" @@ -1437,7 +1422,7 @@ #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/journal/journal.html:222 #: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "降順で並び替え" @@ -1454,7 +1439,7 @@ #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:223 #: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "レコードが見つかりません" @@ -1466,7 +1451,7 @@ #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/journal/journal.html:224 #: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "データエラー" @@ -1478,8 +1463,8 @@ #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:54 -#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:225 #: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "読み込み中..." @@ -1627,10 +1612,28 @@ msgstr "まだブックマークがありません" #: rhodecode/templates/admin/admin.html:5 -#: rhodecode/templates/admin/admin.html:9 +#: rhodecode/templates/admin/admin.html:13 msgid "Admin journal" msgstr "管理者ジャーナル" +#: rhodecode/templates/admin/admin.html:10 +#, fuzzy +msgid "journal filter..." +msgstr "クイックフィルタ..." + +#: rhodecode/templates/admin/admin.html:12 +#: rhodecode/templates/journal/journal.html:11 +#, fuzzy +msgid "filter" +msgstr "ファイル" + +#: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/journal/journal.html:12 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" + #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 @@ -1659,7 +1662,7 @@ msgid "From IP" msgstr "アクセス元IPアドレス" -#: rhodecode/templates/admin/admin_log.html:57 +#: rhodecode/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "まだアクションがありません" @@ -1730,7 +1733,7 @@ #: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "保存" @@ -2017,7 +2020,7 @@ #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:94 +#: rhodecode/templates/settings/repo_settings.html:95 msgid "Reset" msgstr "リセット" @@ -2159,19 +2162,22 @@ msgstr "削除" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Remove this repository" msgstr "このリポジトリを削除" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Confirm to delete this repository" msgstr "このリポジトリを削除しますか？" #: rhodecode/templates/admin/repos/repo_edit.html:282 +#: rhodecode/templates/settings/repo_settings.html:119 +#, fuzzy msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem " -"please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need fully delete it " +"from file system please do it manually" msgstr "" "このリポジトリはRhodeCodeとVCSシステムからアクセスされないような名前に、特別な方法で変更されます。\n" "もし、ファイルシステムから完全に削除したい場合、手動で行ってください" @@ -2205,7 +2211,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/journal/journal.html:95 #: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "非公開リポジトリ" @@ -2710,7 +2716,7 @@ msgstr "権限" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "My repos" msgstr "リポジトリ" @@ -2924,7 +2930,6 @@ #: rhodecode/templates/base/base.html:324 #: rhodecode/templates/base/base.html:326 #: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "ジャーナル" @@ -3059,7 +3064,7 @@ msgstr "別のコメントを追加" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:75 +#: rhodecode/templates/journal/journal.html:83 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" @@ -3167,7 +3172,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" @@ -3179,23 +3184,22 @@ msgstr "関連するプルリクエストを開く" #: rhodecode/templates/changelog/changelog.html:104 -#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "親リビジョン" #: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changeset/changeset.html:42 msgid "No parents" msgstr "親リビジョンはありません" #: rhodecode/templates/changelog/changelog.html:115 -#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:106 #: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "マージ" #: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:109 #: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -3210,7 +3214,7 @@ msgstr "ブックマーク" #: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:114 #: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "タグ" @@ -3220,26 +3224,26 @@ msgstr "まだ変更がありません" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:73 +#: rhodecode/templates/changeset/changeset.html:94 msgid "removed" msgstr "削除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:74 +#: rhodecode/templates/changeset/changeset.html:95 msgid "changed" msgstr "変更" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:75 +#: rhodecode/templates/changeset/changeset.html:96 msgid "added" msgstr "追加" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:77 -#: rhodecode/templates/changeset/changeset.html:78 -#: rhodecode/templates/changeset/changeset.html:79 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:99 +#: rhodecode/templates/changeset/changeset.html:100 #, python-format msgid "affected %s files" msgstr "%s ファイルに影響" @@ -3253,36 +3257,40 @@ msgid "Changeset" msgstr "チェンジセット" -#: rhodecode/templates/changeset/changeset.html:49 +#: rhodecode/templates/changeset/changeset.html:52 +msgid "No children" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:70 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "差分を表示" -#: rhodecode/templates/changeset/changeset.html:50 +#: rhodecode/templates/changeset/changeset.html:71 #, fuzzy msgid "patch diff" msgstr "差分を表示" -#: rhodecode/templates/changeset/changeset.html:51 +#: rhodecode/templates/changeset/changeset.html:72 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "差分をダウンロード" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d コメント" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "(%d インライン)" -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset.html:122 #: rhodecode/templates/compare/compare_diff.html:44 #: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, fuzzy, python-format @@ -3290,7 +3298,7 @@ msgid_plural "%s files changed" msgstr[0] "" -#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/changeset/changeset.html:124 #: rhodecode/templates/compare/compare_diff.html:46 #: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, fuzzy, python-format @@ -3318,7 +3326,7 @@ msgstr "テキスト内で @username を使うと、この RhodeCode のユーザーに通知を送信します" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:138 +#: rhodecode/templates/changeset/changeset_file_comment.html:143 msgid "Comment" msgstr "コメント" @@ -3339,15 +3347,15 @@ msgid "Leave a comment" msgstr "コメントを残す" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "change status" msgstr "ステータスを変更する" -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 msgid "Comment and close" msgstr "コメントしてクローズ" @@ -3402,19 +3410,19 @@ msgstr "フォーク" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal.html:89 #: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Mercurialリポジトリ" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/journal/journal.html:91 #: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Gitリポジトリ" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/journal/journal.html:97 #: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "公開リポジトリ" @@ -3792,50 +3800,50 @@ msgid "There are no forks yet" msgstr "まだフォークがありません" -#: rhodecode/templates/journal/journal.html:13 +#: rhodecode/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "ATOM ジャーナルフィード" -#: rhodecode/templates/journal/journal.html:14 +#: rhodecode/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "RSS ジャーナルフィード" -#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/journal/journal.html:32 #: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "更新" -#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 msgid "RSS feed" msgstr "RSSフィード" -#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/journal.html:38 #: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "ATOMフィード" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "Watched" msgstr "ウォッチ" -#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:54 msgid "ADD" msgstr "追加" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "following user" msgstr "フォローしているユーザー" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "user" msgstr "ユーザー" -#: rhodecode/templates/journal/journal.html:102 +#: rhodecode/templates/journal/journal.html:110 msgid "You are not following any users or repositories" msgstr "まだどのユーザーもリポジトリもフォローしていません" -#: rhodecode/templates/journal/journal_data.html:51 +#: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" msgstr "まだエントリがありません" @@ -3934,6 +3942,11 @@ msgid "Compare view" msgstr "比較ビュー" +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#, fuzzy +msgid "reviewer" +msgstr "%d レビュアー" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 msgid "all pull requests" msgstr "すべてのプルリクエスト" @@ -3998,6 +4011,16 @@ msgid "%s Settings" msgstr "%s 設定" +#: rhodecode/templates/settings/repo_settings.html:102 +#, fuzzy +msgid "Delete repository" +msgstr "リポジトリを[削除]" + +#: rhodecode/templates/settings/repo_settings.html:109 +#, fuzzy +msgid "Remove repo" +msgstr "削除" + #: rhodecode/templates/shortlog/shortlog.html:5 #, python-format msgid "%s Shortlog" @@ -4201,3 +4224,23 @@ msgid "Compare tags" msgstr "比較" +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was created or renamed" +#~ " from the file system please run " +#~ "the application again in order to " +#~ "rescan repositories" +#~ msgstr "" +#~ "%s " +#~ "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" + +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was moved or renamed " +#~ "from the filesystem please run the " +#~ "application again in order to rescan " +#~ "repositories" +#~ msgstr "" +#~ "%s " +#~ "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" +
--- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Fri Dec 14 04:26:15 2012 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: rhodecode 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-03 03:21+0100\n" +"POT-Creation-Date: 2012-12-14 04:19+0100\n" "PO-Revision-Date: 2012-11-25 03:42+0200\n" "Last-Translator: Nemo <areczek01@gmail.com>\n" "Language-Team: Test\n" @@ -23,26 +23,26 @@ msgid "All Branches" msgstr "Wszystkie gałęzie" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "pokazuj spacje" -#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "ignoruj pokazywanie spacji" -#: rhodecode/controllers/changeset.py:164 +#: rhodecode/controllers/changeset.py:163 #, python-format msgid "%s line context" msgstr "%s linia w kontekście" -#: rhodecode/controllers/changeset.py:315 -#: rhodecode/controllers/pullrequests.py:411 +#: rhodecode/controllers/changeset.py:314 +#: rhodecode/controllers/pullrequests.py:417 #, python-format msgid "Status change -> %s" msgstr "Zmiana statusu -> %s" -#: rhodecode/controllers/changeset.py:346 +#: rhodecode/controllers/changeset.py:345 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" @@ -51,7 +51,7 @@ "niedozwolona" #: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/pullrequests.py:121 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" @@ -97,8 +97,8 @@ msgstr "%s %s zasilać" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:126 -#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/changeset/changeset.html:137 +#: rhodecode/templates/changeset/changeset.html:149 #: rhodecode/templates/compare/compare_diff.html:62 #: rhodecode/templates/compare/compare_diff.html:73 #: rhodecode/templates/pullrequests/pullrequest_show.html:94 @@ -178,54 +178,33 @@ msgid "Changesets" msgstr "Różnice" -#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "Gałęzie" -#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "Etykiety" -#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" -"%s repozytorium nie jest mapowane do db może zostało utworzone lub " -"zmienione z systemie plików proszę uruchomić aplikację ponownie, aby " -"ponownie przeskanować repozytoria" - -#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the file system please run the application again in order to rescan " -"repositories" -msgstr "" -"%s repozytorium nie jest mapowane do db może zostało utworzone lub " -"zmienione z systemu plików proszę uruchomić aplikację ponownie, aby " -"ponownie przeskanować repozytoria" - -#: rhodecode/controllers/forks.py:168 +#: rhodecode/controllers/forks.py:158 #, python-format msgid "forked %s repository as %s" msgstr "gałęzi %s w repozytorium %s" -#: rhodecode/controllers/forks.py:182 +#: rhodecode/controllers/forks.py:172 #, python-format msgid "An error occurred during repository forking %s" msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261 msgid "public journal" msgstr "Dziennik publiczny" -#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265 #: rhodecode/templates/base/base.html:232 +#: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "dziennik" @@ -243,30 +222,34 @@ "email" msgstr "Twoje hasło zostało zresetowane, nowe hasło zostanie wysłane na e-mail" -#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 +#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "Zakładki" -#: rhodecode/controllers/pullrequests.py:186 +#: rhodecode/controllers/pullrequests.py:190 msgid "Pull request requires a title with min. 3 chars" msgstr "Wniosek połączenia gałęzi wymaga tytułu z min. 3 znakami" -#: rhodecode/controllers/pullrequests.py:188 +#: rhodecode/controllers/pullrequests.py:192 msgid "error during creation of pull request" msgstr "błąd podczas tworzenia prośby o łączenie gałęzi" -#: rhodecode/controllers/pullrequests.py:220 +#: rhodecode/controllers/pullrequests.py:224 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: rhodecode/controllers/pullrequests.py:223 +#: rhodecode/controllers/pullrequests.py:227 msgid "Error occurred during sending pull request" msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" -#: rhodecode/controllers/pullrequests.py:256 +#: rhodecode/controllers/pullrequests.py:260 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" +#: rhodecode/controllers/pullrequests.py:452 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + #: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Nieprawidłowe zapytania. Spróbuj zacytować go." @@ -279,58 +262,46 @@ msgid "An error occurred during this search operation" msgstr "Wystąpił błąd podczas wyszukiwania tej operacji" -#: rhodecode/controllers/settings.py:108 -#: rhodecode/controllers/admin/repos.py:268 +#: rhodecode/controllers/settings.py:119 +#: rhodecode/controllers/admin/repos.py:272 #, python-format msgid "Repository %s updated successfully" msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/settings.py:137 +#: rhodecode/controllers/admin/repos.py:290 #, python-format msgid "error occurred during update of repository %s" msgstr "wystąpił błąd podczas aktualizacji repozytorium %s" -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:304 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was moved or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" -"%s repozytorium nie jest mapowane do db może zostało przeniesione lub " -"zmienione w systemie plików proszę uruchomić aplikację ponownie, aby " -"ponownie przeskanować repozytoria" - -#: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:316 +#: rhodecode/controllers/settings.py:162 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "usunięte repozytorium %s" -#: rhodecode/controllers/settings.py:160 -#: rhodecode/controllers/admin/repos.py:326 -#: rhodecode/controllers/admin/repos.py:332 +#: rhodecode/controllers/settings.py:166 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "Wystąpił błąd podczas usuwania %s" -#: rhodecode/controllers/settings.py:179 +#: rhodecode/controllers/settings.py:185 msgid "unlocked" msgstr "Odblokowany" -#: rhodecode/controllers/settings.py:182 +#: rhodecode/controllers/settings.py:188 msgid "locked" msgstr "zablokowany" -#: rhodecode/controllers/settings.py:184 +#: rhodecode/controllers/settings.py:190 #, python-format msgid "Repository has been %s" msgstr "Repozytoriów jest %s" -#: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:424 +#: rhodecode/controllers/settings.py:194 +#: rhodecode/controllers/admin/repos.py:423 msgid "An error occurred during unlocking" msgstr "Wystąpił błąd podczas odblokowywania" @@ -481,76 +452,76 @@ msgid "error occurred during update of permissions" msgstr "wystąpił błąd podczas aktualizacji uprawnień" -#: rhodecode/controllers/admin/repos.py:125 +#: rhodecode/controllers/admin/repos.py:121 msgid "--REMOVE FORK--" msgstr "--USUŃ ROZGAŁĘZIENIE--" -#: rhodecode/controllers/admin/repos.py:194 +#: rhodecode/controllers/admin/repos.py:190 #, python-format msgid "created repository %s from %s" msgstr "utworzone repozytorium %s z %s" -#: rhodecode/controllers/admin/repos.py:198 +#: rhodecode/controllers/admin/repos.py:194 #, python-format msgid "created repository %s" msgstr "utworzone repozytorium %s" -#: rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/admin/repos.py:225 #, python-format msgid "error occurred during creation of repository %s" msgstr "wystąpił błąd podczas tworzenia repozytorium %s" -#: rhodecode/controllers/admin/repos.py:321 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Nie można usunąć %s nadal zawiera załączniki rozgałęzienia" -#: rhodecode/controllers/admin/repos.py:350 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "Wystąpił błąd podczas usunięcia użytkownika z repozytorium" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "Wystąpił błąd podczas usunięcia grupy użytkowników z repozytorium" -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" -#: rhodecode/controllers/admin/repos.py:404 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "Wystąpił błąd podczas unieważniania cache" -#: rhodecode/controllers/admin/repos.py:444 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" -#: rhodecode/controllers/admin/repos.py:448 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" -#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "Niezgodność tokenu" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "Pobieranie z lokalizacji zdalnej" -#: rhodecode/controllers/admin/repos.py:468 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "Brak" -#: rhodecode/controllers/admin/repos.py:486 +#: rhodecode/controllers/admin/repos.py:485 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" -#: rhodecode/controllers/admin/repos.py:490 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "Wystąpił błąd podczas tej operacji" @@ -792,152 +763,163 @@ msgid "No changes detected" msgstr "Nie wykryto zmian" -#: rhodecode/lib/helpers.py:373 +#: rhodecode/lib/helpers.py:374 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%d.%m.%Y, %H:%M:%S" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 msgid "True" msgstr "Prawda" -#: rhodecode/lib/helpers.py:489 +#: rhodecode/lib/helpers.py:490 msgid "False" msgstr "Fałsz" -#: rhodecode/lib/helpers.py:529 +#: rhodecode/lib/helpers.py:530 #, python-format msgid "Deleted branch: %s" msgstr "Usunięta gałąź: %s" -#: rhodecode/lib/helpers.py:532 +#: rhodecode/lib/helpers.py:533 #, python-format msgid "Created tag: %s" msgstr "Utworzony tag: %s" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:546 msgid "Changeset not found" msgstr "Nie znaleziono changeset" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:589 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Pokaż wszystkie zestawienia zmian changesets %s->%s" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:595 msgid "compare view" msgstr "Wyświetl porównanie" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:615 msgid "and" msgstr "i" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:616 #, python-format msgid "%s more" msgstr "%s więcej" -#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "rewizja" -#: rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:641 #, python-format msgid "fork name %s" msgstr "nazwa rozgałęzienia %s" -#: rhodecode/lib/helpers.py:653 +#: rhodecode/lib/helpers.py:658 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "Połączonych gałęzi #%s" -#: rhodecode/lib/helpers.py:659 +#: rhodecode/lib/helpers.py:664 msgid "[deleted] repository" msgstr "[usunięte] repozytorium" -#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 +#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 msgid "[created] repository" msgstr "[utworzone] repozytorium" -#: rhodecode/lib/helpers.py:663 +#: rhodecode/lib/helpers.py:668 msgid "[created] repository as fork" msgstr "[utworzone] repozytorium jako rozgałęzienie" -#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 +#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 msgid "[forked] repository" msgstr "[rozgałęzione] repozytorium" -#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 +#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 msgid "[updated] repository" msgstr "[zaktualizowane] repozytorium" -#: rhodecode/lib/helpers.py:669 +#: rhodecode/lib/helpers.py:674 msgid "[delete] repository" msgstr "[skasowane] repozytorium" -#: rhodecode/lib/helpers.py:677 +#: rhodecode/lib/helpers.py:682 msgid "[created] user" msgstr "[utworzony] użytkownik" -#: rhodecode/lib/helpers.py:679 +#: rhodecode/lib/helpers.py:684 msgid "[updated] user" msgstr "[zaktualizowany] użytkownik" -#: rhodecode/lib/helpers.py:681 +#: rhodecode/lib/helpers.py:686 msgid "[created] users group" msgstr "[utworzona] grupa użytkowników" -#: rhodecode/lib/helpers.py:683 +#: rhodecode/lib/helpers.py:688 msgid "[updated] users group" msgstr "[zaktualizowana] grupa użytkowników" -#: rhodecode/lib/helpers.py:685 +#: rhodecode/lib/helpers.py:690 msgid "[commented] on revision in repository" msgstr "[komentarz] do zmiany w repozytorium" -#: rhodecode/lib/helpers.py:687 +#: rhodecode/lib/helpers.py:692 msgid "[commented] on pull request for" msgstr "[komentarz] wniosek o połączenie gałęzi" -#: rhodecode/lib/helpers.py:689 +#: rhodecode/lib/helpers.py:694 msgid "[closed] pull request for" msgstr "[zamknięty] wniosek o połączenie gałęzi" -#: rhodecode/lib/helpers.py:691 +#: rhodecode/lib/helpers.py:696 msgid "[pushed] into" msgstr "[wysłane zmiany] w" -#: rhodecode/lib/helpers.py:693 +#: rhodecode/lib/helpers.py:698 msgid "[committed via RhodeCode] into repository" msgstr "[committed przez RhodeCode] do repozytorium" -#: rhodecode/lib/helpers.py:695 +#: rhodecode/lib/helpers.py:700 msgid "[pulled from remote] into repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: rhodecode/lib/helpers.py:697 +#: rhodecode/lib/helpers.py:702 msgid "[pulled] from" msgstr "[pobrano] z" -#: rhodecode/lib/helpers.py:699 +#: rhodecode/lib/helpers.py:704 msgid "[started following] repository" msgstr "[start następnego] repozytorium" -#: rhodecode/lib/helpers.py:701 +#: rhodecode/lib/helpers.py:706 msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: rhodecode/lib/helpers.py:877 +#: rhodecode/lib/helpers.py:883 #, python-format msgid " and %s more" msgstr "i %s więcej" -#: rhodecode/lib/helpers.py:881 +#: rhodecode/lib/helpers.py:887 msgid "No Files" msgstr "Brak Plików" +#: rhodecode/lib/helpers.py:1163 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" +"%s repozytorium nie jest mapowane do db może zostało utworzone lub " +"zmienione z systemie plików proszę uruchomić aplikację ponownie, aby " +"ponownie przeskanować repozytoria" + #: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" @@ -1014,83 +996,83 @@ msgid "password reset link" msgstr "łącze resetowania hasła" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183 msgid "Repository no access" msgstr "Brak dostępu do repozytorium" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184 msgid "Repository read access" msgstr "Repozytorium do odczytu" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185 msgid "Repository write access" msgstr "Repozytorium do zapisu" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186 msgid "Repository admin access" msgstr "Administracja dostępu do repozytorium" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188 msgid "Repositories Group no access" msgstr "Grupy repozytoriów brak dostępu" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189 msgid "Repositories Group read access" msgstr "Grupy repozytoriów dostęp do odczytu" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190 msgid "Repositories Group write access" msgstr "Grupy repozytoriów dostęp do zapisu" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191 msgid "Repositories Group admin access" msgstr "Repozytoria Grupy dostęp administratora" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193 msgid "RhodeCode Administrator" msgstr "Administrator Repo" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194 msgid "Repository creation disabled" msgstr "Repozytorium wyłączone" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195 msgid "Repository creation enabled" msgstr "Repozytorium włączone" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196 msgid "Repository forking disabled" msgstr "Rozwidlenie repozytorium wyłączone" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197 msgid "Repository forking enabled" msgstr "Rozwidlenie repozytorium włączone" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198 msgid "Register disabled" msgstr "Rejestracja wyłączona" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199 msgid "Register new user with RhodeCode with manual activation" msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202 msgid "Register new user with RhodeCode with auto activation" msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643 msgid "Not Reviewed" msgstr "Brak Korekty" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644 msgid "Approved" msgstr "Zaakceptowano" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645 msgid "Rejected" msgstr "Odrzucono" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646 msgid "Under Review" msgstr "Objęty Przeglądem" @@ -1160,24 +1142,24 @@ msgid "latest tip" msgstr "ostatni tip" -#: rhodecode/model/user.py:230 +#: rhodecode/model/user.py:232 msgid "new user registration" msgstr "nowy użytkownik się zarejestrował" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 -#: rhodecode/model/user.py:301 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 +#: rhodecode/model/user.py:303 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: rhodecode/model/user.py:325 +#: rhodecode/model/user.py:327 msgid "You can't remove this user since it's crucial for entire application" msgstr "" "Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: rhodecode/model/user.py:331 +#: rhodecode/model/user.py:333 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1304,20 +1286,20 @@ msgid "This username or users group name is not valid" msgstr "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa" -#: rhodecode/model/validators.py:582 +#: rhodecode/model/validators.py:591 msgid "This is not a valid path" msgstr "To nie jest prawidłowa ścieżka" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:606 msgid "This e-mail address is already taken" msgstr "Ten adres e-mail jest już zajęty" -#: rhodecode/model/validators.py:617 +#: rhodecode/model/validators.py:626 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "e-mail \"%(email)s\" nie istnieje." -#: rhodecode/model/validators.py:654 +#: rhodecode/model/validators.py:663 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1325,7 +1307,7 @@ "Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, " "który jest odpowiednikiem \"username\"" -#: rhodecode/model/validators.py:673 +#: rhodecode/model/validators.py:682 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "Rewizja %(revs)s jest już częścią nowej gałęzi więc określ jego status" @@ -1341,7 +1323,8 @@ #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:40 +#: rhodecode/templates/journal/journal.html:9 +#: rhodecode/templates/journal/journal.html:48 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "szybki filtr..." @@ -1407,8 +1390,8 @@ #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:62 -#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal.html:70 +#: rhodecode/templates/journal/journal.html:196 #: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 @@ -1425,7 +1408,7 @@ #: rhodecode/templates/index_base.html:74 #: rhodecode/templates/index_base.html:179 #: rhodecode/templates/admin/users/user_edit_my_account.html:182 -#: rhodecode/templates/journal/journal.html:170 +#: rhodecode/templates/journal/journal.html:198 msgid "Tip" msgstr "Ostatnia zmiana" @@ -1455,7 +1438,7 @@ #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:221 #: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "Kliknij, aby posortować rosnąco" @@ -1468,7 +1451,7 @@ #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/journal/journal.html:222 #: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "Kliknij, aby posortować malejąco" @@ -1485,7 +1468,7 @@ #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:223 #: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "Nie znaleziono rekordów." @@ -1497,7 +1480,7 @@ #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/journal/journal.html:224 #: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "Błąd danych." @@ -1509,8 +1492,8 @@ #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:54 -#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:225 #: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "Wczytywanie..." @@ -1658,10 +1641,30 @@ msgstr "Nie ma jeszcze zakładek" #: rhodecode/templates/admin/admin.html:5 -#: rhodecode/templates/admin/admin.html:9 +#: rhodecode/templates/admin/admin.html:13 msgid "Admin journal" msgstr "Dziennik administratora" +#: rhodecode/templates/admin/admin.html:10 +#, fuzzy +msgid "journal filter..." +msgstr "szybki filtr..." + +#: rhodecode/templates/admin/admin.html:12 +#: rhodecode/templates/journal/journal.html:11 +#, fuzzy +msgid "filter" +msgstr "pliki" + +#: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/journal/journal.html:12 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 @@ -1690,7 +1693,7 @@ msgid "From IP" msgstr "z IP" -#: rhodecode/templates/admin/admin_log.html:57 +#: rhodecode/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "Brak akcji" @@ -1763,7 +1766,7 @@ #: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "Zapisz" @@ -2056,7 +2059,7 @@ #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:94 +#: rhodecode/templates/settings/repo_settings.html:95 msgid "Reset" msgstr "Zresetuj" @@ -2204,24 +2207,26 @@ msgstr "Usuń" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Remove this repository" msgstr "Usuń to repozytorium" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Confirm to delete this repository" msgstr "Potwierdź, aby usunąć repozytorium" #: rhodecode/templates/admin/repos/repo_edit.html:282 +#: rhodecode/templates/settings/repo_settings.html:119 +#, fuzzy msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem " -"please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need fully delete it " +"from file system please do it manually" msgstr "" "To repozytorium zostanie zmienione w sposób szczególny, żeby było " -"niedostępne dla strony i systemów VCS.\n" -" Jeśli chcesz całkowicie usunąć go z systemu " -"plików prosimy zrobić to ręcznie" +"niedostępne dla strony i systemów VCS. Jeśli chcesz całkowicie usunąć go " +"z systemu plików prosimy zrobić to ręcznie" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 @@ -2252,7 +2257,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/journal/journal.html:95 #: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "prywatne repozytorium" @@ -2777,7 +2782,7 @@ msgstr "Moje uprawnienia" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "My repos" msgstr "Moje repo" @@ -2988,7 +2993,6 @@ #: rhodecode/templates/base/base.html:324 #: rhodecode/templates/base/base.html:326 #: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "Dziennik" @@ -3121,7 +3125,7 @@ msgstr "dodaj kolejny komentarz" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:75 +#: rhodecode/templates/journal/journal.html:83 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "Zakończyć obserwację tego repozytorium" @@ -3229,7 +3233,7 @@ msgstr "Dotyczy liczby plików, kliknij, aby zobaczyć więcej szczegółów" #: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" @@ -3241,23 +3245,22 @@ msgstr "Kliknij żeby otworzyć prośbę o połączenie gałęzi" #: rhodecode/templates/changelog/changelog.html:104 -#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "Rewizja" #: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changeset/changeset.html:42 msgid "No parents" msgstr "Brak rewizji" #: rhodecode/templates/changelog/changelog.html:115 -#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:106 #: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "połącz" #: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:109 #: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -3272,7 +3275,7 @@ msgstr "zakładka" #: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:114 #: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "etykieta" @@ -3282,26 +3285,26 @@ msgstr "Nie ma jeszcze zmian" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:73 +#: rhodecode/templates/changeset/changeset.html:94 msgid "removed" msgstr "usunięto" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:74 +#: rhodecode/templates/changeset/changeset.html:95 msgid "changed" msgstr "zmiana" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:75 +#: rhodecode/templates/changeset/changeset.html:96 msgid "added" msgstr "dodana" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:77 -#: rhodecode/templates/changeset/changeset.html:78 -#: rhodecode/templates/changeset/changeset.html:79 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:99 +#: rhodecode/templates/changeset/changeset.html:100 #, python-format msgid "affected %s files" msgstr "zarażone pliki %s" @@ -3315,21 +3318,25 @@ msgid "Changeset" msgstr "Grupy zmian" -#: rhodecode/templates/changeset/changeset.html:49 +#: rhodecode/templates/changeset/changeset.html:52 +msgid "No children" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:70 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "raw różnic" -#: rhodecode/templates/changeset/changeset.html:50 +#: rhodecode/templates/changeset/changeset.html:71 msgid "patch diff" msgstr "poprawka różnic" -#: rhodecode/templates/changeset/changeset.html:51 +#: rhodecode/templates/changeset/changeset.html:72 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "pobierz różnice" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" @@ -3338,7 +3345,7 @@ msgstr[1] "%d komentarzy" msgstr[2] "%d komentarzy" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" @@ -3347,7 +3354,7 @@ msgstr[1] "(%d linii)" msgstr[2] "(%d linii)" -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset.html:122 #: rhodecode/templates/compare/compare_diff.html:44 #: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, fuzzy, python-format @@ -3357,7 +3364,7 @@ msgstr[1] "%s plików zmienionych" msgstr[2] "%s plików zmienionych" -#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/changeset/changeset.html:124 #: rhodecode/templates/compare/compare_diff.html:46 #: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, fuzzy, python-format @@ -3389,7 +3396,7 @@ "użytkownika strony" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:138 +#: rhodecode/templates/changeset/changeset_file_comment.html:143 msgid "Comment" msgstr "Komentarz" @@ -3410,15 +3417,15 @@ msgid "Leave a comment" msgstr "Napisz komentarz" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "Check this to change current status of code-review for this changeset" msgstr "Zaznacz to, aby zmienić bieżący stan code przeglądu tego zestawienia zmian" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "change status" msgstr "zmień status" -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 msgid "Comment and close" msgstr "Skomentuj i zamknij" @@ -3475,19 +3482,19 @@ msgstr "Gałąź" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal.html:89 #: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Repozytorium mercurial" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/journal/journal.html:91 #: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Repozytorium git" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/journal/journal.html:97 #: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "Publiczne repozytorium" @@ -3869,50 +3876,50 @@ msgid "There are no forks yet" msgstr "Nie ma jeszcze gałęzi" -#: rhodecode/templates/journal/journal.html:13 +#: rhodecode/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "Dziennik kanału ATOM" -#: rhodecode/templates/journal/journal.html:14 +#: rhodecode/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "Dziennik kanału RSS" -#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/journal/journal.html:32 #: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "Odśwież" -#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 msgid "RSS feed" msgstr "Kanał RSS" -#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/journal.html:38 #: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "Kanał ATOM" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "Watched" msgstr "Obserwowane" -#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:54 msgid "ADD" msgstr "DODAJ" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "following user" msgstr "następujący użytkownik" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "user" msgstr "użytkownik" -#: rhodecode/templates/journal/journal.html:102 +#: rhodecode/templates/journal/journal.html:110 msgid "You are not following any users or repositories" msgstr "Nie obserwujesz żadnych użytkowników lub repozytoriów" -#: rhodecode/templates/journal/journal_data.html:51 +#: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" msgstr "Brak wpisów jeszcze" @@ -4012,6 +4019,11 @@ msgid "Compare view" msgstr "Wyświetl porównanie" +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#, fuzzy +msgid "reviewer" +msgstr "%d recenzent" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 msgid "all pull requests" msgstr "wszystkie prośby połączenia gałęzi" @@ -4076,6 +4088,16 @@ msgid "%s Settings" msgstr "Ustawienia %s" +#: rhodecode/templates/settings/repo_settings.html:102 +#, fuzzy +msgid "Delete repository" +msgstr "[skasowane] repozytorium" + +#: rhodecode/templates/settings/repo_settings.html:109 +#, fuzzy +msgid "Remove repo" +msgstr "usuń" + #: rhodecode/templates/shortlog/shortlog.html:5 #, python-format msgid "%s Shortlog" @@ -4278,3 +4300,29 @@ msgid "Compare tags" msgstr "porównanie" +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was created or renamed" +#~ " from the file system please run " +#~ "the application again in order to " +#~ "rescan repositories" +#~ msgstr "" +#~ "%s repozytorium nie jest mapowane do " +#~ "db może zostało utworzone lub zmienione" +#~ " z systemu plików proszę uruchomić " +#~ "aplikację ponownie, aby ponownie przeskanować" +#~ " repozytoria" + +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was moved or renamed " +#~ "from the filesystem please run the " +#~ "application again in order to rescan " +#~ "repositories" +#~ msgstr "" +#~ "%s repozytorium nie jest mapowane do " +#~ "db może zostało przeniesione lub " +#~ "zmienione w systemie plików proszę " +#~ "uruchomić aplikację ponownie, aby ponownie " +#~ "przeskanować repozytoria" +
--- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Fri Dec 14 04:26:15 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-03 03:21+0100\n" +"POT-Creation-Date: 2012-12-14 04:19+0100\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" @@ -21,33 +21,33 @@ msgid "All Branches" msgstr "Todos os Ramos" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "mostrar espaços em branco" -#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "ignorar espaços em branco" -#: rhodecode/controllers/changeset.py:164 +#: rhodecode/controllers/changeset.py:163 #, python-format msgid "%s line context" msgstr "contexto de %s linhas" -#: rhodecode/controllers/changeset.py:315 -#: rhodecode/controllers/pullrequests.py:411 +#: rhodecode/controllers/changeset.py:314 +#: rhodecode/controllers/pullrequests.py:417 #, fuzzy, python-format msgid "Status change -> %s" msgstr "Última alteração" -#: rhodecode/controllers/changeset.py:346 +#: rhodecode/controllers/changeset.py:345 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" #: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/pullrequests.py:121 #: rhodecode/controllers/shortlog.py:100 #, fuzzy msgid "There are no changesets yet" @@ -94,8 +94,8 @@ msgstr "%s - feed %s" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:126 -#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/changeset/changeset.html:137 +#: rhodecode/templates/changeset/changeset.html:149 #: rhodecode/templates/compare/compare_diff.html:62 #: rhodecode/templates/compare/compare_diff.html:73 #: rhodecode/templates/pullrequests/pullrequest_show.html:94 @@ -177,55 +177,34 @@ msgid "Changesets" msgstr "Conjuntos de mudanças" -#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "Ramos" -#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "Etiquetas" -#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" -"repositório %s não está mapeado ao bd. Talvez ele tenha sido criado ou " -"renomeado a partir do sistema de arquivos. Por favor execute a aplicação " -"outra vez para varrer novamente por repositórios" - -#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the file system please run the application again in order to rescan " -"repositories" -msgstr "" -"repositório %s não está mapeado ao bd. Talvez ele tenha sido criado ou " -"renomeado a partir do sistema de arquivos. Por favor execute a aplicação " -"outra vez para varrer novamente por repositórios" - -#: rhodecode/controllers/forks.py:168 +#: rhodecode/controllers/forks.py:158 #, python-format msgid "forked %s repository as %s" msgstr "bifurcado repositório %s como %s" -#: rhodecode/controllers/forks.py:182 +#: rhodecode/controllers/forks.py:172 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261 #, fuzzy msgid "public journal" msgstr "Diário público" -#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265 #: rhodecode/templates/base/base.html:232 +#: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "diário" @@ -245,34 +224,38 @@ "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " "seu e-mail" -#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 +#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "Marcadores" -#: rhodecode/controllers/pullrequests.py:186 +#: rhodecode/controllers/pullrequests.py:190 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:188 +#: rhodecode/controllers/pullrequests.py:192 #, fuzzy msgid "error during creation of pull request" msgstr "ocorreu um erro ao criar o usuário %s" -#: rhodecode/controllers/pullrequests.py:220 +#: rhodecode/controllers/pullrequests.py:224 #, fuzzy msgid "Successfully opened new pull request" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/pullrequests.py:223 +#: rhodecode/controllers/pullrequests.py:227 #, fuzzy msgid "Error occurred during sending pull request" msgstr "ocorreu um erro ao criar o repositório %s" -#: rhodecode/controllers/pullrequests.py:256 +#: rhodecode/controllers/pullrequests.py:260 #, fuzzy msgid "Successfully deleted pull request" msgstr "usuário excluído com sucesso" +#: rhodecode/controllers/pullrequests.py:452 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + #: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Consulta de busca inválida. Tente usar aspas." @@ -285,60 +268,48 @@ msgid "An error occurred during this search operation" msgstr "Ocorreu um erro durante essa operação de busca" -#: rhodecode/controllers/settings.py:108 -#: rhodecode/controllers/admin/repos.py:268 +#: rhodecode/controllers/settings.py:119 +#: rhodecode/controllers/admin/repos.py:272 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/settings.py:137 +#: rhodecode/controllers/admin/repos.py:290 #, python-format msgid "error occurred during update of repository %s" msgstr "ocorreu um erro ao atualizar o repositório %s" -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:304 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was moved or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" -"repositório %s não está mapeado ao bd. Talvez ele tenha sido movido ou " -"renomeado a partir do sistema de arquivos. Por favor execute a aplicação " -"outra vez para varrer novamente por repositórios" - -#: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:316 +#: rhodecode/controllers/settings.py:162 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "excluído o repositório %s" -#: rhodecode/controllers/settings.py:160 -#: rhodecode/controllers/admin/repos.py:326 -#: rhodecode/controllers/admin/repos.py:332 +#: rhodecode/controllers/settings.py:166 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "Ocorreu um erro durante a exclusão de %s" -#: rhodecode/controllers/settings.py:179 +#: rhodecode/controllers/settings.py:185 #, fuzzy msgid "unlocked" msgstr "destravar" -#: rhodecode/controllers/settings.py:182 +#: rhodecode/controllers/settings.py:188 #, fuzzy msgid "locked" msgstr "destravar" -#: rhodecode/controllers/settings.py:184 +#: rhodecode/controllers/settings.py:190 #, fuzzy, python-format msgid "Repository has been %s" msgstr "bifurcado repositório %s como %s" -#: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:424 +#: rhodecode/controllers/settings.py:194 +#: rhodecode/controllers/admin/repos.py:423 #, fuzzy msgid "An error occurred during unlocking" msgstr "Ocorreu um erro durante essa operação" @@ -490,76 +461,76 @@ msgid "error occurred during update of permissions" msgstr "ocorreu um erro ao atualizar as permissões" -#: rhodecode/controllers/admin/repos.py:125 +#: rhodecode/controllers/admin/repos.py:121 msgid "--REMOVE FORK--" msgstr "--REMOVER BIFURCAÇÂO--" -#: rhodecode/controllers/admin/repos.py:194 +#: rhodecode/controllers/admin/repos.py:190 #, python-format msgid "created repository %s from %s" msgstr "repositório %s criado a partir de %s" -#: rhodecode/controllers/admin/repos.py:198 +#: rhodecode/controllers/admin/repos.py:194 #, python-format msgid "created repository %s" msgstr "repositório %s criado" -#: rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/admin/repos.py:225 #, python-format msgid "error occurred during creation of repository %s" msgstr "ocorreu um erro ao criar o repositório %s" -#: rhodecode/controllers/admin/repos.py:321 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" -#: rhodecode/controllers/admin/repos.py:350 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "Ocorreu um erro ao excluir usuário de repositório" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "Ocorreu um erro ao excluir grupo de usuário de repositório" -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "Ocorreu um erro ao excluir estatísticas de repositório" -#: rhodecode/controllers/admin/repos.py:404 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: rhodecode/controllers/admin/repos.py:444 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: rhodecode/controllers/admin/repos.py:448 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "Ocorreu um erro ao ajustar esse repositório no diário público" -#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "Descompasso de Token" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: rhodecode/controllers/admin/repos.py:468 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "Ocorreu um erro ao realizar pull de localização remota" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "Nada" -#: rhodecode/controllers/admin/repos.py:486 +#: rhodecode/controllers/admin/repos.py:485 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" -#: rhodecode/controllers/admin/repos.py:490 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" @@ -809,161 +780,172 @@ msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: rhodecode/lib/helpers.py:373 +#: rhodecode/lib/helpers.py:374 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 msgid "True" msgstr "Verdadeiro" -#: rhodecode/lib/helpers.py:489 +#: rhodecode/lib/helpers.py:490 msgid "False" msgstr "Falso" -#: rhodecode/lib/helpers.py:529 +#: rhodecode/lib/helpers.py:530 #, fuzzy, python-format msgid "Deleted branch: %s" msgstr "excluído o repositório %s" -#: rhodecode/lib/helpers.py:532 +#: rhodecode/lib/helpers.py:533 #, fuzzy, python-format msgid "Created tag: %s" msgstr "usuário %s criado" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:546 msgid "Changeset not found" msgstr "Conjunto de alterações não encontrado" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:589 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:595 msgid "compare view" msgstr "comparar exibir" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:615 msgid "and" msgstr "e" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:616 #, python-format msgid "%s more" msgstr "%s mais" -#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "revisões" -#: rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:641 #, fuzzy, python-format msgid "fork name %s" msgstr "nome da bifurcação" -#: rhodecode/lib/helpers.py:653 +#: rhodecode/lib/helpers.py:658 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:659 +#: rhodecode/lib/helpers.py:664 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 +#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 msgid "[created] repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:663 +#: rhodecode/lib/helpers.py:668 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 +#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 +#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: rhodecode/lib/helpers.py:669 +#: rhodecode/lib/helpers.py:674 msgid "[delete] repository" msgstr "[excluir] repositório" -#: rhodecode/lib/helpers.py:677 +#: rhodecode/lib/helpers.py:682 #, fuzzy msgid "[created] user" msgstr "usuário %s criado" -#: rhodecode/lib/helpers.py:679 +#: rhodecode/lib/helpers.py:684 #, fuzzy msgid "[updated] user" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:681 +#: rhodecode/lib/helpers.py:686 #, fuzzy msgid "[created] users group" msgstr "criado grupo de usuários %s" -#: rhodecode/lib/helpers.py:683 +#: rhodecode/lib/helpers.py:688 #, fuzzy msgid "[updated] users group" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:685 +#: rhodecode/lib/helpers.py:690 #, fuzzy msgid "[commented] on revision in repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:687 +#: rhodecode/lib/helpers.py:692 #, fuzzy msgid "[commented] on pull request for" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:689 +#: rhodecode/lib/helpers.py:694 #, fuzzy msgid "[closed] pull request for" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:691 +#: rhodecode/lib/helpers.py:696 msgid "[pushed] into" msgstr "[realizado push] para" -#: rhodecode/lib/helpers.py:693 +#: rhodecode/lib/helpers.py:698 #, fuzzy msgid "[committed via RhodeCode] into repository" msgstr "[realizado commit via RhodeCode] para" -#: rhodecode/lib/helpers.py:695 +#: rhodecode/lib/helpers.py:700 #, fuzzy msgid "[pulled from remote] into repository" msgstr "[realizado pull remoto] para" -#: rhodecode/lib/helpers.py:697 +#: rhodecode/lib/helpers.py:702 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: rhodecode/lib/helpers.py:699 +#: rhodecode/lib/helpers.py:704 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: rhodecode/lib/helpers.py:701 +#: rhodecode/lib/helpers.py:706 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/helpers.py:877 +#: rhodecode/lib/helpers.py:883 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:881 +#: rhodecode/lib/helpers.py:887 msgid "No Files" msgstr "Nenhum Arquivo" +#: rhodecode/lib/helpers.py:1163 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" +"repositório %s não está mapeado ao bd. Talvez ele tenha sido criado ou " +"renomeado a partir do sistema de arquivos. Por favor execute a aplicação " +"outra vez para varrer novamente por repositórios" + #: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" @@ -1034,98 +1016,98 @@ msgid "password reset link" msgstr "link de reinicialização de senha" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183 #, fuzzy msgid "Repository no access" msgstr "repositórios" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184 #, fuzzy msgid "Repository read access" msgstr "Esse repositório já existe" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185 #, fuzzy msgid "Repository write access" msgstr "repositórios" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186 #, fuzzy msgid "Repository admin access" msgstr "repositórios" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188 #, fuzzy msgid "Repositories Group no access" msgstr "grupos de repositórios" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189 #, fuzzy msgid "Repositories Group read access" msgstr "grupos de repositórios" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190 #, fuzzy msgid "Repositories Group write access" msgstr "grupos de repositórios" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191 #, fuzzy msgid "Repositories Group admin access" msgstr "grupos de repositórios" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193 #, fuzzy msgid "RhodeCode Administrator" msgstr "Administração de usuários" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194 #, fuzzy msgid "Repository creation disabled" msgstr "Criação de repositório" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195 #, fuzzy msgid "Repository creation enabled" msgstr "Criação de repositório" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196 #, fuzzy msgid "Repository forking disabled" msgstr "Criação de repositório" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197 #, fuzzy msgid "Repository forking enabled" msgstr "Criação de repositório" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198 #, fuzzy msgid "Register disabled" msgstr "desabilitado" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643 msgid "Not Reviewed" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644 #, fuzzy msgid "Approved" msgstr "removidos" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645 msgid "Rejected" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646 msgid "Under Review" msgstr "" @@ -1196,24 +1178,24 @@ msgid "latest tip" msgstr "último login" -#: rhodecode/model/user.py:230 +#: rhodecode/model/user.py:232 msgid "new user registration" msgstr "registro de novo usuário" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 -#: rhodecode/model/user.py:301 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 +#: rhodecode/model/user.py:303 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" "Você não pode Editar esse usuário, pois ele é crucial para toda a " "aplicação" -#: rhodecode/model/user.py:325 +#: rhodecode/model/user.py:327 msgid "You can't remove this user since it's crucial for entire application" msgstr "" "Você não pode remover esse usuário, pois ele é crucial para toda a " "aplicação" -#: rhodecode/model/user.py:331 +#: rhodecode/model/user.py:333 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1346,20 +1328,20 @@ msgid "This username or users group name is not valid" msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido" -#: rhodecode/model/validators.py:582 +#: rhodecode/model/validators.py:591 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:606 msgid "This e-mail address is already taken" msgstr "Esse endereço de e-mail já está tomado" -#: rhodecode/model/validators.py:617 +#: rhodecode/model/validators.py:626 #, fuzzy, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "Esse endereço de e-mail não existe." -#: rhodecode/model/validators.py:654 +#: rhodecode/model/validators.py:663 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1367,7 +1349,7 @@ "O atributo de login LDAP do CN deve ser especificado - isto é o nome do " "atributo que é equivalente ao 'nome de usuário'" -#: rhodecode/model/validators.py:673 +#: rhodecode/model/validators.py:682 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1383,7 +1365,8 @@ #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:40 +#: rhodecode/templates/journal/journal.html:9 +#: rhodecode/templates/journal/journal.html:48 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "filtro rápido..." @@ -1449,8 +1432,8 @@ #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:62 -#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal.html:70 +#: rhodecode/templates/journal/journal.html:196 #: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 @@ -1467,7 +1450,7 @@ #: rhodecode/templates/index_base.html:74 #: rhodecode/templates/index_base.html:179 #: rhodecode/templates/admin/users/user_edit_my_account.html:182 -#: rhodecode/templates/journal/journal.html:170 +#: rhodecode/templates/journal/journal.html:198 msgid "Tip" msgstr "Ponta" @@ -1497,7 +1480,7 @@ #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:221 #: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "Clique para ordenar em ordem crescente" @@ -1510,7 +1493,7 @@ #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/journal/journal.html:222 #: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "Clique para ordenar em ordem descrescente" @@ -1527,7 +1510,7 @@ #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:223 #: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "Nenhum registro encontrado." @@ -1539,7 +1522,7 @@ #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/journal/journal.html:224 #: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "Erro de dados." @@ -1551,8 +1534,8 @@ #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:54 -#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:225 #: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "Carregando..." @@ -1702,10 +1685,29 @@ msgstr "Ainda não há marcadores" #: rhodecode/templates/admin/admin.html:5 -#: rhodecode/templates/admin/admin.html:9 +#: rhodecode/templates/admin/admin.html:13 msgid "Admin journal" msgstr "Diário do administrador" +#: rhodecode/templates/admin/admin.html:10 +#, fuzzy +msgid "journal filter..." +msgstr "filtro rápido..." + +#: rhodecode/templates/admin/admin.html:12 +#: rhodecode/templates/journal/journal.html:11 +#, fuzzy +msgid "filter" +msgstr "arquivos" + +#: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/journal/journal.html:12 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" +msgstr[1] "" + #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 @@ -1734,7 +1736,7 @@ msgid "From IP" msgstr "A partir do IP" -#: rhodecode/templates/admin/admin_log.html:57 +#: rhodecode/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "Ainda não há ações" @@ -1808,7 +1810,7 @@ #: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "Salvar" @@ -2108,7 +2110,7 @@ #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:94 +#: rhodecode/templates/settings/repo_settings.html:95 msgid "Reset" msgstr "Limpar" @@ -2258,19 +2260,22 @@ msgstr "Excluir" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Remove this repository" msgstr "Remover deste repositório" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Confirm to delete this repository" msgstr "Confirma excluir este repositório" #: rhodecode/templates/admin/repos/repo_edit.html:282 +#: rhodecode/templates/settings/repo_settings.html:119 +#, fuzzy msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem " -"please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need fully delete it " +"from file system please do it manually" msgstr "" "Este repositório será renomeado de uma maneira especial, de forma a ser " "inacessível ao RhodeCode e sistemas de controle de versão.\n" @@ -2306,7 +2311,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/journal/journal.html:95 #: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "repositório privado" @@ -2833,7 +2838,7 @@ msgstr "Minhas permissões" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "My repos" msgstr "Meus repositórios" @@ -3051,7 +3056,6 @@ #: rhodecode/templates/base/base.html:324 #: rhodecode/templates/base/base.html:326 #: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "Diário" @@ -3187,7 +3191,7 @@ msgstr "adicionar outro comentário" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:75 +#: rhodecode/templates/journal/journal.html:83 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "Parar de seguir este repositório" @@ -3297,7 +3301,7 @@ msgstr "Número de arquivos afetados, clique para mostrar mais detalhes" #: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 #, fuzzy @@ -3310,23 +3314,22 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:104 -#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "Progenitor" #: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changeset/changeset.html:42 msgid "No parents" msgstr "Sem progenitores" #: rhodecode/templates/changelog/changelog.html:115 -#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:106 #: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "mesclar" #: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:109 #: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -3341,7 +3344,7 @@ msgstr "marcador" #: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:114 #: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "etiqueta" @@ -3351,26 +3354,26 @@ msgstr "Ainda não há alteações" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:73 +#: rhodecode/templates/changeset/changeset.html:94 msgid "removed" msgstr "removidos" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:74 +#: rhodecode/templates/changeset/changeset.html:95 msgid "changed" msgstr "alterados" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:75 +#: rhodecode/templates/changeset/changeset.html:96 msgid "added" msgstr "adicionados" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:77 -#: rhodecode/templates/changeset/changeset.html:78 -#: rhodecode/templates/changeset/changeset.html:79 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:99 +#: rhodecode/templates/changeset/changeset.html:100 #, python-format msgid "affected %s files" msgstr "%s arquivos afetados" @@ -3384,22 +3387,26 @@ msgid "Changeset" msgstr "Conjunto de Mudanças" -#: rhodecode/templates/changeset/changeset.html:49 +#: rhodecode/templates/changeset/changeset.html:52 +msgid "No children" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:70 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "diff bruto" -#: rhodecode/templates/changeset/changeset.html:50 +#: rhodecode/templates/changeset/changeset.html:71 #, fuzzy msgid "patch diff" msgstr "diff bruto" -#: rhodecode/templates/changeset/changeset.html:51 +#: rhodecode/templates/changeset/changeset.html:72 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "descarregar diff" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" @@ -3407,7 +3414,7 @@ msgstr[0] "%d comentário" msgstr[1] "%d comentários" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" @@ -3415,7 +3422,7 @@ msgstr[0] "(%d em linha)" msgstr[1] "(%d em linha)" -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset.html:122 #: rhodecode/templates/compare/compare_diff.html:44 #: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, fuzzy, python-format @@ -3424,7 +3431,7 @@ msgstr[0] "arquivo alterado" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/changeset/changeset.html:124 #: rhodecode/templates/compare/compare_diff.html:46 #: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, fuzzy, python-format @@ -3455,7 +3462,7 @@ "usuário do RhodeCode" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:138 +#: rhodecode/templates/changeset/changeset_file_comment.html:143 msgid "Comment" msgstr "Comentário" @@ -3476,16 +3483,16 @@ msgid "Leave a comment" msgstr "Deixar um comentário" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 #, fuzzy msgid "change status" msgstr "Conjuntos de mudanças" -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 msgid "Comment and close" msgstr "" @@ -3542,19 +3549,19 @@ msgstr "Bifurcação" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal.html:89 #: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Repositório Mercurial" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/journal/journal.html:91 #: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Repositório Git" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/journal/journal.html:97 #: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "repositório público" @@ -3937,53 +3944,53 @@ msgid "There are no forks yet" msgstr "Ainda não há bifurcações" -#: rhodecode/templates/journal/journal.html:13 +#: rhodecode/templates/journal/journal.html:21 #, fuzzy msgid "ATOM journal feed" msgstr "diário público de %s - feed %s" -#: rhodecode/templates/journal/journal.html:14 +#: rhodecode/templates/journal/journal.html:22 #, fuzzy msgid "RSS journal feed" msgstr "diário público de %s - feed %s" -#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/journal/journal.html:32 #: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "Atualizar" -#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 #, fuzzy msgid "RSS feed" msgstr "%s - feed %s" -#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/journal.html:38 #: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "Watched" msgstr "Seguindo" -#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:54 msgid "ADD" msgstr "ADICIONAR" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "following user" msgstr "seguindo usuário" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "user" msgstr "usuário" -#: rhodecode/templates/journal/journal.html:102 +#: rhodecode/templates/journal/journal.html:110 msgid "You are not following any users or repositories" msgstr "Você não está seguindo quaisquer usuários ou repositórios" -#: rhodecode/templates/journal/journal_data.html:51 +#: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" msgstr "Ainda não há entradas" @@ -4091,6 +4098,11 @@ msgid "Compare view" msgstr "comparar exibir" +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#, fuzzy +msgid "reviewer" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 #, fuzzy msgid "all pull requests" @@ -4158,6 +4170,16 @@ msgid "%s Settings" msgstr "configurações" +#: rhodecode/templates/settings/repo_settings.html:102 +#, fuzzy +msgid "Delete repository" +msgstr "[excluir] repositório" + +#: rhodecode/templates/settings/repo_settings.html:109 +#, fuzzy +msgid "Remove repo" +msgstr "remover" + #: rhodecode/templates/shortlog/shortlog.html:5 #, fuzzy, python-format msgid "%s Shortlog" @@ -4362,3 +4384,31 @@ msgid "Compare tags" msgstr "comparar exibir" +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was created or renamed" +#~ " from the file system please run " +#~ "the application again in order to " +#~ "rescan repositories" +#~ msgstr "" +#~ "repositório %s não está mapeado ao " +#~ "bd. Talvez ele tenha sido criado " +#~ "ou renomeado a partir do sistema " +#~ "de arquivos. Por favor execute a " +#~ "aplicação outra vez para varrer " +#~ "novamente por repositórios" + +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was moved or renamed " +#~ "from the filesystem please run the " +#~ "application again in order to rescan " +#~ "repositories" +#~ msgstr "" +#~ "repositório %s não está mapeado ao " +#~ "bd. Talvez ele tenha sido movido " +#~ "ou renomeado a partir do sistema " +#~ "de arquivos. Por favor execute a " +#~ "aplicação outra vez para varrer " +#~ "novamente por repositórios" +
--- a/rhodecode/i18n/rhodecode.pot Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/i18n/rhodecode.pot Fri Dec 14 04:26:15 2012 +0100 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: RhodeCode 1.5.0b\n" +"Project-Id-Version: RhodeCode 1.5.1b\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-03 03:21+0100\n" +"POT-Creation-Date: 2012-12-14 04:19+0100\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" @@ -21,31 +21,31 @@ msgid "All Branches" msgstr "" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "" -#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:164 +#: rhodecode/controllers/changeset.py:163 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:315 rhodecode/controllers/pullrequests.py:411 +#: rhodecode/controllers/changeset.py:314 rhodecode/controllers/pullrequests.py:417 #, python-format msgid "Status change -> %s" msgstr "" -#: rhodecode/controllers/changeset.py:346 +#: rhodecode/controllers/changeset.py:345 msgid "" "Changing status on a changeset associated witha closed pull request is not " "allowed" msgstr "" -#: rhodecode/controllers/compare.py:75 rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/compare.py:75 rhodecode/controllers/pullrequests.py:121 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "" @@ -87,8 +87,8 @@ msgstr "" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:126 -#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/changeset/changeset.html:137 +#: rhodecode/templates/changeset/changeset.html:149 #: rhodecode/templates/compare/compare_diff.html:62 #: rhodecode/templates/compare/compare_diff.html:73 #: rhodecode/templates/pullrequests/pullrequest_show.html:94 @@ -168,46 +168,33 @@ msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from the " -"filesystem please run the application again in order to rescan repositories" -msgstr "" - -#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from the " -"file system please run the application again in order to rescan repositories" -msgstr "" - -#: rhodecode/controllers/forks.py:168 +#: rhodecode/controllers/forks.py:158 #, python-format msgid "forked %s repository as %s" msgstr "" -#: rhodecode/controllers/forks.py:182 +#: rhodecode/controllers/forks.py:172 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261 msgid "public journal" msgstr "" -#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265 #: rhodecode/templates/base/base.html:232 +#: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "" @@ -223,30 +210,34 @@ msgid "Your password reset was successful, new password has been sent to your email" msgstr "" -#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 +#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:186 +#: rhodecode/controllers/pullrequests.py:190 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:188 +#: rhodecode/controllers/pullrequests.py:192 msgid "error during creation of pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:220 +#: rhodecode/controllers/pullrequests.py:224 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:223 +#: rhodecode/controllers/pullrequests.py:227 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:256 +#: rhodecode/controllers/pullrequests.py:260 msgid "Successfully deleted pull request" msgstr "" +#: rhodecode/controllers/pullrequests.py:452 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + #: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "" @@ -259,48 +250,41 @@ msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:108 rhodecode/controllers/admin/repos.py:268 +#: rhodecode/controllers/settings.py:119 rhodecode/controllers/admin/repos.py:272 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/settings.py:126 rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/settings.py:137 rhodecode/controllers/admin/repos.py:290 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:144 rhodecode/controllers/admin/repos.py:304 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was moved or renamed from the " -"filesystem please run the application again in order to rescan repositories" -msgstr "" - -#: rhodecode/controllers/settings.py:156 rhodecode/controllers/admin/repos.py:316 +#: rhodecode/controllers/settings.py:162 rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "" -#: rhodecode/controllers/settings.py:160 rhodecode/controllers/admin/repos.py:326 -#: rhodecode/controllers/admin/repos.py:332 +#: rhodecode/controllers/settings.py:166 rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/settings.py:179 +#: rhodecode/controllers/settings.py:185 msgid "unlocked" msgstr "" -#: rhodecode/controllers/settings.py:182 +#: rhodecode/controllers/settings.py:188 msgid "locked" msgstr "" -#: rhodecode/controllers/settings.py:184 +#: rhodecode/controllers/settings.py:190 #, python-format msgid "Repository has been %s" msgstr "" -#: rhodecode/controllers/settings.py:188 rhodecode/controllers/admin/repos.py:424 +#: rhodecode/controllers/settings.py:194 rhodecode/controllers/admin/repos.py:423 msgid "An error occurred during unlocking" msgstr "" @@ -447,76 +431,76 @@ msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:125 +#: rhodecode/controllers/admin/repos.py:121 msgid "--REMOVE FORK--" msgstr "" +#: rhodecode/controllers/admin/repos.py:190 +#, python-format +msgid "created repository %s from %s" +msgstr "" + #: rhodecode/controllers/admin/repos.py:194 #, python-format -msgid "created repository %s from %s" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:198 -#, python-format msgid "created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/admin/repos.py:225 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:321 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:350 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:404 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:444 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:448 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:468 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:486 +#: rhodecode/controllers/admin/repos.py:485 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:490 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "" @@ -752,152 +736,159 @@ msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:373 +#: rhodecode/lib/helpers.py:374 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:489 +#: rhodecode/lib/helpers.py:490 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:529 +#: rhodecode/lib/helpers.py:530 #, python-format msgid "Deleted branch: %s" msgstr "" -#: rhodecode/lib/helpers.py:532 +#: rhodecode/lib/helpers.py:533 #, python-format msgid "Created tag: %s" msgstr "" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:546 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:589 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:595 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:614 -msgid "and" -msgstr "" - #: rhodecode/lib/helpers.py:615 +msgid "and" +msgstr "" + +#: rhodecode/lib/helpers.py:616 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:641 #, python-format msgid "fork name %s" msgstr "" -#: rhodecode/lib/helpers.py:653 +#: rhodecode/lib/helpers.py:658 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:659 +#: rhodecode/lib/helpers.py:664 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 +#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:663 +#: rhodecode/lib/helpers.py:668 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 +#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 +#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:669 +#: rhodecode/lib/helpers.py:674 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:677 +#: rhodecode/lib/helpers.py:682 msgid "[created] user" msgstr "" -#: rhodecode/lib/helpers.py:679 +#: rhodecode/lib/helpers.py:684 msgid "[updated] user" msgstr "" -#: rhodecode/lib/helpers.py:681 +#: rhodecode/lib/helpers.py:686 msgid "[created] users group" msgstr "" -#: rhodecode/lib/helpers.py:683 +#: rhodecode/lib/helpers.py:688 msgid "[updated] users group" msgstr "" -#: rhodecode/lib/helpers.py:685 +#: rhodecode/lib/helpers.py:690 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:687 +#: rhodecode/lib/helpers.py:692 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/helpers.py:689 +#: rhodecode/lib/helpers.py:694 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:691 +#: rhodecode/lib/helpers.py:696 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:693 +#: rhodecode/lib/helpers.py:698 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:695 +#: rhodecode/lib/helpers.py:700 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:697 +#: rhodecode/lib/helpers.py:702 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:699 +#: rhodecode/lib/helpers.py:704 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:701 +#: rhodecode/lib/helpers.py:706 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:877 +#: rhodecode/lib/helpers.py:883 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:881 +#: rhodecode/lib/helpers.py:887 msgid "No Files" msgstr "" +#: rhodecode/lib/helpers.py:1163 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from the " +"filesystem please run the application again in order to rescan repositories" +msgstr "" + #: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" @@ -968,83 +959,83 @@ msgid "password reset link" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183 msgid "Repository no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184 msgid "Repository read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185 msgid "Repository write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186 msgid "Repository admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188 msgid "Repositories Group no access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189 msgid "Repositories Group read access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190 msgid "Repositories Group write access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193 msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194 msgid "Repository creation disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195 msgid "Repository creation enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196 msgid "Repository forking disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197 msgid "Repository forking enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198 msgid "Register disabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643 msgid "Not Reviewed" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644 msgid "Approved" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645 msgid "Rejected" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646 msgid "Under Review" msgstr "" @@ -1114,20 +1105,20 @@ msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:230 +#: rhodecode/model/user.py:232 msgid "new user registration" msgstr "" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 -#: rhodecode/model/user.py:301 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 +#: rhodecode/model/user.py:303 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:325 +#: rhodecode/model/user.py:327 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:331 +#: rhodecode/model/user.py:333 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " @@ -1248,26 +1239,26 @@ msgid "This username or users group name is not valid" msgstr "" -#: rhodecode/model/validators.py:582 +#: rhodecode/model/validators.py:591 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:606 msgid "This e-mail address is already taken" msgstr "" -#: rhodecode/model/validators.py:617 +#: rhodecode/model/validators.py:626 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:654 +#: rhodecode/model/validators.py:663 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name of " "the attribute that is equivalent to \"username\"" msgstr "" -#: rhodecode/model/validators.py:673 +#: rhodecode/model/validators.py:682 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1283,7 +1274,8 @@ #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:40 +#: rhodecode/templates/journal/journal.html:9 +#: rhodecode/templates/journal/journal.html:48 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "" @@ -1344,8 +1336,8 @@ #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:62 -#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal.html:70 +#: rhodecode/templates/journal/journal.html:196 #: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 @@ -1360,7 +1352,7 @@ #: rhodecode/templates/index_base.html:74 rhodecode/templates/index_base.html:179 #: rhodecode/templates/admin/users/user_edit_my_account.html:182 -#: rhodecode/templates/journal/journal.html:170 +#: rhodecode/templates/journal/journal.html:198 msgid "Tip" msgstr "" @@ -1388,7 +1380,7 @@ #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:221 #: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "" @@ -1400,7 +1392,7 @@ #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/journal/journal.html:222 #: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "" @@ -1415,7 +1407,7 @@ #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:223 #: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "" @@ -1426,7 +1418,7 @@ #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/journal/journal.html:224 #: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "" @@ -1437,8 +1429,8 @@ #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:54 -#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:225 #: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "" @@ -1585,10 +1577,27 @@ msgid "There are no bookmarks yet" msgstr "" -#: rhodecode/templates/admin/admin.html:5 rhodecode/templates/admin/admin.html:9 +#: rhodecode/templates/admin/admin.html:5 rhodecode/templates/admin/admin.html:13 msgid "Admin journal" msgstr "" +#: rhodecode/templates/admin/admin.html:10 +msgid "journal filter..." +msgstr "" + +#: rhodecode/templates/admin/admin.html:12 +#: rhodecode/templates/journal/journal.html:11 +msgid "filter" +msgstr "" + +#: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/journal/journal.html:12 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" +msgstr[1] "" + #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 @@ -1616,7 +1625,7 @@ msgid "From IP" msgstr "" -#: rhodecode/templates/admin/admin_log.html:57 +#: rhodecode/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "" @@ -1685,7 +1694,7 @@ #: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "" @@ -1971,7 +1980,7 @@ #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:94 +#: rhodecode/templates/settings/repo_settings.html:95 msgid "Reset" msgstr "" @@ -2111,19 +2120,21 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Remove this repository" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Confirm to delete this repository" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:282 +#: rhodecode/templates/settings/repo_settings.html:119 msgid "" "This repository will be renamed in a special way in order to be unaccesible " -"for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem please " -"do it manually" +"for RhodeCode and VCS systems. If you need fully delete it from file system " +"please do it manually" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 @@ -2155,7 +2166,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/journal/journal.html:95 #: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "" @@ -2657,7 +2668,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "My repos" msgstr "" @@ -2865,7 +2876,6 @@ #: rhodecode/templates/base/base.html:123 rhodecode/templates/base/base.html:322 #: rhodecode/templates/base/base.html:324 rhodecode/templates/base/base.html:326 #: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "" @@ -2987,7 +2997,7 @@ msgstr "" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:75 +#: rhodecode/templates/journal/journal.html:83 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "" @@ -3091,7 +3101,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" @@ -3103,23 +3113,22 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:104 -#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "" #: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changeset/changeset.html:42 msgid "No parents" msgstr "" #: rhodecode/templates/changelog/changelog.html:115 -#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:106 #: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "" #: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:109 #: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -3134,7 +3143,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:114 #: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "" @@ -3144,26 +3153,26 @@ msgstr "" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:73 +#: rhodecode/templates/changeset/changeset.html:94 msgid "removed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:74 +#: rhodecode/templates/changeset/changeset.html:95 msgid "changed" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:75 +#: rhodecode/templates/changeset/changeset.html:96 msgid "added" msgstr "" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:77 -#: rhodecode/templates/changeset/changeset.html:78 -#: rhodecode/templates/changeset/changeset.html:79 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:99 +#: rhodecode/templates/changeset/changeset.html:100 #, python-format msgid "affected %s files" msgstr "" @@ -3177,21 +3186,25 @@ msgid "Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:49 +#: rhodecode/templates/changeset/changeset.html:52 +msgid "No children" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:70 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:50 +#: rhodecode/templates/changeset/changeset.html:71 msgid "patch diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:51 +#: rhodecode/templates/changeset/changeset.html:72 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" @@ -3199,7 +3212,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" @@ -3207,7 +3220,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset.html:122 #: rhodecode/templates/compare/compare_diff.html:44 #: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, python-format @@ -3216,7 +3229,7 @@ msgstr[0] "" msgstr[1] "" -#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/changeset/changeset.html:124 #: rhodecode/templates/compare/compare_diff.html:46 #: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, python-format @@ -3245,7 +3258,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:138 +#: rhodecode/templates/changeset/changeset_file_comment.html:143 msgid "Comment" msgstr "" @@ -3266,15 +3279,15 @@ msgid "Leave a comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "change status" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 msgid "Comment and close" msgstr "" @@ -3328,19 +3341,19 @@ msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal.html:89 #: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/journal/journal.html:91 #: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/journal/journal.html:97 #: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "" @@ -3708,50 +3721,50 @@ msgid "There are no forks yet" msgstr "" -#: rhodecode/templates/journal/journal.html:13 +#: rhodecode/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "" -#: rhodecode/templates/journal/journal.html:14 +#: rhodecode/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "" -#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/journal/journal.html:32 #: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "" -#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 msgid "RSS feed" msgstr "" -#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/journal.html:38 #: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "Watched" msgstr "" -#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:54 msgid "ADD" msgstr "" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "following user" msgstr "" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "user" msgstr "" -#: rhodecode/templates/journal/journal.html:102 +#: rhodecode/templates/journal/journal.html:110 msgid "You are not following any users or repositories" msgstr "" -#: rhodecode/templates/journal/journal_data.html:51 +#: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" msgstr "" @@ -3850,6 +3863,10 @@ msgid "Compare view" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +msgid "reviewer" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 msgid "all pull requests" msgstr "" @@ -3914,6 +3931,14 @@ msgid "%s Settings" msgstr "" +#: rhodecode/templates/settings/repo_settings.html:102 +msgid "Delete repository" +msgstr "" + +#: rhodecode/templates/settings/repo_settings.html:109 +msgid "Remove repo" +msgstr "" + #: rhodecode/templates/shortlog/shortlog.html:5 #, python-format msgid "%s Shortlog"
--- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Fri Dec 14 04:26:15 2012 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.4.4\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-03 03:21+0100\n" +"POT-Creation-Date: 2012-12-14 04:19+0100\n" "PO-Revision-Date: 2012-11-26 15:19+0800\n" "Last-Translator: xpol <xpolife@gmail.com>\n" "Language-Team: mikespook\n" @@ -22,33 +22,33 @@ msgid "All Branches" msgstr "所有分支" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "显示空白字符" -#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "忽略空白字符" -#: rhodecode/controllers/changeset.py:164 +#: rhodecode/controllers/changeset.py:163 #, python-format msgid "%s line context" msgstr "%s行上下文" -#: rhodecode/controllers/changeset.py:315 -#: rhodecode/controllers/pullrequests.py:411 +#: rhodecode/controllers/changeset.py:314 +#: rhodecode/controllers/pullrequests.py:417 #, python-format msgid "Status change -> %s" msgstr "状态修改为%s" -#: rhodecode/controllers/changeset.py:346 +#: rhodecode/controllers/changeset.py:345 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "不允许修改已关闭拉取请求的修订集状态" #: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/pullrequests.py:121 #: rhodecode/controllers/shortlog.py:100 msgid "There are no changesets yet" msgstr "还没有修订集" @@ -90,8 +90,8 @@ msgstr "%s %s订阅" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:126 -#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/changeset/changeset.html:137 +#: rhodecode/templates/changeset/changeset.html:149 #: rhodecode/templates/compare/compare_diff.html:62 #: rhodecode/templates/compare/compare_diff.html:73 #: rhodecode/templates/pullrequests/pullrequest_show.html:94 @@ -171,48 +171,33 @@ msgid "Changesets" msgstr "修订集" -#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "标签" -#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" - -#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the file system please run the application again in order to rescan " -"repositories" -msgstr " 版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" - -#: rhodecode/controllers/forks.py:168 +#: rhodecode/controllers/forks.py:158 #, python-format msgid "forked %s repository as %s" msgstr "版本库%s被复刻到%s" -#: rhodecode/controllers/forks.py:182 +#: rhodecode/controllers/forks.py:172 #, python-format msgid "An error occurred during repository forking %s" msgstr "在复刻版本库%s的时候发生错误" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261 msgid "public journal" msgstr "公共日志" -#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265 #: rhodecode/templates/base/base.html:232 +#: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "日志" @@ -230,30 +215,34 @@ "email" msgstr "密码已经成功重置，新密码已经发送到你的邮箱" -#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 +#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "书签" -#: rhodecode/controllers/pullrequests.py:186 +#: rhodecode/controllers/pullrequests.py:190 msgid "Pull request requires a title with min. 3 chars" msgstr "拉取请求的标题至少3个字符" -#: rhodecode/controllers/pullrequests.py:188 +#: rhodecode/controllers/pullrequests.py:192 msgid "error during creation of pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:220 +#: rhodecode/controllers/pullrequests.py:224 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: rhodecode/controllers/pullrequests.py:223 +#: rhodecode/controllers/pullrequests.py:227 msgid "Error occurred during sending pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:256 +#: rhodecode/controllers/pullrequests.py:260 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" +#: rhodecode/controllers/pullrequests.py:452 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + #: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "错误的搜索。请尝试用引号包含它。" @@ -266,55 +255,46 @@ msgid "An error occurred during this search operation" msgstr "在搜索操作中发生异常" -#: rhodecode/controllers/settings.py:108 -#: rhodecode/controllers/admin/repos.py:268 +#: rhodecode/controllers/settings.py:119 +#: rhodecode/controllers/admin/repos.py:272 #, python-format msgid "Repository %s updated successfully" msgstr "版本库%s成功更新" -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/settings.py:137 +#: rhodecode/controllers/admin/repos.py:290 #, python-format msgid "error occurred during update of repository %s" msgstr "在更新版本库%s的时候发生错误" -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:304 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was moved or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" - -#: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:316 +#: rhodecode/controllers/settings.py:162 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "已经删除版本库%s" -#: rhodecode/controllers/settings.py:160 -#: rhodecode/controllers/admin/repos.py:326 -#: rhodecode/controllers/admin/repos.py:332 +#: rhodecode/controllers/settings.py:166 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "在删除%s的时候发生错误" -#: rhodecode/controllers/settings.py:179 +#: rhodecode/controllers/settings.py:185 msgid "unlocked" msgstr "未锁" -#: rhodecode/controllers/settings.py:182 +#: rhodecode/controllers/settings.py:188 msgid "locked" msgstr "已锁" -#: rhodecode/controllers/settings.py:184 +#: rhodecode/controllers/settings.py:190 #, python-format msgid "Repository has been %s" msgstr "版本库已被%s" -#: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:424 +#: rhodecode/controllers/settings.py:194 +#: rhodecode/controllers/admin/repos.py:423 msgid "An error occurred during unlocking" msgstr "解锁时发生错误" @@ -465,76 +445,76 @@ msgid "error occurred during update of permissions" msgstr "更新权限时发生错误" -#: rhodecode/controllers/admin/repos.py:125 +#: rhodecode/controllers/admin/repos.py:121 msgid "--REMOVE FORK--" msgstr "-- 移除复刻 --" -#: rhodecode/controllers/admin/repos.py:194 +#: rhodecode/controllers/admin/repos.py:190 #, python-format msgid "created repository %s from %s" msgstr "新版本库%s基于%s建立。" -#: rhodecode/controllers/admin/repos.py:198 +#: rhodecode/controllers/admin/repos.py:194 #, python-format msgid "created repository %s" msgstr "建立版本库%s" -#: rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/admin/repos.py:225 #, python-format msgid "error occurred during creation of repository %s" msgstr "创建版本库时发生错误%s" -#: rhodecode/controllers/admin/repos.py:321 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "无法删除%s因为它还有其他分复刻本库" -#: rhodecode/controllers/admin/repos.py:350 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "删除版本库用户时发生错误" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "删除版本库用户组时发生错误" -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "删除版本库统计时发生错误" -#: rhodecode/controllers/admin/repos.py:404 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "清除缓存时发生错误" -#: rhodecode/controllers/admin/repos.py:444 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "成功更新在公共日志中的可见性" -#: rhodecode/controllers/admin/repos.py:448 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "设置版本库到公共日志时发生错误" -#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "令牌不匹配" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "成功拉取自远程路径" -#: rhodecode/controllers/admin/repos.py:468 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "从远程路径拉取时发生错误" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "无" -#: rhodecode/controllers/admin/repos.py:486 +#: rhodecode/controllers/admin/repos.py:485 #, python-format msgid "Marked repo %s as fork of %s" msgstr "成功将版本库%s标记为复刻自%s" -#: rhodecode/controllers/admin/repos.py:490 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" @@ -770,152 +750,160 @@ msgid "No changes detected" msgstr "未发现差异" -#: rhodecode/lib/helpers.py:373 +#: rhodecode/lib/helpers.py:374 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%Y/%m/%d %H:%M:%S" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 msgid "True" msgstr "是" -#: rhodecode/lib/helpers.py:489 +#: rhodecode/lib/helpers.py:490 msgid "False" msgstr "否" -#: rhodecode/lib/helpers.py:529 +#: rhodecode/lib/helpers.py:530 #, python-format msgid "Deleted branch: %s" msgstr "已经删除分支%s" -#: rhodecode/lib/helpers.py:532 +#: rhodecode/lib/helpers.py:533 #, python-format msgid "Created tag: %s" msgstr "创建标签%s" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:546 msgid "Changeset not found" msgstr "未找到修订集" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:589 #, python-format msgid "Show all combined changesets %s->%s" msgstr "显示合并的修订集%s->%s" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:595 msgid "compare view" msgstr "比较显示" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:615 msgid "and" msgstr "还有" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:616 #, python-format msgid "%s more" msgstr "%s个" -#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "修订" -#: rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:641 #, python-format msgid "fork name %s" msgstr "复刻名称%s" -#: rhodecode/lib/helpers.py:653 +#: rhodecode/lib/helpers.py:658 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "拉取请求#%s" -#: rhodecode/lib/helpers.py:659 +#: rhodecode/lib/helpers.py:664 msgid "[deleted] repository" msgstr "[删除]版本库" -#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 +#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 msgid "[created] repository" msgstr "[创建]版本库" -#: rhodecode/lib/helpers.py:663 +#: rhodecode/lib/helpers.py:668 msgid "[created] repository as fork" msgstr "[创建]复刻版本库" -#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 +#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 msgid "[forked] repository" msgstr "[复刻]版本库" -#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 +#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 msgid "[updated] repository" msgstr "[更新]版本库" -#: rhodecode/lib/helpers.py:669 +#: rhodecode/lib/helpers.py:674 msgid "[delete] repository" msgstr "[删除]版本库" -#: rhodecode/lib/helpers.py:677 +#: rhodecode/lib/helpers.py:682 msgid "[created] user" msgstr "[创建]用户" -#: rhodecode/lib/helpers.py:679 +#: rhodecode/lib/helpers.py:684 msgid "[updated] user" msgstr "[更新]用户" -#: rhodecode/lib/helpers.py:681 +#: rhodecode/lib/helpers.py:686 msgid "[created] users group" msgstr "[创建]用户组" -#: rhodecode/lib/helpers.py:683 +#: rhodecode/lib/helpers.py:688 msgid "[updated] users group" msgstr "[更新]用户组" -#: rhodecode/lib/helpers.py:685 +#: rhodecode/lib/helpers.py:690 msgid "[commented] on revision in repository" msgstr "[评论]了版本库中的修订" -#: rhodecode/lib/helpers.py:687 +#: rhodecode/lib/helpers.py:692 msgid "[commented] on pull request for" msgstr "[评论]拉取请求" -#: rhodecode/lib/helpers.py:689 +#: rhodecode/lib/helpers.py:694 msgid "[closed] pull request for" msgstr "[关闭] 拉取请求" -#: rhodecode/lib/helpers.py:691 +#: rhodecode/lib/helpers.py:696 msgid "[pushed] into" msgstr "[推送]到" -#: rhodecode/lib/helpers.py:693 +#: rhodecode/lib/helpers.py:698 msgid "[committed via RhodeCode] into repository" msgstr "[通过RhodeCode提交]到版本库" -#: rhodecode/lib/helpers.py:695 +#: rhodecode/lib/helpers.py:700 msgid "[pulled from remote] into repository" msgstr "[远程拉取]到版本库" -#: rhodecode/lib/helpers.py:697 +#: rhodecode/lib/helpers.py:702 msgid "[pulled] from" msgstr "[拉取]自" -#: rhodecode/lib/helpers.py:699 +#: rhodecode/lib/helpers.py:704 msgid "[started following] repository" msgstr "[开始关注]版本库" -#: rhodecode/lib/helpers.py:701 +#: rhodecode/lib/helpers.py:706 msgid "[stopped following] repository" msgstr "[停止关注]版本库" -#: rhodecode/lib/helpers.py:877 +#: rhodecode/lib/helpers.py:883 #, python-format msgid " and %s more" msgstr "还有%s个" -#: rhodecode/lib/helpers.py:881 +#: rhodecode/lib/helpers.py:887 msgid "No Files" msgstr "没有文件" +#: rhodecode/lib/helpers.py:1163 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" + #: rhodecode/lib/utils2.py:403 #, python-format msgid "%d year" @@ -980,83 +968,83 @@ msgid "password reset link" msgstr "密码重置链接" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183 msgid "Repository no access" msgstr "无版本库访问权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184 msgid "Repository read access" msgstr "版本库读取权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185 msgid "Repository write access" msgstr "版本库写入权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186 msgid "Repository admin access" msgstr "版本库管理权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188 msgid "Repositories Group no access" msgstr "无版本库组访问权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189 msgid "Repositories Group read access" msgstr "版本库组读取权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190 msgid "Repositories Group write access" msgstr "版本库组写入" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191 msgid "Repositories Group admin access" msgstr "版本库组管理权限" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193 msgid "RhodeCode Administrator" msgstr "RhodeCode 管理员" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194 msgid "Repository creation disabled" msgstr "禁用创建版本库" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195 msgid "Repository creation enabled" msgstr "允许创建版本库" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196 msgid "Repository forking disabled" msgstr "禁用复刻版本库" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197 msgid "Repository forking enabled" msgstr "允许复刻版本库" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198 msgid "Register disabled" msgstr "禁用注册" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199 msgid "Register new user with RhodeCode with manual activation" msgstr "用手动激活注册新用户" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202 msgid "Register new user with RhodeCode with auto activation" msgstr "用自动激活注册新用户" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643 msgid "Not Reviewed" msgstr "未检视" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644 msgid "Approved" msgstr "已批准" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645 msgid "Rejected" msgstr "驳回" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646 msgid "Under Review" msgstr "检视中" @@ -1126,20 +1114,20 @@ msgid "latest tip" msgstr "最新tip版本" -#: rhodecode/model/user.py:230 +#: rhodecode/model/user.py:232 msgid "new user registration" msgstr "[RhodeCode]新用户注册" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 -#: rhodecode/model/user.py:301 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 +#: rhodecode/model/user.py:303 msgid "You can't Edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: rhodecode/model/user.py:325 +#: rhodecode/model/user.py:327 msgid "You can't remove this user since it's crucial for entire application" msgstr "由于是系统帐号，无法删除该用户" -#: rhodecode/model/user.py:331 +#: rhodecode/model/user.py:333 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1260,26 +1248,26 @@ msgid "This username or users group name is not valid" msgstr "用户或用户组名称无效" -#: rhodecode/model/validators.py:582 +#: rhodecode/model/validators.py:591 msgid "This is not a valid path" msgstr "不是一个合法的路径" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:606 msgid "This e-mail address is already taken" msgstr "该邮件地址已被使用" -#: rhodecode/model/validators.py:617 +#: rhodecode/model/validators.py:626 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "邮件地址\"%(email)s\"不存在" -#: rhodecode/model/validators.py:654 +#: rhodecode/model/validators.py:663 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "LDAP 登陆属性的 CN 必须指定 - 这个名字作为用户名" -#: rhodecode/model/validators.py:673 +#: rhodecode/model/validators.py:682 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态" @@ -1295,7 +1283,8 @@ #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:40 +#: rhodecode/templates/journal/journal.html:9 +#: rhodecode/templates/journal/journal.html:48 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "快速过滤..." @@ -1361,8 +1350,8 @@ #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:62 -#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal.html:70 +#: rhodecode/templates/journal/journal.html:196 #: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 @@ -1379,7 +1368,7 @@ #: rhodecode/templates/index_base.html:74 #: rhodecode/templates/index_base.html:179 #: rhodecode/templates/admin/users/user_edit_my_account.html:182 -#: rhodecode/templates/journal/journal.html:170 +#: rhodecode/templates/journal/journal.html:198 msgid "Tip" msgstr "Tip" @@ -1409,7 +1398,7 @@ #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:221 #: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "点击以升序排列" @@ -1422,7 +1411,7 @@ #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/journal/journal.html:222 #: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "点击以降序排列" @@ -1439,7 +1428,7 @@ #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:223 #: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "没有找到记录" @@ -1451,7 +1440,7 @@ #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/journal/journal.html:224 #: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "数据错误" @@ -1463,8 +1452,8 @@ #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:54 -#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:225 #: rhodecode/templates/tags/tags.html:81 msgid "Loading..." msgstr "载入中..." @@ -1612,10 +1601,28 @@ msgstr "无书签" #: rhodecode/templates/admin/admin.html:5 -#: rhodecode/templates/admin/admin.html:9 +#: rhodecode/templates/admin/admin.html:13 msgid "Admin journal" msgstr "系统日志" +#: rhodecode/templates/admin/admin.html:10 +#, fuzzy +msgid "journal filter..." +msgstr "快速过滤..." + +#: rhodecode/templates/admin/admin.html:12 +#: rhodecode/templates/journal/journal.html:11 +#, fuzzy +msgid "filter" +msgstr "文件" + +#: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/journal/journal.html:12 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" + #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 @@ -1644,7 +1651,7 @@ msgid "From IP" msgstr "来源IP" -#: rhodecode/templates/admin/admin_log.html:57 +#: rhodecode/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "无操作" @@ -1715,7 +1722,7 @@ #: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "保存" @@ -2003,7 +2010,7 @@ #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:94 +#: rhodecode/templates/settings/repo_settings.html:95 msgid "Reset" msgstr "重置" @@ -2144,19 +2151,22 @@ msgstr "删除" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Remove this repository" msgstr "删除版本库" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Confirm to delete this repository" msgstr "确认删除版本库" #: rhodecode/templates/admin/repos/repo_edit.html:282 +#: rhodecode/templates/settings/repo_settings.html:119 +#, fuzzy msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem " -"please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need fully delete it " +"from file system please do it manually" msgstr "" "这个版本库将以特殊的方式重命名这样RhodeCode和版本控制系统将不能访问它。\n" " 如果需要从文件系统完全删除，你需要手动操作" @@ -2190,7 +2200,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/journal/journal.html:95 #: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "私有版本库" @@ -2694,7 +2704,7 @@ msgstr "我的权限" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "My repos" msgstr "我的版本库" @@ -2905,7 +2915,6 @@ #: rhodecode/templates/base/base.html:324 #: rhodecode/templates/base/base.html:326 #: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "日志" @@ -3038,7 +3047,7 @@ msgstr "添加新的评论" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:75 +#: rhodecode/templates/journal/journal.html:83 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "停止关注该版本库" @@ -3143,7 +3152,7 @@ msgstr "影响的文件数，点击显示详细信息" #: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" @@ -3155,23 +3164,22 @@ msgstr "点击建立相关的拉取请求" #: rhodecode/templates/changelog/changelog.html:104 -#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "父版本" #: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changeset/changeset.html:42 msgid "No parents" msgstr "无父版本" #: rhodecode/templates/changelog/changelog.html:115 -#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:106 #: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "合并" #: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:109 #: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -3186,7 +3194,7 @@ msgstr "书签" #: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:114 #: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "标签" @@ -3196,26 +3204,26 @@ msgstr "没有任何变更" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:73 +#: rhodecode/templates/changeset/changeset.html:94 msgid "removed" msgstr "移除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:74 +#: rhodecode/templates/changeset/changeset.html:95 msgid "changed" msgstr "修改" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:75 +#: rhodecode/templates/changeset/changeset.html:96 msgid "added" msgstr "添加" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:77 -#: rhodecode/templates/changeset/changeset.html:78 -#: rhodecode/templates/changeset/changeset.html:79 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:99 +#: rhodecode/templates/changeset/changeset.html:100 #, python-format msgid "affected %s files" msgstr "影响%s文件" @@ -3229,35 +3237,40 @@ msgid "Changeset" msgstr "修订集" -#: rhodecode/templates/changeset/changeset.html:49 +#: rhodecode/templates/changeset/changeset.html:52 +#, fuzzy +msgid "No children" +msgstr "应用到成员" + +#: rhodecode/templates/changeset/changeset.html:70 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "原始diff" -#: rhodecode/templates/changeset/changeset.html:50 +#: rhodecode/templates/changeset/changeset.html:71 msgid "patch diff" msgstr "原始diff" -#: rhodecode/templates/changeset/changeset.html:51 +#: rhodecode/templates/changeset/changeset.html:72 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "下载diff" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d条评论" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "(%d内嵌)" -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset.html:122 #: rhodecode/templates/compare/compare_diff.html:44 #: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, python-format @@ -3265,7 +3278,7 @@ msgid_plural "%s files changed" msgstr[0] "修改%s个文件" -#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/changeset/changeset.html:124 #: rhodecode/templates/compare/compare_diff.html:46 #: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, python-format @@ -3293,7 +3306,7 @@ msgstr "在文本中使用 @用户名 以发送通知到该RhodeCode用户" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:138 +#: rhodecode/templates/changeset/changeset_file_comment.html:143 msgid "Comment" msgstr "评论" @@ -3314,15 +3327,15 @@ msgid "Leave a comment" msgstr "发表评论" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "Check this to change current status of code-review for this changeset" msgstr "勾选以改变这个修订集的代码审查状态" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "change status" msgstr "改变状态" -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 msgid "Comment and close" msgstr "评论并关闭" @@ -3375,19 +3388,19 @@ msgstr "复刻" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal.html:89 #: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Mercurial版本库" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/journal/journal.html:91 #: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Git版本库" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/journal/journal.html:97 #: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "公共版本库" @@ -3763,50 +3776,50 @@ msgid "There are no forks yet" msgstr "无复刻" -#: rhodecode/templates/journal/journal.html:13 +#: rhodecode/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "订阅日志ATOM" -#: rhodecode/templates/journal/journal.html:14 +#: rhodecode/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "订阅日志RSS" -#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/journal/journal.html:32 #: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "刷新" -#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 msgid "RSS feed" msgstr "订阅RSS" -#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/journal.html:38 #: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "订阅ATOM" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 msgid "Watched" msgstr "关注的" -#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:54 msgid "ADD" msgstr "新建版本库" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "following user" msgstr "关注用户" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "user" msgstr "用户" -#: rhodecode/templates/journal/journal.html:102 +#: rhodecode/templates/journal/journal.html:110 msgid "You are not following any users or repositories" msgstr "未关注任何用户或版本库" -#: rhodecode/templates/journal/journal_data.html:51 +#: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" msgstr "没有条目" @@ -3904,6 +3917,11 @@ msgid "Compare view" msgstr "比较显示" +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#, fuzzy +msgid "reviewer" +msgstr "%d个检视者" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 msgid "all pull requests" msgstr "所有拉取请求" @@ -3968,6 +3986,16 @@ msgid "%s Settings" msgstr "%s设置" +#: rhodecode/templates/settings/repo_settings.html:102 +#, fuzzy +msgid "Delete repository" +msgstr "[删除]版本库" + +#: rhodecode/templates/settings/repo_settings.html:109 +#, fuzzy +msgid "Remove repo" +msgstr "删除" + #: rhodecode/templates/shortlog/shortlog.html:5 #, python-format msgid "%s Shortlog" @@ -4169,3 +4197,19 @@ msgid "Compare tags" msgstr "比较标签" +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was created or renamed" +#~ " from the file system please run " +#~ "the application again in order to " +#~ "rescan repositories" +#~ msgstr " 版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" + +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was moved or renamed " +#~ "from the filesystem please run the " +#~ "application again in order to rescan " +#~ "repositories" +#~ msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" +
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Fri Dec 14 04:26:15 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-03 03:21+0100\n" +"POT-Creation-Date: 2012-12-14 04:19+0100\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" @@ -22,33 +22,33 @@ msgid "All Branches" msgstr "分支" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "" -#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:164 +#: rhodecode/controllers/changeset.py:163 #, fuzzy, python-format msgid "%s line context" msgstr "文件內容" -#: rhodecode/controllers/changeset.py:315 -#: rhodecode/controllers/pullrequests.py:411 +#: rhodecode/controllers/changeset.py:314 +#: rhodecode/controllers/pullrequests.py:417 #, fuzzy, python-format msgid "Status change -> %s" msgstr "最後修改" -#: rhodecode/controllers/changeset.py:346 +#: rhodecode/controllers/changeset.py:345 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" #: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/pullrequests.py:121 #: rhodecode/controllers/shortlog.py:100 #, fuzzy msgid "There are no changesets yet" @@ -91,8 +91,8 @@ msgstr "" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:126 -#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/changeset/changeset.html:137 +#: rhodecode/templates/changeset/changeset.html:149 #: rhodecode/templates/compare/compare_diff.html:62 #: rhodecode/templates/compare/compare_diff.html:73 #: rhodecode/templates/pullrequests/pullrequest_show.html:94 @@ -176,49 +176,34 @@ msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" - -#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the file system please run the application again in order to rescan " -"repositories" -msgstr "" - -#: rhodecode/controllers/forks.py:168 +#: rhodecode/controllers/forks.py:158 #, python-format msgid "forked %s repository as %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/forks.py:182 +#: rhodecode/controllers/forks.py:172 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261 #, fuzzy msgid "public journal" msgstr "公開日誌" -#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265 #: rhodecode/templates/base/base.html:232 +#: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "日誌" @@ -236,33 +221,37 @@ "email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 +#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:186 +#: rhodecode/controllers/pullrequests.py:190 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:188 +#: rhodecode/controllers/pullrequests.py:192 #, fuzzy msgid "error during creation of pull request" msgstr "建立使用者 %s" -#: rhodecode/controllers/pullrequests.py:220 +#: rhodecode/controllers/pullrequests.py:224 #, fuzzy msgid "Successfully opened new pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/pullrequests.py:223 +#: rhodecode/controllers/pullrequests.py:227 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:256 +#: rhodecode/controllers/pullrequests.py:260 #, fuzzy msgid "Successfully deleted pull request" msgstr "成功刪除使用者" +#: rhodecode/controllers/pullrequests.py:452 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + #: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元" @@ -275,57 +264,48 @@ msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:108 -#: rhodecode/controllers/admin/repos.py:268 +#: rhodecode/controllers/settings.py:119 +#: rhodecode/controllers/admin/repos.py:272 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/settings.py:137 +#: rhodecode/controllers/admin/repos.py:290 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:304 -#, python-format -msgid "" -"%s repository is not mapped to db perhaps it was moved or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" - -#: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:316 +#: rhodecode/controllers/settings.py:162 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "刪除版本庫 %s" -#: rhodecode/controllers/settings.py:160 -#: rhodecode/controllers/admin/repos.py:326 -#: rhodecode/controllers/admin/repos.py:332 +#: rhodecode/controllers/settings.py:166 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/settings.py:179 +#: rhodecode/controllers/settings.py:185 #, fuzzy msgid "unlocked" msgstr "解鎖" -#: rhodecode/controllers/settings.py:182 +#: rhodecode/controllers/settings.py:188 #, fuzzy msgid "locked" msgstr "解鎖" -#: rhodecode/controllers/settings.py:184 +#: rhodecode/controllers/settings.py:190 #, fuzzy, python-format msgid "Repository has been %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:424 +#: rhodecode/controllers/settings.py:194 +#: rhodecode/controllers/admin/repos.py:423 msgid "An error occurred during unlocking" msgstr "" @@ -475,76 +455,76 @@ msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:125 +#: rhodecode/controllers/admin/repos.py:121 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:194 +#: rhodecode/controllers/admin/repos.py:190 #, python-format msgid "created repository %s from %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:198 +#: rhodecode/controllers/admin/repos.py:194 #, python-format msgid "created repository %s" msgstr "建立版本庫 %s" -#: rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/admin/repos.py:225 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:321 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:350 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:404 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:444 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:448 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:468 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:486 +#: rhodecode/controllers/admin/repos.py:485 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:490 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "" @@ -785,159 +765,167 @@ msgid "No changes detected" msgstr "尚未有任何變更" -#: rhodecode/lib/helpers.py:373 +#: rhodecode/lib/helpers.py:374 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 msgid "True" msgstr "真" -#: rhodecode/lib/helpers.py:489 +#: rhodecode/lib/helpers.py:490 msgid "False" msgstr "假" -#: rhodecode/lib/helpers.py:529 +#: rhodecode/lib/helpers.py:530 #, fuzzy, python-format msgid "Deleted branch: %s" msgstr "刪除版本庫 %s" -#: rhodecode/lib/helpers.py:532 +#: rhodecode/lib/helpers.py:533 #, fuzzy, python-format msgid "Created tag: %s" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:546 #, fuzzy msgid "Changeset not found" msgstr "修改" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:589 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:595 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:615 msgid "and" msgstr "和" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:616 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "修訂" -#: rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:641 #, fuzzy, python-format msgid "fork name %s" msgstr "fork 名稱" -#: rhodecode/lib/helpers.py:653 +#: rhodecode/lib/helpers.py:658 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:659 +#: rhodecode/lib/helpers.py:664 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 +#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:663 +#: rhodecode/lib/helpers.py:668 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本庫 %s" -#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 +#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 +#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:669 +#: rhodecode/lib/helpers.py:674 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:677 +#: rhodecode/lib/helpers.py:682 #, fuzzy msgid "[created] user" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:679 +#: rhodecode/lib/helpers.py:684 #, fuzzy msgid "[updated] user" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:681 +#: rhodecode/lib/helpers.py:686 #, fuzzy msgid "[created] users group" msgstr "建立使用者群組 %s" -#: rhodecode/lib/helpers.py:683 +#: rhodecode/lib/helpers.py:688 #, fuzzy msgid "[updated] users group" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:685 +#: rhodecode/lib/helpers.py:690 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:687 +#: rhodecode/lib/helpers.py:692 #, fuzzy msgid "[commented] on pull request for" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:689 +#: rhodecode/lib/helpers.py:694 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:691 +#: rhodecode/lib/helpers.py:696 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:693 +#: rhodecode/lib/helpers.py:698 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:695 +#: rhodecode/lib/helpers.py:700 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:697 +#: rhodecode/lib/helpers.py:702 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:699 +#: rhodecode/lib/helpers.py:704 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:701 +#: rhodecode/lib/helpers.py:706 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:877 +#: rhodecode/lib/helpers.py:883 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:881 +#: rhodecode/lib/helpers.py:887 msgid "No Files" msgstr "沒有檔案" +#: rhodecode/lib/helpers.py:1163 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" + #: rhodecode/lib/utils2.py:403 #, fuzzy, python-format msgid "%d year" @@ -1003,98 +991,98 @@ msgid "password reset link" msgstr "您的密碼重設連結已寄出" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183 #, fuzzy msgid "Repository no access" msgstr "個版本庫" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184 #, fuzzy msgid "Repository read access" msgstr "這個版本庫已經存在" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185 #, fuzzy msgid "Repository write access" msgstr "個版本庫" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186 #, fuzzy msgid "Repository admin access" msgstr "個版本庫" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188 #, fuzzy msgid "Repositories Group no access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189 #, fuzzy msgid "Repositories Group read access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190 #, fuzzy msgid "Repositories Group write access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191 #, fuzzy msgid "Repositories Group admin access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193 #, fuzzy msgid "RhodeCode Administrator" msgstr "使用者管理員" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194 #, fuzzy msgid "Repository creation disabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195 #, fuzzy msgid "Repository creation enabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196 #, fuzzy msgid "Repository forking disabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197 #, fuzzy msgid "Repository forking enabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198 #, fuzzy msgid "Register disabled" msgstr "停用" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643 msgid "Not Reviewed" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644 #, fuzzy msgid "Approved" msgstr "移除" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645 msgid "Rejected" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646 msgid "Under Review" msgstr "" @@ -1165,21 +1153,21 @@ msgid "latest tip" msgstr "最後登入" -#: rhodecode/model/user.py:230 +#: rhodecode/model/user.py:232 #, fuzzy msgid "new user registration" msgstr "[RhodeCode] 新使用者註冊" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 -#: rhodecode/model/user.py:301 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 +#: rhodecode/model/user.py:303 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:325 +#: rhodecode/model/user.py:327 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:331 +#: rhodecode/model/user.py:333 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1304,26 +1292,26 @@ msgid "This username or users group name is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:582 +#: rhodecode/model/validators.py:591 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:606 msgid "This e-mail address is already taken" msgstr "這個郵件位址已經使用了" -#: rhodecode/model/validators.py:617 +#: rhodecode/model/validators.py:626 #, fuzzy, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "這個郵件位址不存在" -#: rhodecode/model/validators.py:654 +#: rhodecode/model/validators.py:663 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: rhodecode/model/validators.py:673 +#: rhodecode/model/validators.py:682 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1339,7 +1327,8 @@ #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:40 +#: rhodecode/templates/journal/journal.html:9 +#: rhodecode/templates/journal/journal.html:48 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "快速過濾..." @@ -1405,8 +1394,8 @@ #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:62 -#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal.html:70 +#: rhodecode/templates/journal/journal.html:196 #: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 @@ -1423,7 +1412,7 @@ #: rhodecode/templates/index_base.html:74 #: rhodecode/templates/index_base.html:179 #: rhodecode/templates/admin/users/user_edit_my_account.html:182 -#: rhodecode/templates/journal/journal.html:170 +#: rhodecode/templates/journal/journal.html:198 msgid "Tip" msgstr "" @@ -1453,7 +1442,7 @@ #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:221 #: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "" @@ -1466,7 +1455,7 @@ #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/journal/journal.html:222 #: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "" @@ -1484,7 +1473,7 @@ #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:223 #: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "" @@ -1496,7 +1485,7 @@ #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/journal/journal.html:224 #: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "" @@ -1508,8 +1497,8 @@ #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:54 -#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:225 #: rhodecode/templates/tags/tags.html:81 #, fuzzy msgid "Loading..." @@ -1660,10 +1649,28 @@ msgstr "尚未有任何 fork" #: rhodecode/templates/admin/admin.html:5 -#: rhodecode/templates/admin/admin.html:9 +#: rhodecode/templates/admin/admin.html:13 msgid "Admin journal" msgstr "管理員日誌" +#: rhodecode/templates/admin/admin.html:10 +#, fuzzy +msgid "journal filter..." +msgstr "快速過濾..." + +#: rhodecode/templates/admin/admin.html:12 +#: rhodecode/templates/journal/journal.html:11 +#, fuzzy +msgid "filter" +msgstr "檔案" + +#: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/journal/journal.html:12 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" + #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 @@ -1692,7 +1699,7 @@ msgid "From IP" msgstr "來源IP" -#: rhodecode/templates/admin/admin_log.html:57 +#: rhodecode/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "" @@ -1764,7 +1771,7 @@ #: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "儲存" @@ -2058,7 +2065,7 @@ #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:94 +#: rhodecode/templates/settings/repo_settings.html:95 msgid "Reset" msgstr "重設" @@ -2203,19 +2210,21 @@ msgstr "移除" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Remove this repository" msgstr "移除版本庫" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Confirm to delete this repository" msgstr "確認移除這個版本庫" #: rhodecode/templates/admin/repos/repo_edit.html:282 +#: rhodecode/templates/settings/repo_settings.html:119 msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem " -"please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need fully delete it " +"from file system please do it manually" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 @@ -2247,7 +2256,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/journal/journal.html:95 #: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "私有版本庫" @@ -2774,7 +2783,7 @@ msgstr "權限" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 #, fuzzy msgid "My repos" msgstr "空的版本庫" @@ -2995,7 +3004,6 @@ #: rhodecode/templates/base/base.html:324 #: rhodecode/templates/base/base.html:326 #: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "日誌" @@ -3131,7 +3139,7 @@ msgstr "新增另ㄧ位成員" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:75 +#: rhodecode/templates/journal/journal.html:83 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "停止追蹤這個版本庫" @@ -3240,7 +3248,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 #, fuzzy @@ -3253,23 +3261,22 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:104 -#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "" #: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changeset/changeset.html:42 msgid "No parents" msgstr "" #: rhodecode/templates/changelog/changelog.html:115 -#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:106 #: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "合併" #: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:109 #: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -3284,7 +3291,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:114 #: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "標籤" @@ -3294,26 +3301,26 @@ msgstr "尚未有任何變更" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:73 +#: rhodecode/templates/changeset/changeset.html:94 msgid "removed" msgstr "移除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:74 +#: rhodecode/templates/changeset/changeset.html:95 msgid "changed" msgstr "修改" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:75 +#: rhodecode/templates/changeset/changeset.html:96 msgid "added" msgstr "新增" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:77 -#: rhodecode/templates/changeset/changeset.html:78 -#: rhodecode/templates/changeset/changeset.html:79 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:99 +#: rhodecode/templates/changeset/changeset.html:100 #, python-format msgid "affected %s files" msgstr "" @@ -3327,36 +3334,40 @@ msgid "Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:49 +#: rhodecode/templates/changeset/changeset.html:52 +msgid "No children" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:70 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "原始差異" -#: rhodecode/templates/changeset/changeset.html:50 +#: rhodecode/templates/changeset/changeset.html:71 #, fuzzy msgid "patch diff" msgstr "原始差異" -#: rhodecode/templates/changeset/changeset.html:51 +#: rhodecode/templates/changeset/changeset.html:72 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "下載差異" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, fuzzy, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "遞交" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "" -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset.html:122 #: rhodecode/templates/compare/compare_diff.html:44 #: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, fuzzy, python-format @@ -3364,7 +3375,7 @@ msgid_plural "%s files changed" msgstr[0] "檔案修改" -#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/changeset/changeset.html:124 #: rhodecode/templates/compare/compare_diff.html:46 #: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, python-format @@ -3392,7 +3403,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:138 +#: rhodecode/templates/changeset/changeset_file_comment.html:143 #, fuzzy msgid "Comment" msgstr "遞交" @@ -3415,16 +3426,16 @@ msgid "Leave a comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 #, fuzzy msgid "change status" msgstr "變更" -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 msgid "Comment and close" msgstr "" @@ -3481,19 +3492,19 @@ msgstr "分支" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal.html:89 #: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Mercurial 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/journal/journal.html:91 #: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Git 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/journal/journal.html:97 #: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "公開版本庫" @@ -3886,54 +3897,54 @@ msgid "There are no forks yet" msgstr "尚未有任何 fork" -#: rhodecode/templates/journal/journal.html:13 +#: rhodecode/templates/journal/journal.html:21 #, fuzzy msgid "ATOM journal feed" msgstr "%s 公開日誌 %s feed" -#: rhodecode/templates/journal/journal.html:14 +#: rhodecode/templates/journal/journal.html:22 #, fuzzy msgid "RSS journal feed" msgstr "%s 公開日誌 %s feed" -#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/journal/journal.html:32 #: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "" -#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 msgid "RSS feed" msgstr "" -#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/journal.html:38 #: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 #, fuzzy msgid "Watched" msgstr "快取" -#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:54 #, fuzzy msgid "ADD" msgstr "新增" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "following user" msgstr "追蹤使用者" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "user" msgstr "使用者" -#: rhodecode/templates/journal/journal.html:102 +#: rhodecode/templates/journal/journal.html:110 msgid "You are not following any users or repositories" msgstr "您尚未追蹤任何使用者或版本庫" -#: rhodecode/templates/journal/journal_data.html:51 +#: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" msgstr "" @@ -4040,6 +4051,11 @@ msgid "Compare view" msgstr "比較顯示" +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#, fuzzy +msgid "reviewer" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 #, fuzzy msgid "all pull requests" @@ -4107,6 +4123,16 @@ msgid "%s Settings" msgstr "設定" +#: rhodecode/templates/settings/repo_settings.html:102 +#, fuzzy +msgid "Delete repository" +msgstr "刪除版本庫 %s" + +#: rhodecode/templates/settings/repo_settings.html:109 +#, fuzzy +msgid "Remove repo" +msgstr "移除" + #: rhodecode/templates/shortlog/shortlog.html:5 #, fuzzy, python-format msgid "%s Shortlog" @@ -4316,3 +4342,19 @@ msgid "Compare tags" msgstr "比較顯示" +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was created or renamed" +#~ " from the file system please run " +#~ "the application again in order to " +#~ "rescan repositories" +#~ msgstr "" + +#~ msgid "" +#~ "%s repository is not mapped to db" +#~ " perhaps it was moved or renamed " +#~ "from the filesystem please run the " +#~ "application again in order to rescan " +#~ "repositories" +#~ msgstr "" +
--- a/rhodecode/lib/db_manage.py Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/lib/db_manage.py Fri Dec 14 04:26:15 2012 +0100 @@ -276,6 +276,16 @@ self.klass.create_default_options(skip_existing=True) Session().commit() + def step_9(self): + perm_fixes = self.klass.reset_permissions(User.DEFAULT_USER) + Session().commit() + if perm_fixes: + notify('There was an inconsistent state of permissions ' + 'detected for default user. Permissions are now ' + 'reset to the default value for default user. ' + 'Please validate and check default permissions ' + 'in admin panel') + upgrade_steps = [0] + range(curr_version + 1, __dbversion__ + 1) # CALL THE PROPER ORDER OF STEPS TO PERFORM FULL UPGRADE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rhodecode/lib/dbmigrate/versions/009_version_1_5_1.py Fri Dec 14 04:26:15 2012 +0100 @@ -0,0 +1,28 @@ +import logging +import datetime + +from sqlalchemy import * +from sqlalchemy.exc import DatabaseError +from sqlalchemy.orm import relation, backref, class_mapper, joinedload +from sqlalchemy.orm.session import Session +from sqlalchemy.ext.declarative import declarative_base + +from rhodecode.lib.dbmigrate.migrate import * +from rhodecode.lib.dbmigrate.migrate.changeset import * + +from rhodecode.model.meta import Base +from rhodecode.model import meta + +log = logging.getLogger(__name__) + + +def upgrade(migrate_engine): + """ + Upgrade operations go here. + Don't create your own engine; bind migrate_engine to your metadata + """ + pass + +def downgrade(migrate_engine): + meta = MetaData() + meta.bind = migrate_engine
--- a/rhodecode/lib/helpers.py Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/lib/helpers.py Fri Dec 14 04:26:15 2012 +0100 @@ -1157,3 +1157,10 @@ "repository:vcs OR repository:test" "username:test AND repository:test*" ''')) + + +def not_mapped_error(repo_name): + flash(_('%s repository is not mapped to db perhaps' + ' it was created or renamed from the filesystem' + ' please run the application again' + ' in order to rescan repositories') % repo_name, category='error')
--- a/rhodecode/public/css/style.css Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/public/css/style.css Fri Dec 14 04:26:15 2012 +0100 @@ -3619,6 +3619,10 @@ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } +.ui-btn.blue.hidden{ + display: none; +} + .ui-btn.active{ font-weight: bold; }
--- a/rhodecode/public/js/rhodecode.js Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/public/js/rhodecode.js Fri Dec 14 04:26:15 2012 +0100 @@ -712,6 +712,14 @@ } var updateReviewers = function(reviewers_ids){ + if (reviewers_ids === undefined){ + var reviewers_ids = []; + var ids = YUQ('#review_members input'); + for(var i=0; i<ids.length;i++){ + var id = ids[i].value + reviewers_ids.push(id); + } + } var url = AJAX_UPDATE_PULLREQUEST; var postData = {'_method':'put', 'reviewers_ids': reviewers_ids}; @@ -852,6 +860,7 @@ if (el.parentNode !== undefined){ el.parentNode.removeChild(el); } + updateReviewers(); } var fileBrowserListeners = function(current_url, node_list_url, url_base){
--- a/rhodecode/templates/admin/repos/repo_edit.html Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/templates/admin/repos/repo_edit.html Fri Dec 14 04:26:15 2012 +0100 @@ -279,9 +279,7 @@ </div> <div class="field" style="border:none;color:#888"> <ul> - <li>${_('''This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. - If you need fully delete it from file system please do it manually''')} - </li> + <li>${_('This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. If you need fully delete it from file system please do it manually')}</li> </ul> </div> </div>
--- a/rhodecode/templates/changeset/changeset_file_comment.html Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/templates/changeset/changeset_file_comment.html Fri Dec 14 04:26:15 2012 +0100 @@ -109,7 +109,7 @@ </%def> ## MAIN COMMENT FORM -<%def name="comments(post_url, cur_status, close_btn=False)"> +<%def name="comments(post_url, cur_status, close_btn=False, change_status=True)"> <div class="comments"> %if c.rhodecode_user.username != 'default': @@ -121,23 +121,28 @@ ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')), '<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user')))|n} + %if change_status: | <label for="show_changeset_status_box" class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}</label> <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" /> + %endif </div> + %if change_status: <div id="status_block_container" class="status-block" style="display:none"> %for status,lbl in c.changeset_statuses: <div class=""> - <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" name="changeset_status" value="${status}"> <label>${lbl}</label> + <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}"> + <label for="${status}">${lbl}</label> </div> %endfor </div> + %endif <div class="mentions-container" id="mentions_container"></div> ${h.textarea('text')} </div> <div class="comment-button"> ${h.submit('save', _('Comment'), class_="ui-btn large")} - %if close_btn: - ${h.submit('save_close', _('Comment and close'), class_='ui-btn blue large')} + %if close_btn and change_status: + ${h.submit('save_close', _('Comment and close'), class_='ui-btn blue large %s' % ('hidden' if cur_status in ['not_reviewed','under_review'] else ''))} %endif </div> ${h.end_form()} @@ -157,6 +162,14 @@ YUD.setStyle('status_block_container','display','none'); } }) + YUE.on(YUQ('.status_change_radio'), 'change',function(e){ + var val = e.currentTarget.value; + if (val == 'approved' || val == 'rejected') { + YUD.removeClass('save_close', 'hidden'); + }else{ + YUD.addClass('save_close', 'hidden'); + } + }) }); </script>
--- a/rhodecode/templates/pullrequests/pullrequest_show.html Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/templates/pullrequests/pullrequest_show.html Fri Dec 14 04:26:15 2012 +0100 @@ -109,9 +109,9 @@ <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/> </div> <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div> - <div style="float:left">${member.full_name} (${_('owner')})</div> + <div style="float:left">${member.full_name} (${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})</div> <input type="hidden" value="${member.user_id}" name="review_members" /> - %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.author.user_id == c.rhodecode_user.user_id): + %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.user_id == c.rhodecode_user.user_id): <span class="delete_icon action_button" onclick="removeReviewer(${member.user_id})"></span> %endif </div> @@ -166,7 +166,7 @@ ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), c.current_changeset_status, - close_btn=True)} + close_btn=True, change_status=c.allowed_to_change_status)} %endif <script type="text/javascript"> @@ -198,16 +198,9 @@ // inject comments into they proper positions var file_comments = YUQ('.inline-comment-placeholder'); renderInlineComments(file_comments); - + YUE.on(YUD.get('update_pull_request'),'click',function(e){ - - var reviewers_ids = []; - var ids = YUQ('#review_members input'); - for(var i=0; i<ids.length;i++){ - var id = ids[i].value - reviewers_ids.push(id); - } - updateReviewers(reviewers_ids); + updateReviewers(); }) }) </script>
--- a/rhodecode/templates/settings/repo_settings.html Thu Dec 13 23:20:38 2012 +0100 +++ b/rhodecode/templates/settings/repo_settings.html Fri Dec 14 04:26:15 2012 +0100 @@ -116,9 +116,7 @@ </div> <div class="field" style="border:none;color:#888"> <ul> - <li>${_('''This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. - If you need fully delete it from file system please do it manually''')} - </li> + <li>${_('This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. If you need fully delete it from file system please do it manually')}</li> </ul> </div> </div>